Changeset 32033

Timestamp:

Aug 4, 2011, 11:51:03 AM (15 years ago)

Author:

rhenders

Message:

yet more logginf improvments; now using one, and only one, name for batches: P2, ST and IN

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (9 diffs)
• detectionbatch.py (modified) (2 diffs)
• initbatch.py (modified) (1 diff)
• stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/batch.py

@@ -49 +49 @@
         self.doc = doc
         self.fits = fits
-        if self.fits is not None:
-            self.header = self.fits.getPrimaryHeader()
+        if self.fits: self.header = self.fits.getPrimaryHeader()
 
         # set up logging
@@ -92 +91 @@
         # create a new batch
         self.batchID = self.ippToPspsDb.createNewBatch( 
-                self.getPspsBatchType(), 
+                self.batchType, 
                 self.id,
                 survey,
@@ -100 +99 @@
         # get local storage location from config
         self.batchName = "B%08d" % self.batchID
-        self.subDir = self.doc.find("localOutPath").text + "/" + self.getPspsBatchType() + "/" + dvoName
+        self.subDir = self.doc.find("localOutPath").text + "/" + self.batchType + "/" + dvoName
         self.localOutPath = self.subDir + "/" + self.batchName 
         if not os.path.exists(self.localOutPath): os.makedirs(self.localOutPath)
@@ -111 +110 @@
         if not self.useFullTables: self.scratchDb.createDvoTables()
 
-        self.everythingOK = True
-
-    '''
-    Destructor
-    '''
-    def __del__(self):
-
-        self.logger.debug("Batch destructor")
-
-    '''
-    Prints metadata to the log
-    '''
-    def printMe(self):
-
+        # dump stuff to the log
+        self.logger.infoTitle("New " + self.batchType + " batch")
         self.logger.infoPair("Batch name", self.batchName)
         self.logger.infoPair("Survey", self.survey)
@@ -130 +117 @@
         self.logger.infoPair("DVO location", self.dvoLocation)
         self.logger.infoPair("Use full DVO tables?", "%d" % self.useFullTables)
+
+        if self.fits:
+            self.logger.infoPair("Input FITS file", self.fits.getOriginalPath())
+            self.logger.infoPair("Input FITS primary header", "%s cards found" % self.fits.getPrimaryHeaderCardCount())
+
         self.logger.infoPair("Output path", self.localOutPath)
+
+        self.everythingOK = True
+
+    '''
+    Destructor
+    '''
+    def __del__(self):
+
+        self.logger.debug("Batch destructor")
 
     '''
@@ -169 +170 @@
         # batch information
         root.attrib['name'] = self.batchName
-        root.attrib['type'] = self.getPspsBatchType()
+        root.attrib['type'] = self.batchType
         root.attrib['timestamp'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") 
         if self.survey != "":
@@ -253 +254 @@
             self.logger.error("Don't know this survey: '" + self.survey + "'")
             return "NA"
-
-    '''
-    Gets PSPS friendly batch type TODO only use PSPS batch names, P2, ST etc
-    '''
-    def getPspsBatchType(self):
-
-        if self.batchType == "init": return "IN"
-        elif self.batchType == "detection": return "P2"
-        elif self.batchType == "stack": return "ST"
-        else: self.logger.error("Don't know this batch type: " + self.survey)
 
     '''
@@ -465 +456 @@
             return
 
-        self.printMe()
         self.createEmptyPspsTables()
         self.importIppTables()
@@ -475 +465 @@
 
         self.logger.infoPair("Batch......", "complete")
-        self.logger.infoSeparator()
-
-
+
+

trunk/ippToPsps/jython/detectionbatch.py

@@ -43 +43 @@
                ippToPspsDb,
                camID,
-               "detection", 
+               "P2", 
                gpc1Db.getCameraStageSmf(camID),
                #"MD04") # TODO
@@ -107 +107 @@
        self.ippToPspsDb.insertDetectionMeta(self.batchID, self.expID, self.filter)
 
-    '''
-    Prints metadata to the log
-    '''
-    def printMe(self):
-
-        super(DetectionBatch, self).printMe()
-
-        self.logger.infoPair("Cam ID", "%d" % self.id)
-        self.logger.infoPair("Exp ID", "%d" % self.expID)
-        self.logger.infoPair("Exp name", "%s" % self.expName)
-        self.logger.infoPair("Distribution group", "%s" % self.distGroup)
+       # dump stuff to log
+       self.logger.infoPair("Cam ID", "%d" % self.id)
+       self.logger.infoPair("Exp ID", "%d" % self.expID)
+       self.logger.infoPair("Exp name", "%s" % self.expName)
+       self.logger.infoPair("Distribution group", "%s" % self.distGroup)
 
     '''

trunk/ippToPsps/jython/initbatch.py

@@ -37 +37 @@
                ippToPspsDb, 
                0, 
-               "init", 
+               "IN", 
                None)
 

trunk/ippToPsps/jython/stackbatch.py

@@ -40 +40 @@
                ippToPspsDb,
                stackID,
-               "stack", 
+               "ST", 
                gpc1Db.getStackStageCmf(stackID), 
                "3PI") # TODO
@@ -92 +92 @@
            self.scratchDb.insertNewDvoExternID(self.header['SOURCEID'], self.header['IMAGEID'])
 
-    '''
-    Prints metadata to the log
-    '''
-    def printMe(self):
-
-       super(StackBatch, self).printMe()
-
+
+       # dump stuff to log
        self.logger.infoPair("Stack ID", "%d" % self.id)
        self.logger.infoPair("Stack type", "%s" % self.stackType)
        self.logger.infoPair("Skycell", "%s" % self.skycell)
        self.logger.infoPair("Filter", "%s" % self.filter)
+