diff --git a/CMakeLists.txt b/CMakeLists.txt index fb61e238b03c02c795596c2dc427c4a2756aa22d..293c213460fb6c4448922a496f098f329215a084 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ find_package(GaudiProject) #--------------------------------------------------------------- # Declare project name and version -gaudi_project(Panoptes v6r1 - USE Online v5r32 - Rec v20r1 +gaudi_project(Panoptes v7r0 + USE Online v6r0 + Rec v21r0 DATA FieldMap VERSION v5r* ParamFiles) diff --git a/Rich/Panoptes/options/OfflineDataFiles.py b/Rich/Panoptes/options/OfflineDataFiles.py index 05243d8957d4dcada71524434c0545c35ea28b78..9127252f82cbee36f2f25c38cdfe3a0c41a08ca3 100755 --- a/Rich/Panoptes/options/OfflineDataFiles.py +++ b/Rich/Panoptes/options/OfflineDataFiles.py @@ -5,11 +5,17 @@ import glob # Check what is available searchPaths = [ - "/usera/jonesc/NFS/data/Collision16/LHCb/Raw/", # Cambridge - "/usera/jonesc/NFS/data/Collision15/LHCb/Raw/", # Cambridge - "/home/chris/LHCb/Data/" # CRJ's CernVM + #"/usera/jonesc/NFS/data/Collision16/LHCb/Raw/", # Cambridge + "/usera/jonesc/NFS/data/Collision15/LHCb/Raw/", # Cambridge + "/usera/jonesc/NFS/data/Collision12/LHCb/Raw/", # Cambridge + "/usera/jonesc/NFS/data/Collision11_25/LHCb/Raw/", # Cambridge + "/home/chris/LHCb/Data/Collision16/LHCb/Raw/" # CRJ's CernVM ] -EventSelector().Input = [ ] -for path in searchPaths : - files = sorted(glob.glob(path+"*/*.raw")) - EventSelector().Input += [ "DATAFILE='PFN:"+file+"' SVC='LHCb::MDFSelector'" for file in files ] + +files = [ ] +for path in searchPaths : files += sorted(glob.glob(path+"*/*.raw")) + +print "Data Files :-" +print("\n".join(files)) + +EventSelector().Input = [ "DATAFILE='PFN:"+file+"' SVC='LHCb::MDFSelector'" for file in files ] diff --git a/Rich/RichOnlineMonitors/src/RichDAQMonitor.cpp b/Rich/RichOnlineMonitors/src/RichDAQMonitor.cpp index 8a7b5e224003cbb32eb0cc36046eb1539639b777..6e815cd24cdfedca54738b0810b141564b662422 100755 --- a/Rich/RichOnlineMonitors/src/RichDAQMonitor.cpp +++ b/Rich/RichOnlineMonitors/src/RichDAQMonitor.cpp @@ -982,7 +982,7 @@ StatusCode DAQMonitor::execute() verbose() << "HPD footer has parity word " << hpdInfo.footer().hasParityWord () << endmsg; if (hpdInfo.footer().hasParityWord()) { - const Rich::DAQ::LongType parityWord = hpdInfo.footer().parityWord(); + const auto parityWord = hpdInfo.footer().parityWord(); bool parityOK = hpdInfo.footer().testParityWord(parityWord); if ( msgLevel(MSG::VERBOSE) ) verbose() << " parity word " << parityWord << " is OK " << parityOK << endmsg;