Changeset 37753

Timestamp:

Dec 17, 2014, 11:57:47 AM (12 years ago)

Author:

heather

Message:

diff batch nearly ready - this should fill in the remaining columns (that I can fill)

Location:

trunk/ippToPsps/jython

Files:

• diffbatch.py (modified) (6 diffs)
• gpc1db.py (modified) (2 diffs)

trunk/ippToPsps/jython/diffbatch.py

@@ -74 +74 @@
        self.analVer =  meta[5];
        self.expTime = meta[6];
+       self.obsTime = meta[7];
        self.fits = gpc1Db.getDiffStageCmf(skychunk.dvoLabel, diffSkyFileID)
        self.header = self.fits.getPrimaryHeader()
@@ -86 +87 @@
            self.projectionID = self.skycellName[8:12]
            self.skycellID = self.skycellName[13:]
+           self.skycellID = self.skycellName[8:] 
        else:
            # skycell is, eg "skycell.081"
@@ -91 +93 @@
            self.projectionID = 0
            self.skycellID = self.skycellName[8:11]
+           self.skycellID=self.skycellName[8:]
        if self.skycellID == "":
            self.skycellID = -1
@@ -213 +216 @@
         sqlLine.group("skycellID",       str(self.skycellID))
 ##        sqlLine.group("obsTime",         str(self.obsTime))     
-        sqlLine.group("expTime",         str(self.expTime))                                    
+        sqlLine.group("expTime",         str(self.expTime))
+        sqlLine.group("obsTime", str(self.obsTime))
         sqlLine.group("xPos",            "X_PSF")                                                   
         sqlLine.group("yPos",            "Y_PSF")                                                   
@@ -302 +306 @@
         sqlLine  = sqlUtility("UPDATE DiffDetection as a, " + self.scratchDb.dvoDetectionTable + " as b SET ")
         sqlLine.group("a.diffObjID", "b.objId")
+        sqlLine.group("a.diffDetID", "b.detectID")
+        sqlLine.group("a.ippObjID","b.ippObjID")
+        sqlLine.group("a.dvoRegionID",             "b.catID")
+        sqlLine.group("a.ra", "b.ra")
+        sqlLine.group("a.dec_", "b.dec_")
+        sqlLine.group("a.raErr", "b.raErr")
+        sqlLine.group("a.decErr", "b.decErr")
+        
+        sqlLine.group("a.zp","b.zp")
+        sqlLine.group("a.telluricExt", "b.telluricExt")
+        sqlLine.group("a.airmass","b.airmass")
+
         
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))   
@@ -310 +326 @@
             raise
         self.logger.infoPair("need to cull"," nulls objid")
-        self.logger.infoPair("need to add","uniquePSPSDFid")
-
+        self.logger.infoPair("adding","uniquePSPSDFid")
+        updatePspsUniqueIDs("DiffDetection")
 
     '''

trunk/ippToPsps/jython/gpc1db.py

@@ -268 +268 @@
                skycell_id, \
                diffRun.software_ver, \
-               exp_time \
+               exp_time, \
+               (to_days(dateobs)-678941 + time_to_sec(dateobs)/86400.) \
                FROM diffRun join diffInputSkyfile using (diff_id) \
                JOIN warpRun on (warp1=warp_id) \
@@ -276 +277 @@
                JOIN rawExp using (exp_id) \
                WHERE diff_skyfile_id = %d" % diffSkyfileID
-               
+        #this is a crappy way to get the mjd from the diff but we don't save it anywhere       
         try:
             rs = self.executeQuery(sql)