Changeset 38891

Timestamp:

Oct 20, 2015, 2:17:07 PM (11 years ago)

Author:

eugene

Message:

forced warp files end in .cmf

Location:

trunk/ippToPsps/jython

Files:

• gpc1db.py (modified) (4 diffs)
• ippjytest (modified) (1 diff)
• ipptopspsdb.py (modified) (1 diff)
• stackbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/gpc1db.py

@@ -285 +285 @@
               AND stage_id = " + str(stageID)
 
-        try:
-            rs = self.executeQuery(sql)
-        except:
-            self.logger.exception("Can't query for addIDs using :" + sql )
+        rs = self.executeQuery(sql)
 
         addIDs = []
@@ -306 +303 @@
     def getListOfDiffSkyFileIdsForDiffBatch(self, dvoDb, stageID):
 
-        self.logger.debug("Querying GPC1 for add IDs for ff_id: " + str(stageID))
+        self.logger.debug("Querying GPC1 for add IDs for diff_id: " + str(stageID))
         stage = "diff"
         sql = "SELECT diff_skyfile_id \
@@ -490 +487 @@
               join fullForceResult using (ff_id, warp_id) \
               where add_id = %d" % forcedWarpID
+
         try:
             rs = self.executeQuery(sql)
@@ -506 +504 @@
         files = []
         if pathBase.startswith("neb"):
-        
             f=os.popen("neb-ls -p " + pathBase + ".cmf")
             for i in f.readlines():
-        
                 files.append(i.rstrip())
-        
+
+        else:
+            files = glob.glob(pathBase + ".cmf")
+
         
         if len(files) < 1: return None

trunk/ippToPsps/jython/ippjytest

@@ -20 +20 @@
 setenv IPPTOPSPS_DATA $datadir/ipptopsps
 
-# XXX install jython in JARDIR
-set JYTHON = $JARDIR/jython2.5.3b1/jython.jar
-# set JYTHON = ~/jython2.5.3b1/jython.jar
-#set JYTHON = $JARDIR/jython.jar
+# both jython.jar and Lib from jython2.5.3b1 must be installed in JARDIR
+set JYTHON = $JARDIR/jython.jar
 
 if (! -r $JYTHON) then

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1627 +1627 @@
                AND skychunk = '" + self.skychunk.name + "'"
 
+        print "--- sql: " + sql
         self.execute(sql)
 

trunk/ippToPsps/jython/stackbatch.py

@@ -1361 +1361 @@
             
             for table in tables:
-              
                 match = re.match(tableRE, table.name)
                 if not match: continue