Changeset 37238

Timestamp:

Aug 12, 2014, 3:18:42 PM (12 years ago)

Author:

eugene

Message:

drop a bunch of test prints

Location:

branches/eam_branches/ipp-20140717/ippToPsps/jython

Files:

• batch.py (modified) (6 diffs)
• loader.py (modified) (1 diff)
• queue.py (modified) (4 diffs)
• stackbatch.py (modified) (4 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/batch.py

@@ -39 +39 @@
                  fits): 
 
-        # print "starting the batch"
-
-        # self.printline = 0
-        # self.testprint()
-
         self.readHeader = False
         self.config = config
@@ -53 +48 @@
         self.logger.infoSeparator()
         self.logger.debug("Batch class constructor")
-
-        # self.testprint()
 
         # set up class variables
@@ -66 +59 @@
         self.pspsVoTableFilePath = self.config.configDir + "tables." + batchType + ".vot"
 
-        # self.testprint()
-
         # check FITS file is ok
         if self.fits: 
@@ -106 +97 @@
         if not os.path.exists(self.localOutPath): os.makedirs(self.localOutPath)
 
-        # self.testprint()
-
         # store today's date
         now = datetime.datetime.now();
@@ -123 +112 @@
             self.logger.infoPair("Input FITS file", self.fits.getOriginalPath())
             self.logger.infoPair("Input FITS primary header", "%s cards found" % self.fits.getPrimaryHeaderCardCount())
-
-        # self.testprint()
 
         self.logger.infoPair("Output path", self.localOutPath)
@@ -493 +480 @@
            # get everything from table
            try:
-               print "reading table from mysql ", table
                _table = stilts.tread(self.scratchDb.url + '#SELECT * FROM ' + table)
                self.scratchDb.killLastConnectionID()

branches/eam_branches/ipp-20140717/ippToPsps/jython/loader.py

@@ -82 +82 @@
 
         self.skychunk.printAll()
-        print "done with loader.py init"
 
     '''

branches/eam_branches/ipp-20140717/ippToPsps/jython/queue.py

@@ -29 +29 @@
         super(Queue, self).__init__(argv)
 
-        # print "inited ipptopsps"
-
         # create various objects
         self.gpc1Db = Gpc1Db(self.logger, self.config)
-        # print "connect to gpc1"
 
         self.datastore = Datastore(self.logger, self.skychunk, self.ippToPspsDb)
-
-        print "made datastore"
 
         # connect to scratch database
         self.scratchDb = ScratchDb(self.logger, self.config)
 
-        print "connect to scratchdb"
-
         try:
-            print "does this work?"
             self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
         except:
             self.exitProgram("Unable to create instance of DvoObject")
             raise
-
-        print "got objects"
 
         self.skychunk.printAll()
@@ -144 +134 @@
                     if (dec > 85): raise
 
-                    print "dec, dD: ", dec, dD ,self.skychunk.maxDec
+                    # print "dec, dD: ", dec, dD ,self.skychunk.maxDec
 
                     # a given box centered at RA,DEC with (linear) size of SIDE has the following bounds
@@ -152 +142 @@
                     ra = self.skychunk.minRa + dR
                     
-                    print "ra, dR, maxRa", ra, dR, self.skychunk.maxRa
+                    # print "ra, dR, maxRa", ra, dR, self.skychunk.maxRa
 
                     # XXX not sure why this is not done with a for-loop...
                     while dec <= self.skychunk.maxDec:
                         while ra <= self.skychunk.maxRa:
-                           print "here" 
                            # a given box centered at RA,DEC with (linear) size of SIDE has the following bounds
                            minRA  = ra  - dR
@@ -175 +164 @@
                                        len(ids)))
                 
-                           print "box_id: ", box_id
-
                            if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
                            # print "inserted pending"

branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

@@ -476 +476 @@
         tablename = "StackModelFit" + model
 
+        if self.config.camera == "simtest":
+            self.logger.infoPair("Skipping table for simtest:", tablename)
+            return
+
         self.logger.infoPair("Procesing table", tablename)
         self.insertDvoIDs(tablename, "StackObjectThin")
@@ -607 +611 @@
         tablename = "StackPetrosian"
 
+        if self.config.camera == "simtest":
+            self.logger.infoPair("Skipping table for simtest:", tablename)
+            return
+
         self.logger.infoPair("Procesing table", tablename)
         self.insertDvoIDs(tablename, "StackObjectThin")
@@ -677 +685 @@
         tablename = "StackApFlx"
 
+        if self.config.camera == "simtest":
+            self.logger.infoPair("Skipping table for simtest:", tablename)
+            return
+
         self.logger.infoPair("Procesing table", tablename)
         self.insertDvoIDs(tablename, "StackObjectThin")
@@ -697 +709 @@
 
         tablename = "StackApFlxFull" + version
+
+        if self.config.camera == "simtest":
+            self.logger.infoPair("Skipping table for simtest:", tablename)
+            return
 
         self.logger.infoPair("Procesing table", tablename)