Changeset 37066 for branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/dvo.py

Timestamp:

Jul 17, 2014, 12:30:45 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ippToPsps

Files:

• . (modified) (1 prop)
• jython/dvo.py (modified) (4 diffs)

branches/eam_branches/ipp-ops-20130712/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":
@@ -518 +518 @@
           self.logger.debugPair("Reading IPP table", table.name)
           table = stilts.tpipe(table, cmd='explodeall')
-     
+          #adds an index to all the tables 
+       #   table = stilts.tpipe(table, cmd='addcol table_index $0')
+
           # IPP FITS files are littered with infinity values. Remove them
           self.logger.debugPair("Removing", "infinity values")
@@ -628 +630 @@
         maxDEC = boxDim['maxDEC'] + dD_border
 
+        #find out if we use a time_range or not
+        valid_trange_start = 0
+        valid_trange_end = 0
+        use_trange = 0 
+        if (self.skychunk.trange_start != '0000-00-00 00:00:00'):
+            valid_trange_start = 1
+        if (self.skychunk.trange_end != '0000-00-00 00:00:00'):
+            valid_trange_end = 1             
+
+        if (valid_trange_start and valid_trange_end):
+            use_trange = 1
+
+
         # TODO path to DVO prog hardcoded temporarily
         cmd = "dvopsps detections"
@@ -644 +659 @@
             cmd += " -parallel"
 
+        if use_trange:
+            # make tranges valid for dvopsps
+            time_start1 = self.skychunk.trange_start
+            time_end1 = self.skychunk.trange_end
+            time_start=re.sub('\s+',',',time_start1)
+            time_end=re.sub('\s+',',',time_end1)
+           
+            # make command
+            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)