Changeset 34104 for trunk/ippToPsps

Timestamp:

Jun 28, 2012, 9:49:41 AM (14 years ago)

Author:

eugene

Message:

add function to get filterCount from Photcode table; add example Photcode table fits file in doc directory (merge from eam branche)

Location:

trunk/ippToPsps

Files:

• . (modified) (1 prop)
• doc (copied) (copied from branches/eam_branches/ipp-20120627/ippToPsps/doc )
• doc/Photcodes.dat (copied) (copied from branches/eam_branches/ipp-20120627/ippToPsps/doc/Photcodes.dat )
• jython/dvo.py (modified) (1 diff)
• jython/objectbatch.py (modified) (1 diff)
• jython/scratchdb.py (modified) (1 diff)

trunk/ippToPsps/jython/dvo.py

@@ -111 +111 @@
         self.importFits(
                 path,
-                "CODE NAME",
+                "CODE NAME TYPE",
                 self.scratchDb.dvoPhotcodesTable)
         self.logger.infoPair("Adding primary key to", self.scratchDb.dvoPhotcodesTable)

trunk/ippToPsps/jython/objectbatch.py

@@ -105 +105 @@
     
         # get a count of the available filters
-        filterCount = len(filters)
+        filterCount = self.scratchDb.getCountOfFiltersFromPhotcodesTable()
+        # filterCount = len(filters)
 
         self.logger.infoPair("Available filters in Photcodes", filters)

trunk/ippToPsps/jython/scratchdb.py

@@ -544 +544 @@
 
     '''
+    Gets a count of average filters (secfilt) in the DVO Photcodes table
+    '''
+    def getCountOfFiltersFromPhotcodesTable(self):
+
+        # 2 is hardwired -- convert to an enum (should probably read Ohana/src/libdvo/include/dvo.h defines
+        sql = "SELECT count(TYPE) FROM " + self.dvoPhotcodesTable + " WHERE TYPE = 2"
+
+        filterCount = 0
+        try:
+            rs = self.executeQuery(sql)
+            row = 1
+            while (rs.next()):
+                filterCount = rs.getString(1)
+            rs.close()
+        except:
+            self.logger.errorPair("Could not get filter count", sql )
+
+        return filterCount
+
+    '''
     Gets a list of filters ordered as thy are in the DVO Photcodes table, as this reflects the order they apper in the cps file
     '''
     def getOrderedListOfFiltersFromPhotcodesTable(self, interestedFilters):
+
+        sql = "SELECT count(TYPE) FROM " + self.dvoPhotcodesTable + " WHERE TYPE = 'sec'"
 
         sql = "SELECT NAME FROM " + self.dvoPhotcodesTable + " WHERE "