psana1 common mode compatibility fix, revisit

slaclab · Nov 19, 2024 · 86f325d · 86f325d
1 parent f7e17f4
commit 86f325d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/calibrationSuite/basicSuiteScript.py b/calibrationSuite/basicSuiteScript.py
@@ -228,9 +228,16 @@ def rowCommonModeCorrection3d(self, frames, arbitraryCut=1000):
             frames[module] = self.rowCommonModeCorrection(frames[module], arbitraryCut)
         return frames
 
-    def colCommonModeCorrection3d(self, frames, cut=1000, switchedPixels=None):
+    def colCommonModeCorrection3d(self, frames, cut=1000, switchedPixels = None
+):
+        if switchedPixels is None:
+            switchedPixels = self.getSwitchedPixels(frames)
+
         for module in self.analyzedModules:
-            frames[module] = self.colCommonModeCorrection(frames[module], cut, switchedPixels[module])
+            sp = None
+            if switchedPixels is not None: ## dumb as written
+                sp  = switchedPixels[module]
+            frames[module] = self.colCommonModeCorrection(frames[module], cut, sp)
         return frames
 
     def rowCommonModeCorrection(self, frame, arbitraryCut=1000):