Changeset 37156 for branches/eam_branches/ipp-20140717/ippToPsps/jython/dvo.py

Timestamp:

Jul 31, 2014, 10:59:37 AM (12 years ago)

Author:

eugene

Message:

adding stack mags to dvopsps detection output; adding option to reset the dvoDetections table; adding makeEquals to sqlUtilities; intelligently(?) select photcode ranges for dvopsps; massive re-work of stackbatch.py

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/dvo.py (modified) (1 diff)

branches/eam_branches/ipp-20140717/ippToPsps/jython/dvo.py

@@ -680 +680 @@
 
         if (useP2 ==0 and useST ==1):
-            #grab only stacks
-            cmd += " -photcode-start 11000 -photcode-end 11500"
+            # grab only stacks
+            if self.config.gpc1test:
+                # gpc1test -> SIMTEST.x.SkyChip
+                cmd += " -photcode-start 14100 -photcode-end 14500"
+            else:
+                # not gpc1test -> GPC1.x.SkyShip
+                cmd += " -photcode-start 11000 -photcode-end 11500"
 
         if (useP2 ==1 and useST==0):
             #grab only P2s (4000-4500 are test cameras, SIMTEST and SIMMOSAIC)
-            # XXX EAM 20140729 : this is a terrible hack... 
-            cmd += " -photcode-start 4000 -photcode-end 10577"
+            if self.config.gpc1test:
+                # gpc1test -> SIMTEST.x.Chip
+                cmd += " -photcode-start  4100 -photcode-end 4500"
+            else:
+                # not gpc1test -> GPC1.x.XYnn
+                cmd += " -photcode-start 10000 -photcode-end 10577"
 
         self.logger.infoPair("Running dvopsps", cmd)