diff --git a/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py b/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py index 71dfef063441f4102f460fc2c8e6ff22d7dbc858..1e37074cb5a301797e7848fea32c5dd783ee5ead 100644 --- a/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py +++ b/CEP/TBB/TBBdatawriter/TBBTMSSBusListener.py @@ -70,7 +70,7 @@ def addmetadata(obsid): global proclist p=get_all_parameters_new(obsid) 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('Adding metadata for for obs ',prevobsid,' at ',time.strftime('%Y-%m-%d %H:%M:%S')+'\n') if os.access(fCurrentlyDumping,os.R_OK): @@ -103,7 +103,7 @@ def switchdatawriter(obsid): observer=p['Observation.Campaign.PI'] antennaSet=p['Observation.antennaSet'] project=p['Observation.Campaign.name'] - observationID="L"+p['Observation.otdbID'] + observationID="L"+p['Observation.tmssID'] filterSelection=p['Observation.bandFilter'] print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n') if len(proclist)>0:#datawriterrunning: diff --git a/CEP/TBB/TBBdatawriter/addmetadata.py b/CEP/TBB/TBBdatawriter/addmetadata.py index de9824311270b436f4f9da048f617e091ed1a8cf..11729c3b0363a0598dd9801f6e6ea5d03184af01 100755 --- a/CEP/TBB/TBBdatawriter/addmetadata.py +++ b/CEP/TBB/TBBdatawriter/addmetadata.py @@ -133,7 +133,7 @@ kwm["--projectTitle"]=p['Observation.Campaign.name'] # --projectPI 'Observation.Campaign.PI' # --projectCoI 'Observation.Campaign.CO_I' 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']) if doTAI: diff --git a/CEP/TBB/TBBdatawriter/rundatawriter.py b/CEP/TBB/TBBdatawriter/rundatawriter.py index 73e5818c317e2184e49f66ec221dd7be067cc091..34e45f1a71eed06017f530b9a21fad174cbeb942 100755 --- a/CEP/TBB/TBBdatawriter/rundatawriter.py +++ b/CEP/TBB/TBBdatawriter/rundatawriter.py @@ -44,7 +44,7 @@ while 1: antennaSet=p['Observation.antennaSet'] # project=p['Observation.ProjectName'] project=p['Observation.Campaign.name'] - observationID="L"+p['Observation.otdbID'] + observationID="L"+p['Observation.tmssID'] filterSelection=p['Observation.bandFilter'] print('Observation ',obsid,'Start time ', p['Observation.startTime'],' Stop time: ',p['Observation.stopTime']+'\n') if datawriterrunning: