Author: [log in to unmask]
Date: Sun Feb 8 13:09:38 2015
New Revision: 2074
Log:
bug fix +
Modified:
java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_metadata.py
java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_register.py
java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_util.py
Modified: java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_metadata.py
=============================================================================
--- java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_metadata.py (original)
+++ java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_metadata.py Sun Feb 8 13:09:38 2015
@@ -11,7 +11,7 @@
__SSCOLUMNS={'run':0,'tgt':5,'cur':6,'x':7,'y':8,'trig':9,
'fadcmode':10,'fadcthresh':11,'fadcwindow':12,
'seedthresh':13,'clusterthresh':14,'hitwindow':15,'pairwindow':16,
- 'desc1':19,'desc2':20,'nev':3}
+ 'desc1':19,'desc2':20,'nev':3,'runbegin':1,'runend':2}
# DAQ TRIGGER NUMBERING:
__IOSRC={'20':'SINGLES_0_EN','21':'SINGLES_1_EN',
@@ -105,7 +105,7 @@
# 3-column lines:
if len(xx)==1:
# config line messed up:
- if re.match('SSP_HPS_SINGELS_NMIN',key)!=None:
+ if re.match('SSP_HPS_SINGLES_NMIN',key)!=None:
continue
mtd[key]=int(xx[0])
@@ -166,6 +166,15 @@
desc2=xx[col['desc2']]
trig=xx[col['trig']].replace('\'','prime')
mtd['Description']='%s , %s , %s'%(trig,desc1,desc2)
+
+# if xx[col['runbegin']].find('/'):
+# unix=ERU.ConvertSpreadsheetDate(xx[col['runbegin']])
+# if (not unix==None):
+# mtd['RunBegin']=int(time)
+# if xx[col['runend']].find('/'):
+# unix=ERU.ConvertSpreadsheetDate(xx[col['runend']])
+# if (not unix==None):
+# mtd['RunEnd']=int(time)
if xx[col['nev']].find('M')>=0:
mtd['Nevents']=float(xx[col['nev']].replace('M','').rstrip())
@@ -415,5 +424,3 @@
-
-
Modified: java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_register.py
=============================================================================
--- java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_register.py (original)
+++ java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_register.py Sun Feb 8 13:09:38 2015
@@ -14,7 +14,7 @@
if len(sys.argv)!=3 and len(sys.argv)!=2:
sys.exit(USAGE)
-FILEPATH=sys.argv[1].rstrip()
+FILEPATH=sys.argv[1].rstrip().rstrip('/')
OUTFILE=None
if len(sys.argv)==3:
@@ -41,6 +41,7 @@
# Get list of files to register:
FILELIST=ERU.ListRealFiles(FILEPATH)
+
if len(FILELIST)==0:
sys.exit('No Files: '+FILEPATH)
Modified: java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_util.py
=============================================================================
--- java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_util.py (original)
+++ java/trunk/datacat/src/main/python/hpsdatacat/engrun/engrun_util.py Sun Feb 8 13:09:38 2015
@@ -152,7 +152,7 @@
mtdn=metadatanames
mtdn.sort()
first=['Run','FileNumber','Trigger','Description',
- 'BeamCurrent','Target','Nevents']
+ 'BeamCurrent','Target','Nevents','RunBegin','RunEnd']
first.reverse()
for xx in first:
if not xx in mtdn:
@@ -164,7 +164,7 @@
def SortMetadataNamesForTable(metadatanames):
mtdn=metadatanames
mtdn.sort()
- first=['Run','FileNumber']
+ first=['Run','FileNumber','RunBegin','RunEnd']
last=['Trigger','Description']
first.reverse()
for xx in first:
@@ -195,6 +195,25 @@
def DumpNames():
for key in __ALLMETADATANAMES:
print key
+
+def ConvertSpreadsheetDate(ssdate):
+ unix=None
+ yy=ssdate.rstrip().lstrip().split(' ')
+ if len(yy) == 3:
+ date = yy[0]
+ time = yy[1]
+ ampm = yy[2]
+ time = time.split(':')
+ date = date.split('/')
+ if len(date)==3 and time==2 and (ampm=='AM' or ampm=='PM'):
+ month=int(date[0])
+ day=int(date[1])
+ year=2000+int(date[2])
+ hour=int(time[0])
+ minu=int(time[1])
+ unix=(datetime.datetime(year,month,day,hour,minu)).strftime('%s')
+ return unix
+
#def GetDCOpts(filepath):
# return ' --site '+GetSite(filepath)
