Skip to content
Snippets Groups Projects
Commit a0df8959 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

TMSS-1377: replaced occurences of otdbID by tmssID

parent e54b20a0
No related branches found
No related tags found
1 merge request!736TMSS-1377 & TMSS-1376: TMSS-adapted TBB scripts and gitlab/docker TBB builds
...@@ -70,7 +70,7 @@ def addmetadata(obsid): ...@@ -70,7 +70,7 @@ def addmetadata(obsid):
global proclist global proclist
p=get_all_parameters_new(obsid) p=get_all_parameters_new(obsid)
project=p['Observation.Campaign.name'] project=p['Observation.Campaign.name']
observationID="L"+p['Observation.otdbID'] observationID="L"+p['Observation.tmssID']
print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n') print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n')
print('Adding metadata for for obs ',prevobsid,' at ',time.strftime('%Y-%m-%d %H:%M:%S')+'\n') print('Adding metadata for for obs ',prevobsid,' at ',time.strftime('%Y-%m-%d %H:%M:%S')+'\n')
if os.access(fCurrentlyDumping,os.R_OK): if os.access(fCurrentlyDumping,os.R_OK):
...@@ -103,7 +103,7 @@ def switchdatawriter(obsid): ...@@ -103,7 +103,7 @@ def switchdatawriter(obsid):
observer=p['Observation.Campaign.PI'] observer=p['Observation.Campaign.PI']
antennaSet=p['Observation.antennaSet'] antennaSet=p['Observation.antennaSet']
project=p['Observation.Campaign.name'] project=p['Observation.Campaign.name']
observationID="L"+p['Observation.otdbID'] observationID="L"+p['Observation.tmssID']
filterSelection=p['Observation.bandFilter'] filterSelection=p['Observation.bandFilter']
print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n') print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n')
if len(proclist)>0:#datawriterrunning: if len(proclist)>0:#datawriterrunning:
......
...@@ -133,7 +133,7 @@ kwm["--projectTitle"]=p['Observation.Campaign.name'] ...@@ -133,7 +133,7 @@ kwm["--projectTitle"]=p['Observation.Campaign.name']
# --projectPI 'Observation.Campaign.PI' # --projectPI 'Observation.Campaign.PI'
# --projectCoI 'Observation.Campaign.CO_I' # --projectCoI 'Observation.Campaign.CO_I'
kwm["--projectContact"]="a.corstanje@astro.ru.nl" # 'Observation.Campaign.contact' kwm["--projectContact"]="a.corstanje@astro.ru.nl" # 'Observation.Campaign.contact'
kwm["--observationID"]="L"+p['Observation.otdbID'] kwm["--observationID"]="L"+p['Observation.tmssID']
kwm["--startMJD"]=timeToMJD(p['Observation.startTime']) kwm["--startMJD"]=timeToMJD(p['Observation.startTime'])
if doTAI: if doTAI:
......
...@@ -44,7 +44,7 @@ while 1: ...@@ -44,7 +44,7 @@ while 1:
antennaSet=p['Observation.antennaSet'] antennaSet=p['Observation.antennaSet']
# project=p['Observation.ProjectName'] # project=p['Observation.ProjectName']
project=p['Observation.Campaign.name'] project=p['Observation.Campaign.name']
observationID="L"+p['Observation.otdbID'] observationID="L"+p['Observation.tmssID']
filterSelection=p['Observation.bandFilter'] filterSelection=p['Observation.bandFilter']
print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n') print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n')
if datawriterrunning: if datawriterrunning:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment