Changeset 35063 for branches/eam_branches/ipp-20121219/ippToPsps/jython

Timestamp:

Jan 27, 2013, 5:58:25 AM (14 years ago)

Author:

eugene

Message:

enable test mode from command-line (-test, after jython module); add parallel dvo option; make database selection more consistent and variable on test/not-test

Location:

branches/eam_branches/ipp-20121219/ippToPsps/jython

Files:

• detectionbatch.py (modified) (1 diff)
• dvo.py (modified) (3 diffs)
• dvoobjects.py (modified) (1 diff)
• gpc1db.py (modified) (1 diff)
• ipptopsps.py (modified) (2 diffs)
• ipptopspsdb.py (modified) (3 diffs)
• loader.py (modified) (1 diff)
• scratchdb.py (modified) (1 diff)
• setupScratchDb.py (modified) (1 diff)

branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py

@@ -927 +927 @@
     def importIppTables(self, filter=""):
 
-       if self.config.test: regex = "XY33.psf"
-       else : regex = ".*.psf"
+       ## if self.config.test: regex = "XY33.psf"
+       ## else : regex = ".*.psf"
+       regex = ".*.psf"
   
-       # XXX EAM NOTE : this is fragile : requires PS1_V_
+       # XXX EAM NOTE : this is fragile : requires PS1_V4
        columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG KRON_FLUX KRON_FLUX_ERR FLAGS FLAGS2 SKY SKY_SIGMA EXT_NSIGMA PSF_QF_PERFECT PSF_CHISQ"
 

branches/eam_branches/ipp-20121219/ippToPsps/jython/dvo.py

@@ -33 +33 @@
 
     '''
-    def __init__(self, logger, config, scratchDbName="ipptopsps_test_scratch"):
+    def __init__(self, logger, config, scratchDbName=None):
 
         # set up logging
@@ -49 +49 @@
         self.useStilts = 0
 
-        # connect to the specified scratch database
+        # connect to the specified scratch database, if a name is given, otherwise use the first version
         try:
-            self.scratchDb = ScratchDb(self.logger, self.config, scratchDbName)
+            self.scratchDb = ScratchDb(self.logger, self.config, '1', scratchDbName)
         except: raise
 
@@ -617 +617 @@
         cmd += " " + str(decCenter+halfSize)
 
+        if self.config.parallel:
+            cmd += " -parallel"
+
         self.logger.infoPair("Running dvopsps", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE)

branches/eam_branches/ipp-20121219/ippToPsps/jython/dvoobjects.py

@@ -67 +67 @@
         cmd += " -cpt " + region
 
+        if self.config.parallel:
+            cmd += " -parallel"
+
         self.logger.infoPair("Running dvopsps", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE)

branches/eam_branches/ipp-20121219/ippToPsps/jython/gpc1db.py

@@ -21 +21 @@
     '''
     def __init__(self, logger, config):
-        super(Gpc1Db, self).__init__(logger, config, "gpc1database")
+        # define database type
+        if (config.test): 
+            dbType = "gpc1database_test"
+        else:
+            dbType = "gpc1database"
+
+        super(Gpc1Db, self).__init__(logger, config, dbType)
 
     '''

branches/eam_branches/ipp-20121219/ippToPsps/jython/ipptopsps.py

@@ -22 +22 @@
     '''
     def __init__(self, argv, logToStdout=1, logToFile=0):
+
+        testmode = False
+        for arg in sys.argv:
+            if arg == "-test": 
+                testmode = True
+                sys.argv.remove(arg)
+            if arg == "-t": 
+                testmode = True
+                sys.argv.remove(arg)
 
         # are the arsg ok? all programs require a config name
@@ -51 +60 @@
         # set up config object
         self.config = Config(self.PROGNAME, CONFIGNAME, self.configDir)
+        self.config.test = testmode
+
+        if self.config.test: print "using test mode"
+        else: print "not using test mode"
+
         self.logger = self.config.getLogger(self.HOST, self.PID, logToStdout, logToFile)
 

branches/eam_branches/ipp-20121219/ippToPsps/jython/ipptopspsdb.py

@@ -18 +18 @@
     '''
     def __init__(self, logger, config):
-        super(IppToPspsDb, self).__init__(logger, config, "ipptopspsdatabase")
+        if (config.test): 
+            dbType = "ipptopspsdatabase_test"
+        else:
+            dbType = "ipptopspsdatabase"
+        super(IppToPspsDb, self).__init__(logger, config, dbType)
 
         self.MAX_FAILS = 5
@@ -965 +969 @@
         ,queue_ST \
         ,queue_OB \
+        ,parallel \
         FROM config \
         WHERE name = '" + self.config.name + "'"
@@ -1006 +1011 @@
             if rs.getInt(20) == 1: self.config.batchTypes.append("ST")
             if rs.getInt(21) == 1: self.config.batchTypes.append("OB")
+
             self.config.force = True # TODO
-            self.config.test = False # TODO
+            self.config.parallel = False # TODO
+
+            if rs.getInt(22) == 1: self.config.parallel = True
+
+            if self.config.parallel: print "USING parallel"
             self.config.isLoaded = True
         except:

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

@@ -34 +34 @@
         super(Loader, self).__init__(argv, 1, 1)
 
-        # create gpc1 database objects
+        if self.config.parallel:
+            print "PARALLEL dvo"
+        else: 
+            print "SERIAL dvo"
+
+        # connect to the gpc1 database
         self.gpc1Db = Gpc1Db(self.logger, self.config)
 
-        # XXX this is really bad: need to get these from config... (see this code:)
-        ## XX # open config and grab database parameters
-        ## XX if not dbName: self.dbName = config.getDbName(dbType)
-        ## XX else: self.dbName = dbName
-
         # connect to scratch database
-        scratchDbs = ['ipptopsps_test_scratch', 'ipptopsps_test_scratch2', 'ipptopsps_test_scratch3']
-        for dbName in scratchDbs:
-            self.scratchDb = ScratchDb(self.logger, self.config, dbName)
-            if self.scratchDb.anyOtherConnections():
-                self.logger.errorPair("This scratch Db is already in use", dbName)
+        scratchDbs = ['1', '2', '3']
+        for dbVersion in scratchDbs:
+            self.scratchDb = ScratchDb(self.logger, self.config, dbVersion)
+            if not self.config.test and self.scratchDb.anyOtherConnections():
+                self.logger.errorPair("This scratch Db is already in use", self.scratchDb.dbName)
                 self.scratchDb.disconnect()
                 continue

branches/eam_branches/ipp-20121219/ippToPsps/jython/scratchdb.py

@@ -19 +19 @@
     Constructor
     '''
-    def __init__(self, logger, config, dbName=None):
-        super(ScratchDb, self).__init__(logger, config, "localdatabase", dbName)
+    def __init__(self, logger, config, dbVersion, dbName=None):
+
+        # create gpc1 database objects
+        if (config.test): 
+            dbType = "localdatabase_test"
+        else:
+            dbType = "localdatabase"
+
+        if not dbName:
+            dbName = config.getDbName(dbType)
+            dbName += dbVersion
+
+        super(ScratchDb, self).__init__(logger, config, dbType, dbName)
 
         self.dvoDoneTable = "dvoDone"

branches/eam_branches/ipp-20121219/ippToPsps/jython/setupScratchDb.py

@@ -26 +26 @@
 
         try:
-            self.scratchDb = ScratchDb(self.logger, self.config, argv[2])
+            self.scratchDb = ScratchDb(self.logger, self.config, '0', argv[2])
         except:
             self.exitProgram("Could not connect to a scratch Db")