Changeset 37918

Timestamp:

Feb 20, 2015, 1:30:18 PM (11 years ago)

Author:

heather

Message:

forcedwarptest

Location:

trunk/ippToPsps/jython

Files:

• dvo.py (modified) (3 diffs)
• dvoforcedobjects.py (modified) (1 diff)
• forcedobjectbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/dvo.py

@@ -654 +654 @@
         useP2 = 0    
         useST = 0
-        
+        useFW = 0
+        useDF = 0
         for batchType in self.skychunk.batchTypes:
             self.logger.infoPair("batchType", batchType)
@@ -661 +662 @@
             if batchType == "P2":
                 useP2 = 1
-
+            if batchType == "DF":
+                useDF = 1
+            if batchType == "FW":
+                useFW = 1
+                
+                
         if (useP2 == 0 and useST == 1):
             # grab only stacks
@@ -680 +686 @@
                 cmd += " -photcode-start 10000 -photcode-end 10577"
 
+        if (useFW == 1):
+            if (self.config.camera == "simtest"):
+                print "need photcodes for non gpc1 camera"
+            else:
+                cmd += " -photcode-start 12000 -photcode-end 12500"
+        if (useFW == 1):
+            if (self.config.camera == "simtest"):
+                print "need photcodes for non gpc1 camera"
+            else:
+                print "need photcode for warp for gpc1 camera, default is no selection, should work, could be slow"
+
+
+                
         self.logger.infoPair("Running dvopsps", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)

trunk/ippToPsps/jython/dvoforcedobjects.py

@@ -40 +40 @@
         # TODO path to DVO prog hardcoded temporarily
         # TODO this needs to be modified for forced objects
-        cmd = "dvopsps objects"
+        cmd = "dvopsps forced_warp_objects"
         cmd += " -dbhost " + self.scratchDb.dbHost
         cmd += " -dbname " + self.scratchDb.dbName

trunk/ippToPsps/jython/forcedobjectbatch.py

@@ -14 +14 @@
 from ipptopspsdb import IppToPspsDb
 from scratchdb import ScratchDb
-from dvoforcedobjects import DvoForcedObjects # need one specific for cpy ?
+from dvoforcedobjects import DvoForcedObjects # need one specific for cpy.
 from sqlUtility import sqlUtility