Changeset 36201

Timestamp:

Oct 9, 2013, 4:53:45 PM (13 years ago)

Author:

heather

Message:

added feature of time range for P2/ST - doesnt work for ST yet, queue those seperately

Location:

trunk/ippToPsps

Files:

• config/changes.txt (modified) (1 diff)
• config/ippToPspsDbSchema.sql (modified) (1 diff)
• jython/dvo.py (modified) (2 diffs)
• jython/gpc1db.py (modified) (2 diffs)
• jython/ipptopspsdb.py (modified) (2 diffs)
• jython/queue.py (modified) (2 diffs)

trunk/ippToPsps/config/changes.txt

@@ -5 +5 @@
 
 
+alter table skychunk add trange_start timestamp after ST_cmf_version;
+alter table skychunk add trange_end timestamp after trange_start;                    
+
 -- not yet alter table batch add column smf_version varchar(16) after comment;

trunk/ippToPsps/config/ippToPspsDbSchema.sql

@@ -129 +129 @@
   `P2_smf_version` varchar(16) default NULL,
   `ST_cmf_version` varchar(16) default NULL, 
+  `trange_start`  timestamp NOT NULL default '0000-00-00 00:00:00',
+  `trange_end` timestamp NOT NULL default '0000-00-00 00:00:00',  
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;

trunk/ippToPsps/jython/dvo.py

@@ -630 +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"
@@ -646 +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
+   
         self.logger.infoPair("Running dvopsps", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)

trunk/ippToPsps/jython/gpc1db.py

@@ -49 +49 @@
     NB this uses Bill's potentially temporary 'skycells' database when finding RA/Dec for stacks.
     '''
-    def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999):
+    def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999, tstart="0000-00-00 00:00:00", tend = "0000-00-00 00:00:00"):
 
         self.logger.debugPair("GPC1 RA range", "%.2f -> %.2f" % (minRA, maxRA))
         self.logger.debugPair("GPC1 Dec range", "%.2f -> %.2f" % (minDec, maxDec))
-
+        
         rows = []
 
@@ -80 +80 @@
                    AND addRun.state = 'full' \
                    AND decl BETWEEN RADIANS(" + str(minDec) + ") AND RADIANS(" + str(maxDec) + ") \
-                   AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ")"
+                   AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ") \
+                   AND dateobs >= '" + tstart + "'\
+                   AND dateobs <= '" + tend  + "'"
 
         elif batchType == "ST":       

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1119 +1119 @@
         ,P2_smf_version \
         ,ST_cmf_version \
+        ,trange_start \
+        ,trange_end \
         FROM skychunk \
         WHERE name = '" + self.skychunk.name + "'"
@@ -1167 +1169 @@
             self.skychunk.P2_smf_version = rs.getString(23)
             self.skychunk.ST_cmf_version = rs.getString(24)
+            self.skychunk.trange_start = rs.getString(25)
+            self.skychunk.trange_end = rs.getString(26) 
 
             if self.skychunk.parallel: print "USING parallel"

trunk/ippToPsps/jython/queue.py

@@ -86 +86 @@
                             self.skychunk.maxRa,
                             self.skychunk.minDec,
-                            self.skychunk.maxDec)
+                            self.skychunk.maxDec,
+                            self.skychunk.trange_start,
+                            self.skychunk.trange_end)
                     rows = self.dvoObjects.allPopulatedRegionInfo
                     self.dvoObjects.printSummary()
@@ -98 +100 @@
                             self.skychunk.maxRa, 
                             self.skychunk.minDec, 
-                            self.skychunk.maxDec)
+                            self.skychunk.maxDec,
+                            self.skychunk.trange_start,
+                            self.skychunk.trange_end)
 
                 # EAM TEST I/O