fix issue of potentially using wrong LS or run number in event object with FRDPreUnpack

Author: smorovic

EventFilter/Utilities/interface/DAQSourceModelsFRD.h

@@ -102,7 +102,7 @@ class DataModeFRDPreUnpack : public DataMode {
   void readEvent(edm::EventPrincipal& eventPrincipal) override;
 
   //non-virtual
-  void unpackEvent(edm::streamer::FRDEventMsgView* eview, UnpackedRawEventWrapper* ec);
+  void unpackEvent(edm::streamer::FRDEventMsgView* eview, UnpackedRawEventWrapper* ec, unsigned int ls);
   void unpackFile(RawInputFile*) override;
   edm::Timestamp fillFEDRawDataCollection(edm::streamer::FRDEventMsgView* eview,
                                           FEDRawDataCollection& rawData,

EventFilter/Utilities/src/DAQSourceModelsFRD.cc

@@ -189,7 +189,7 @@ std::string DataModeFRD::getChecksumError() const {
  * FRD preRead
  */
 
-void DataModeFRDPreUnpack::unpackEvent(edm::streamer::FRDEventMsgView* eview, UnpackedRawEventWrapper* ec) {
+void DataModeFRDPreUnpack::unpackEvent(edm::streamer::FRDEventMsgView* eview, UnpackedRawEventWrapper* ec, unsigned int ls) {
   //TODO: also walk the file and build checksum
   FEDRawDataCollection* rawData = new FEDRawDataCollection;
   bool tcdsInRange;
@@ -203,7 +203,8 @@ void DataModeFRDPreUnpack::unpackEvent(edm::streamer::FRDEventMsgView* eview, Un
   if (err) {
     ec->setError(errmsg);
   } else if (daqSource_->useL1EventID()) {
-    edm::EventID eventID = edm::EventID(daqSource_->eventRunNumber(), daqSource_->currentLumiSection(), L1EventID);
+    //filelist mode run override not available with this model currently (source sets it too late)
+    edm::EventID eventID = edm::EventID(ec->run(), ls, L1EventID);
     ec->setAux(new edm::EventAuxiliary(
         eventID, daqSource_->processGUID(), tstamp, eview->isRealData(), edm::EventAuxiliary::PhysicsTrigger));
     ec->aux()->setProcessHistoryID(daqSource_->processHistoryID());
@@ -216,8 +217,8 @@ void DataModeFRDPreUnpack::unpackEvent(edm::streamer::FRDEventMsgView* eview, Un
     tcds::Raw_v1 const* tcds = reinterpret_cast<tcds::Raw_v1 const*>(tcds_pointer + FEDHeader::length);
     edm::EventAuxiliary* aux = new edm::EventAuxiliary();  //allocate empty aux
     *aux = evf::evtn::makeEventAuxiliary(tcds,
-                                         daqSource_->eventRunNumber(),
-                                         daqSource_->currentLumiSection(),
+                                         ec->run(),
+                                         ls,
                                          eview->isRealData(),
                                          static_cast<edm::EventAuxiliary::ExperimentType>(fedHeader.triggerType()),
                                          daqSource_->processGUID(),
@@ -279,7 +280,7 @@ void DataModeFRDPreUnpack::unpackFile(RawInputFile* currentFile) {
       ec->setChecksumError(ss.str());
       //unpackEvent(eview.get(), ec);
     } else
-      unpackEvent(eview.get(), ec);
+      unpackEvent(eview.get(), ec, currentFile->lumi_);
     currentFile->queue(ec);
   }
 }
@@ -327,7 +328,7 @@ edm::Timestamp DataModeFRDPreUnpack::fillFEDRawDataCollection(edm::streamer::FRD
           throw cms::Exception("DataModeFRDPreUnpack:::fillFRDCollection")
             << "Second TCDS FED ID " << fedId << " found. First ID: " << selectedTCDSFed;
       }
-    //take event ID from GTPE FED
+      //take event ID from GTPE FED
       FEDRawData& fedData = rawData.FEDData(fedId);
       fedData.resize(fedSize);
       memcpy(fedData.data(), event + eventSize, fedSize);
@@ -360,8 +361,6 @@ edm::Timestamp DataModeFRDPreUnpack::fillFEDRawDataCollection(edm::streamer::FRD
   } catch (cms::Exception &e) {
     err = true;
     errmsg = e.what();
-    //std::cout << " DEBUG: " << errmsg << std::endl << std::flush;
-    //assert(0);
   }
   return tstamp;
 }

EventFilter/Utilities/test/RunBUFU.sh

@@ -161,7 +161,7 @@ ${CMDLINE_STARTFU}  > out_2_fu.log 2>&1 || diefu "${CMDLINE_STARTFU}" $? $OUTDIR
 #no failures, clean up everything including logs if there are no errors
 rm -rf $OUTDIR/{ramdisk,data,*.log}
 
-echo "running DAQSource test with striped event FRD"
+echo "running DAQSource test with striped event FRD (SFB)"
 CMDLINE_STARTBU="cmsRun startBU.py runNumber=${runnumber} fffBaseDir=${OUTDIR} maxLS=2 fedMeanSize=128 eventsPerFile=20 eventsPerLS=35 frdFileVersion=2 buBaseDir=ramdisk1 subsystems=TCDS,SiPixel,ECAL,RPC"
 ${CMDLINE_STARTBU}  > out_2_bu.log 2>&1 || diebu "${CMDLINE_STARTBU}" $? $OUTDIR
 CMDLINE_STARTBU="cmsRun startBU.py runNumber=${runnumber} fffBaseDir=${OUTDIR} maxLS=2 fedMeanSize=128 eventsPerFile=20 eventsPerLS=35 frdFileVersion=2 buBaseDir=ramdisk2 subsystems=SiStrip,HCAL,DT,CSC"
@@ -171,7 +171,7 @@ CMDLINE_STARTFU="cmsRun startFU_daqsource.py daqSourceMode=FRDStriped runNumber=
 ${CMDLINE_STARTFU}  > out_2_fu.log 2>&1 || diefu "${CMDLINE_STARTFU}" $? $OUTDIR out_2_fu.log
 rm -rf $OUTDIR/{ramdisk,data,*.log}
 
-echo "running DAQSource test with unpacking in reader threads"
+echo "running DAQSource test with unpacking in reader threads (FRDPreUnpack)"
 CMDLINE_STARTBU="cmsRun startBU.py runNumber=${runnumber} fffBaseDir=${OUTDIR} maxLS=2 fedMeanSize=128 eventsPerFile=20 eventsPerLS=35 frdFileVersion=1"
 CMDLINE_STARTFU="cmsRun startFU_daqsource.py daqSourceMode=FRDPreUnpack runNumber=${runnumber} fffBaseDir=${OUTDIR}"
 ${CMDLINE_STARTBU}  > out_2_bu.log 2>&1 || diebu "${CMDLINE_STARTBU}" $? $OUTDIR