Merge branch 'master' into fixPylint

AIDASoft · Jul 22, 2024 · fb69d8a · fb69d8a
2 parents 199d0f7 + 638cc28
commit fb69d8a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
@@ -681,8 +681,6 @@ def setupCalorimeter(self, name, type=None, collections=None):  # noqa: A002
     # sd.setType('calorimeter')
     if typ is None:
       typ = self.sensitive_types['calorimeter']
-    elif typ is not None and self.sensitive_types.get(typ):
-      typ = self.sensitive_types[typ]
     return self.setupDetector(name, typ, collections)
 
   def setupTracker(self, name, type=None, collections=None):  # noqa: A002
@@ -696,8 +694,6 @@ def setupTracker(self, name, type=None, collections=None):  # noqa: A002
     # sd.setType('tracker')
     if typ is None:
       typ = self.sensitive_types['tracker']
-    elif typ is not None and self.sensitive_types.get(typ):
-      typ = self.sensitive_types[typ]
     return self.setupDetector(name, typ, collections)
 
   def _private_setupField(self, field, stepper, equation, prt):