Changeset 39224 for branches/eam_branches/ipp-20151113/ippToPsps/jython/queue.py

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/jython/queue.py (modified) (3 diffs)

branches/eam_branches/ipp-20151113/ippToPsps

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile

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

@@ -146 +146 @@
 
                     # XXX not sure why this is not done with a for-loop...
+                    # answer: because python does not have a good float-style for-loop
                     while dec <= self.skychunk.maxDec:
                         while ra <= self.skychunk.maxRa:
@@ -158 +159 @@
             
                            ids = self.ippToPspsDb.getItemsInThisBox(minRA, maxRA, minDEC, maxDEC)
-    
+
                            self.logger.info("|    %5.1f    |    %5.1f    |  %9d  |  %9d  |" % (
                                        ra, 
@@ -165 +166 @@
                                        len(ids)))
                 
-                           if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
-                           # print "inserted pending"
+                           if len(ids) > 0: 
+                               ## for myID in ids:
+                               ##     print "id: %d : %10.6f - %10.6f | %10.6f - %10.6f" % (myID, minRA, maxRA, minDEC, maxDEC)
+
+                               self.ippToPspsDb.insertPending(box_id, batchType, ids)
+                               # print "inserted pending"
+
                            ra = ra + 2*dR
                            # print "new ra: ", ra

@@ -14 +14 @@
 install-sh
 Doxyfile
+compile