Changeset 40226

Timestamp:

Nov 30, 2017, 8:42:22 PM (9 years ago)

Author:

eugene

Message:

added some cases for testing

Location:

trunk/ippToPsps/jython

Files:

• dvoforcedobjects.py (modified) (1 diff)
• forcedwarpbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/dvoforcedobjects.py

@@ -48 +48 @@
         cmd += " -cpt " + region
 
+        if self.config.test:
+            cmd += " -test-mode"
+
         if self.skychunk.parallel:
             if self.scratchDb.dbHost == "localhost":

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -424 +424 @@
         # self.selectDvoObjIDs()
         self.logger.infoPair("inserting dvo info: find imageID", "from externID")
-        imageID = self.scratchDb.getImageIDFromExternIDandPhotcodeRange(self.warpSkyFileID[num],12000,12500) 
-        self.logger.infoPair("I don't like this", "it is hardwired to gpc1")
+
+        # get the imageID: this code has cases for simtest vs gpc1 cameras
+        # if self.config.test: 
+        self.logger.infoPair("current camera is", self.config.camera)
+        if self.config.camera == "gpc1":
+            self.logger.infoPair("I don't like this", "it is hardwired to gpc1")
+            imageID = self.scratchDb.getImageIDFromExternIDandPhotcodeRange(self.warpSkyFileID[num],12000,12500) 
+        if self.config.camera == "simtest":
+            imageID = self.scratchDb.getImageIDFromExternIDandPhotcodeRange(self.warpSkyFileID[num],15100,15500) 
+        if imageID == 0:
+            self.logger.infoPair ("failed to get imageID for", str(num))
+            raise
+
         self.logger.infoPair("updating", pspsTableName)
 
@@ -680 +691 @@
             self.logger.infoPair("Populating", myTable)
             if not self.populateForcedWarpMeasurement(num):
-                self.logger.infoPair ("skippping ForcedWarpMeasurement", str(num))
+                self.logger.infoPair ("failed on ForcedWarpMeasurement", str(num))
                 #continue
                 raise