Changeset 36447 for trunk/ippToPsps/jython/dvo.py

Timestamp:

Jan 15, 2014, 4:38:27 PM (12 years ago)

Author:

heather

Message:

forgot when I put these changes in, but want to check them in now

File:

• trunk/ippToPsps/jython/dvo.py (modified) (2 diffs)

trunk/ippToPsps/jython/dvo.py

@@ -65 +65 @@
         if not self.correctDvo:
             print "*******************************************************************************"
-            self.logger.warning("switching to a new dvo: " + self.skychunk.dvoLocation)
+            self.logger.warning("switching to a new dvo: '" + self.skychunk.dvoLocation + "'")
             # response = raw_input("(y/n) ")
             # if response == "y":
@@ -669 +669 @@
             cmd += " -time-start " + time_start
             cmd += " -time-end " + time_end
-   
+
+        useP2 = 0    
+        useST = 0
+        
+        for batchType in self.skychunk.batchTypes:
+            self.logger.infoPair("batchType", batchType)
+            if batchType == "ST":
+                useST = 1
+            if batchType == "P2":
+                useP2 = 1
+
+        if (useP2 ==0 and useST ==1):
+            #grab only stacks
+            cmd += " -photcode-start 11000 -photcode-end 11500"
+
+        if (useP2 ==1 and useST==0):
+            #grabd only P2s    
+            cmd += " -photcode-start 10000 -photcode-end 10577"
+
+
         self.logger.infoPair("Running dvopsps", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)