Changeset 38956

Timestamp:

Oct 23, 2015, 6:06:25 PM (11 years ago)

Author:

mhuber

Message:

adding md5sum for frame,stack,diff,forcedwarpMeta (was working for frame+stack)

Location:

trunk/ippToPsps/jython

Files:

• detectionbatch.py (modified) (3 diffs)
• diffbatch.py (modified) (3 diffs)
• fits.py (modified) (2 diffs)
• forcedwarpbatch.py (modified) (3 diffs)
• stackbatch.py (modified) (3 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -112 +112 @@
        # MJD-OBS is the exposure start, EXTIME / 172800 = (EXPTIME sec / 84600 sec/day) / 2
        self.obsTime = float(self.header['MJD-OBS']) + (float(self.header['EXPTIME']) / 172800.0)
-      
+    
+       ## MEH md5sum options test 
+       self.md5sum = None
+       self.md5sum = self.fits.getMd5sum()
+       #self.md5sum = self.fits.getMd5sumShell()
+       #self.md5sum = self.fits.getMd5sumFile()
+  
        # set up some defauts
        self.totalNumPhotoRef = 0
@@ -137 +143 @@
         sqlLine = sqlUtility("INSERT INTO FrameMeta (")
 
-        # sqlLine.group("md5sum",               ' needs a number');
- 
         sqlLine.group("frameID",               str(self.expID));
         sqlLine.group("frameName",             self.expName);
@@ -148 +152 @@
         sqlLine.group("telescopeID",           "1");
         sqlLine.group("analysisVer",           self.analysisVer);
+        sqlLine.group("md5sum",                str(self.md5sum))
         sqlLine.group("photoScat",             self.getKeyFloat(self.header, "%.8f", 'ZPT_ERR'));
         sqlLine.group("expStart",              self.getKeyFloat(self.header, "%.10f", 'MJD-OBS'));

trunk/ippToPsps/jython/diffbatch.py

@@ -73 +73 @@
        self.skycellName = {}
        self.analysisVer = {}
+       self.md5sum = {}
        self.expTime = {}
        self.obsTime = {}
@@ -149 +150 @@
                self.skycellID[num] = -1
 
+           ## MEH md5sum test
+           self.md5sum[num] = self.fits[num].getMd5sum()
 
        # drop the existing tables    
@@ -219 +222 @@
         sqlLine.group("photoCalID",            self.photoCalID[num]);
         sqlLine.group("analysisVer",           str(self.analysisVer[num]));
+        sqlLine.group("md5sum",                str(self.md5sum[num]))
         sqlLine.group("expTime",               self.expTime[num]);
         sqlLine.group("ctype1",                self.getKeyValue(self.header[num], 'CTYPE1'));

trunk/ippToPsps/jython/fits.py

@@ -4 +4 @@
 import re
 import shutil
+import hashlib
+from subprocess import call, PIPE, Popen
 
 '''
@@ -42 +44 @@
        # move file pointer back to the start of the file
        self.rewindToStart()
+
+
+    '''
+    Get md5sum for file 
+    '''
+    def getMd5sum(self):
+        ## memory inefficient all at once read but should be ok...
+        md5 = hashlib.md5(open(self.originalPath,'rb').read())
+        return md5.hexdigest()
+
+    def getMd5sumShell(self):
+        md5cmd = "md5sum %s" % (self.originalPath)
+        md5 = Popen(md5cmd, shell=True, stdout=PIPE).stdout.read()
+        return md5[0:32]
+
+    def getMd5sumFile(self):
+        ## unclear if rb by default for file so maybe not best
+        md5 = hashlib.md5(self.file.read())
+        ## if used, then need to move file pointer back to the start of the file for others to use
+        self.rewindToStart()
+        return md5.hexdigest()
 
     '''

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -78 +78 @@
        self.expTime = {}
        self.analysisVer = {}
+       set.md5sum = {}
        self.tessName = {}
        self.obsTime = {}
@@ -198 +199 @@
            #except: raise
 
+           ## MEH md5sum test
+           self.md5sum[num] = self.fits[num].getMd5sum()
 
            self.logger.infoPair("calculating ObsTime","ok")
@@ -265 +268 @@
         sqlLine.group("photoCalID",     photoCalID)
         sqlLine.group("analysisVer",    str(self.analysisVer[num]))
+        sqlLine.group("md5sum",         str(self.md5sum[num]))
         sqlLine.group("expTime",        self.expTime[num])
 # no astrometry calibration for forced warp

trunk/ippToPsps/jython/stackbatch.py

@@ -63 +63 @@
        self.fits = {}
        self.headerSet = {}
+       self.md5sum = {}
 
        # we have two sets of imageIDs here:
@@ -112 +113 @@
            self.logger.infoPair(filter + " imageID = ", imageID)       
            self.imageIDs[filter] = imageID
+
+           ## MEH -- md5sum test
+           self.md5sum[filter] = self.fits[filter].getMd5sum()
 
        # did we find any valid stacks?
@@ -281 +285 @@
         sqlLine.group("photoCalID",         photoCalID) 
         sqlLine.group("analysisVer",        str(self.analysisVer))
+        sqlLine.group("md5sum",             str(self.md5sum[filter]))
         sqlLine.group("detectionThreshold", detectionThreshold)
         sqlLine.group("expTime",            self.getKeyFloat(header, "%.5f", 'EXPTIME'))