Merge pull request #7564 from wmtan/NewPlaybackInfo

File information in playback info
cms-sw · Mar 7, 2015 · 653030a · 653030a
2 parents 6138958 + a19a4c7
commit 653030a
Show file tree

Hide file tree

Showing 42 changed files with 373 additions and 262 deletions.
diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py
@@ -512,12 +512,11 @@
 
 PREMIXEventContent.outputCommands.extend(GENRAWEventContent.outputCommands)
 PREMIXEventContent.outputCommands.append('keep RPCDetIdRPCDigiMuonDigiCollection_simMuonRPCDigis_*_*')
-PREMIXEventContent.outputCommands.append('keep CrossingFramePlaybackInfoExtended_*_*_*')
+PREMIXEventContent.outputCommands.append('keep CrossingFramePlaybackInfoNew_*_*_*')
 
 PREMIXRAWEventContent.outputCommands.extend(RAWSIMEventContent.outputCommands)
-PREMIXRAWEventContent.outputCommands.append('keep CrossingFramePlaybackInfoExtended_*_*_*')
-PREMIXRAWEventContent.outputCommands.append('drop CrossingFramePlaybackInfoExtended_mix_*_*')
-
+PREMIXRAWEventContent.outputCommands.append('keep CrossingFramePlaybackInfoNew_*_*_*')
+PREMIXRAWEventContent.outputCommands.append('drop CrossingFramePlaybackInfoNew_mix_*_*')
 
 REPACKRAWSIMEventContent.outputCommands.extend(REPACKRAWEventContent.outputCommands)
 REPACKRAWSIMEventContent.outputCommands.extend(SimG4CoreRAW.outputCommands)

diff --git a/DQM/SiStripMonitorHardware/src/SiStripSpyEventMatcher.cc b/DQM/SiStripMonitorHardware/src/SiStripSpyEventMatcher.cc
@@ -86,8 +86,9 @@ namespace sistrip {
 
   void SpyEventMatcher::initialize()
   {
+    size_t fileNameHash = 0U;
     //add spy events to the map until there are none left
-    source_->loopSequential(*eventPrincipal_,std::numeric_limits<size_t>::max(),boost::bind(&SpyEventMatcher::addNextEventToMap,this,_1));
+    source_->loopSequential(*eventPrincipal_,fileNameHash,std::numeric_limits<size_t>::max(),boost::bind(&SpyEventMatcher::addNextEventToMap,this,_1));
     //debug
     std::ostringstream ss;
     ss << "Events with possible matches (eventID,apvAddress): ";
@@ -229,9 +230,10 @@ namespace sistrip {
                                               SpyDataCollections& collectionsToCreate)
   {
     if (!matchingEvents) return;
+    size_t fileNameHash = 0U;
     FEDRawDataCollection outputRawData;
     MatchingOutput mo(outputRawData);
-    source_->loopSpecified(*eventPrincipal_,*matchingEvents,boost::bind(&SpyEventMatcher::getCollections,this,_1,
+    source_->loopSpecified(*eventPrincipal_,fileNameHash,matchingEvents->begin(),matchingEvents->end(),boost::bind(&SpyEventMatcher::getCollections,this,_1,
                                                        eventId,apvAddress,boost::cref(cabling),boost::ref(mo)));
     SpyDataCollections collections(mo.outputRawData_,mo.outputTotalEventCounters_,mo.outputL1ACounters_,mo.outputAPVAddresses_,
                                    mo.outputScopeDigisVector_.get(),mo.outputPayloadDigisVector_.get(),

diff --git a/DQMServices/Components/test/FrameworkJobReport_3_a_1.xml b/DQMServices/Components/test/FrameworkJobReport_3_a_1.xml
@@ -9,7 +9,7 @@
 <GUID>04DAAE70-4A54-E411-AEC2-02163E00ED0C</GUID>
 <Branches>
   <Branch>csctfTrackStubCSCTriggerContainer_simCsctfTrackDigis__HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>EBDigiCollection_simEcalDigis_ebDigis_HLT.</Branch>
   <Branch>EEDigiCollection_simEcalDigis_eeDigis_HLT.</Branch>
   <Branch>ESDigiCollection_simEcalPreshowerDigis__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_3_a_2.xml b/DQMServices/Components/test/FrameworkJobReport_3_a_2.xml
@@ -505,7 +505,7 @@
   <Branch>CSCDetIdCSCWireDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCWireDigi_HLT.</Branch>
   <Branch>CSCDetIdintMuonDigiCollection_simCscTriggerPrimitiveDigis__HLT.</Branch>
   <Branch>CaloTowersSorted_hltTowerMakerForAll__HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>DTChamberIdDTLocalTriggerMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>
   <Branch>DTChamberIdDTRecSegment4DsOwnedRangeMap_hltDt4DSegments__HLT.</Branch>
   <Branch>DTLayerIdDTDigiMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>
@@ -1431,7 +1431,7 @@
 <Branch Name="CSCDetIdCSCComparatorDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCComparatorDigi_HLT." ReadCount="3" />
 <Branch Name="CSCDetIdCSCStripDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCStripDigi_HLT." ReadCount="3" />
 <Branch Name="CSCDetIdCSCWireDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCWireDigi_HLT." ReadCount="3" />
-<Branch Name="CrossingFramePlaybackInfoExtended_mix__HLT." ReadCount="3" />
+<Branch Name="CrossingFramePlaybackInfoNew_mix__HLT." ReadCount="3" />
 <Branch Name="DTLayerIdDTDigiMuonDigiCollection_simMuonDTDigis__HLT." ReadCount="3" />
 <Branch Name="DTLayerIdDTDigiSimLinkMuonDigiCollection_simMuonDTDigis__HLT." ReadCount="3" />
 <Branch Name="EBDigiCollection_simEcalDigis_ebDigis_HLT." ReadCount="3" />

diff --git a/DQMServices/Components/test/FrameworkJobReport_5_a_1.xml b/DQMServices/Components/test/FrameworkJobReport_5_a_1.xml
@@ -8,7 +8,7 @@
 <ModuleLabel>RAWSIMoutput</ModuleLabel>
 <GUID>4A2AFBF6-28CE-E111-8714-003048CB9882</GUID>
 <Branches>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>FEDRawDataCollection_rawDataCollector__HLT.</Branch>
   <Branch>GenEventInfoProduct_generator__HLT.</Branch>
   <Branch>L1GlobalTriggerObjectMapRecord_hltL1GtObjectMap__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_5_a_2.xml b/DQMServices/Components/test/FrameworkJobReport_5_a_2.xml
@@ -9,7 +9,7 @@
 <GUID>4A2AFBF6-28CE-E111-8714-003048CB9882</GUID>
 <Branches>
   <Branch>CSCDetIdCSCComparatorDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCComparatorDigi_HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>DTLayerIdDTDigiSimLinkMuonDigiCollection_simMuonDTDigis__HLT.</Branch>
   <Branch>EBSrFlagsSorted_simEcalDigis_ebSrFlags_HLT.</Branch>
   <Branch>EESrFlagsSorted_simEcalDigis_eeSrFlags_HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_6_a_1.xml b/DQMServices/Components/test/FrameworkJobReport_6_a_1.xml
@@ -36,7 +36,7 @@
 <GUID>C2B86270-4A54-E411-87C2-02163E00ED0C</GUID>
 <Branches>
   <Branch>csctfTrackStubCSCTriggerContainer_simCsctfTrackDigis__HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>EBDigiCollection_simEcalDigis_ebDigis_HLT.</Branch>
   <Branch>EEDigiCollection_simEcalDigis_eeDigis_HLT.</Branch>
   <Branch>ESDigiCollection_simEcalPreshowerDigis__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_6_a_2.xml b/DQMServices/Components/test/FrameworkJobReport_6_a_2.xml
@@ -50,7 +50,7 @@
   <Branch>CSCDetIdCSCWireDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCWireDigi_HLT.</Branch>
   <Branch>CSCDetIdintMuonDigiCollection_simCscTriggerPrimitiveDigis__HLT.</Branch>
   <Branch>CaloTowersSorted_hltTowerMakerForAll__HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>DTChamberIdDTLocalTriggerMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>
   <Branch>DTChamberIdDTRecSegment4DsOwnedRangeMap_hltDt4DSegments__HLT.</Branch>
   <Branch>DTLayerIdDTDigiMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_7_a_1.xml b/DQMServices/Components/test/FrameworkJobReport_7_a_1.xml
@@ -140,7 +140,7 @@
   <Branch>recoGenParticles_genParticles__SIM.</Branch>
   <Branch>csctfTrackStubCSCTriggerContainer_simCsctfTrackDigis__HLT.</Branch>
   <Branch>csctfTrackStubCSCTriggerContainer_csctfDigis_DT_HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>EBDigiCollection_simEcalDigis_ebDigis_HLT.</Branch>
   <Branch>EEDigiCollection_simEcalDigis_eeDigis_HLT.</Branch>
   <Branch>ESDigiCollection_simEcalPreshowerDigis__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_7_b_2.xml b/DQMServices/Components/test/FrameworkJobReport_7_b_2.xml
@@ -514,7 +514,7 @@
   <Branch>CSCDetIdCSCWireDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCWireDigi_HLT.</Branch>
   <Branch>CSCDetIdintMuonDigiCollection_simCscTriggerPrimitiveDigis__HLT.</Branch>
   <Branch>CaloTowersSorted_hltTowerMakerForAll__HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>DTChamberIdDTLocalTriggerMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>
   <Branch>DTChamberIdDTRecSegment4DsOwnedRangeMap_hltDt4DSegments__HLT.</Branch>
   <Branch>DTLayerIdDTDigiMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>
@@ -1522,7 +1522,7 @@
 <Branch Name="CSCDetIdCSCComparatorDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCComparatorDigi_HLT." ReadCount="1" />
 <Branch Name="CSCDetIdCSCStripDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCStripDigi_HLT." ReadCount="1" />
 <Branch Name="CSCDetIdCSCWireDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCWireDigi_HLT." ReadCount="1" />
-<Branch Name="CrossingFramePlaybackInfoExtended_mix__HLT." ReadCount="1" />
+<Branch Name="CrossingFramePlaybackInfoNew_mix__HLT." ReadCount="1" />
 <Branch Name="DTLayerIdDTDigiMuonDigiCollection_simMuonDTDigis__HLT." ReadCount="1" />
 <Branch Name="DTLayerIdDTDigiSimLinkMuonDigiCollection_simMuonDTDigis__HLT." ReadCount="1" />
 <Branch Name="EBDigiCollection_simEcalDigis_ebDigis_HLT." ReadCount="1" />

diff --git a/DQMServices/Components/test/FrameworkJobReport_8_a_1.1.xml b/DQMServices/Components/test/FrameworkJobReport_8_a_1.1.xml
@@ -140,7 +140,7 @@
   <Branch>recoGenParticles_genParticles__SIM.</Branch>
   <Branch>csctfTrackStubCSCTriggerContainer_simCsctfTrackDigis__HLT.</Branch>
   <Branch>csctfTrackStubCSCTriggerContainer_csctfDigis_DT_HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>EBDigiCollection_simEcalDigis_ebDigis_HLT.</Branch>
   <Branch>EEDigiCollection_simEcalDigis_eeDigis_HLT.</Branch>
   <Branch>ESDigiCollection_simEcalPreshowerDigis__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_8_a_1.xml b/DQMServices/Components/test/FrameworkJobReport_8_a_1.xml
@@ -21,7 +21,7 @@ Input file root://eoscms//eos/cms/store/relval/CMSSW_5_0_0_pre6/RelValProdMinBia
 <ModuleLabel>RAWSIMoutput</ModuleLabel>
 <GUID>324FFE4A-A471-E111-A726-003048CB9882</GUID>
 <Branches>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>FEDRawDataCollection_rawDataCollector__HLT.</Branch>
   <Branch>GenEventInfoProduct_generator__HLT.</Branch>
   <Branch>L1GlobalTriggerObjectMapRecord_hltL1GtObjectMap__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_8_a_2.xml b/DQMServices/Components/test/FrameworkJobReport_8_a_2.xml
@@ -9,7 +9,7 @@
 <GUID>324FFE4A-A471-E111-A726-003048CB9882</GUID>
 <Branches>
   <Branch>CSCDetIdCSCComparatorDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCComparatorDigi_HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>DTLayerIdDTDigiSimLinkMuonDigiCollection_simMuonDTDigis__HLT.</Branch>
   <Branch>EBSrFlagsSorted_simEcalDigis_ebSrFlags_HLT.</Branch>
   <Branch>EESrFlagsSorted_simEcalDigis_eeSrFlags_HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_8_b_2.xml b/DQMServices/Components/test/FrameworkJobReport_8_b_2.xml
@@ -514,7 +514,7 @@
   <Branch>CSCDetIdCSCWireDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCWireDigi_HLT.</Branch>
   <Branch>CSCDetIdintMuonDigiCollection_simCscTriggerPrimitiveDigis__HLT.</Branch>
   <Branch>CaloTowersSorted_hltTowerMakerForAll__HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>DTChamberIdDTLocalTriggerMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>
   <Branch>DTChamberIdDTRecSegment4DsOwnedRangeMap_hltDt4DSegments__HLT.</Branch>
   <Branch>DTLayerIdDTDigiMuonDigiCollection_hltMuonDTDigis__HLT.</Branch>
@@ -1522,7 +1522,7 @@
 <Branch Name="CSCDetIdCSCComparatorDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCComparatorDigi_HLT." ReadCount="1" />
 <Branch Name="CSCDetIdCSCStripDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCStripDigi_HLT." ReadCount="1" />
 <Branch Name="CSCDetIdCSCWireDigiMuonDigiCollection_simMuonCSCDigis_MuonCSCWireDigi_HLT." ReadCount="1" />
-<Branch Name="CrossingFramePlaybackInfoExtended_mix__HLT." ReadCount="1" />
+<Branch Name="CrossingFramePlaybackInfoNew_mix__HLT." ReadCount="1" />
 <Branch Name="DTLayerIdDTDigiMuonDigiCollection_simMuonDTDigis__HLT." ReadCount="1" />
 <Branch Name="DTLayerIdDTDigiSimLinkMuonDigiCollection_simMuonDTDigis__HLT." ReadCount="1" />
 <Branch Name="EBDigiCollection_simEcalDigis_ebDigis_HLT." ReadCount="1" />

diff --git a/DQMServices/Components/test/FrameworkJobReport_9_a_1.xml b/DQMServices/Components/test/FrameworkJobReport_9_a_1.xml
@@ -10,7 +10,7 @@
 <Branches>
   <Branch>csctfTrackStubCSCTriggerContainer_simCsctfTrackDigis__HLT.</Branch>
   <Branch>csctfTrackStubCSCTriggerContainer_csctfDigis_DT_HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>EBDigiCollection_simEcalDigis_ebDigis_HLT.</Branch>
   <Branch>EEDigiCollection_simEcalDigis_eeDigis_HLT.</Branch>
   <Branch>FEDRawDataCollection_rawDataCollector__HLT.</Branch>

diff --git a/DQMServices/Components/test/FrameworkJobReport_9_a_2.xml b/DQMServices/Components/test/FrameworkJobReport_9_a_2.xml
@@ -36,7 +36,7 @@
 <GUID>9A8C2089-4A54-E411-B25D-02163E00ED0C</GUID>
 <Branches>
   <Branch>csctfTrackStubCSCTriggerContainer_simCsctfTrackDigis__HLT.</Branch>
-  <Branch>CrossingFramePlaybackInfoExtended_mix__HLT.</Branch>
+  <Branch>CrossingFramePlaybackInfoNew_mix__HLT.</Branch>
   <Branch>EBDigiCollection_simEcalDigis_ebDigis_HLT.</Branch>
   <Branch>EEDigiCollection_simEcalDigis_eeDigis_HLT.</Branch>
   <Branch>ESDigiCollection_simEcalPreshowerDigis__HLT.</Branch>

diff --git a/DataFormats/Common/interface/SecondaryEventIDAndFileInfo.h b/DataFormats/Common/interface/SecondaryEventIDAndFileInfo.h
@@ -0,0 +1,23 @@
+#ifndef DataFormats_Common_SecondaryEventIDAndFileInfo_h
+#define DataFormats_Common_SecondaryEventIDAndFileInfo_h
+
+#include "DataFormats/Provenance/interface/EventID.h"
+
+// forward declarations
+namespace edm {
+  class SecondaryEventIDAndFileInfo {
+  public:
+    SecondaryEventIDAndFileInfo() : eventID_(), fileNameHash_(0U) {}
+    SecondaryEventIDAndFileInfo(EventID const& evID, size_t fNameHash) : eventID_(evID), fileNameHash_(fNameHash) {}
+    EventID const& eventID() const {
+      return eventID_;
+    }
+    size_t fileNameHash() const {
+      return fileNameHash_;
+    }
+  private:
+    EventID eventID_;
+    size_t fileNameHash_;
+  };
+}
+#endif
diff --git a/DataFormats/Common/src/classes.h b/DataFormats/Common/src/classes.h
@@ -25,6 +25,7 @@
 #include "DataFormats/Common/interface/RefCoreWithIndex.h"
 #include "DataFormats/Common/interface/IntValues.h"
 #include "DataFormats/Common/interface/ThinnedAssociation.h"
+#include "DataFormats/Common/interface/SecondaryEventIDAndFileInfo.h"
 #include "DataFormats/Provenance/interface/EventAuxiliary.h"
 #include "FWCore/MessageLogger/interface/ErrorSummaryEntry.h"
 
@@ -56,6 +57,7 @@ namespace DataFormats_Common {
     edm::RangeMap<int, std::vector<float>, edm::CopyPolicy<float> > dummyRangeMap1;
 
     std::vector<edmNew::dstvdetails::DetSetVectorTrans::Item>  dummyDSTVItemVector;
+    std::vector<edm::SecondaryEventIDAndFileInfo>  dummySecondaryEventIDAndFileInfoVector;
 
     edm::Wrapper<edm::ValueMap<int> > wvm1;
     edm::Wrapper<edm::ValueMap<unsigned int> > wvm2;

diff --git a/DataFormats/Common/src/classes_def.xml b/DataFormats/Common/src/classes_def.xml
@@ -159,4 +159,8 @@
   <version ClassVersion="11" checksum="2661728085"/>
   <version ClassVersion="10" checksum="3452516682"/>
  </class>
+ <class name="edm::SecondaryEventIDAndFileInfo" ClassVersion="2">
+  <version ClassVersion="2" checksum="3900813088"/>
+ </class>
+ <class name="std::vector<edm::SecondaryEventIDAndFileInfo>"/>
 </lcgdict>