Merge pull request #14274 from cms-l1t-offline/pr-tsg-v5-L1REPACK-80x

tsg-v5 L1REPACK 80x
cms-sw · Apr 28, 2016 · 6851315 · 6851315
2 parents 93f71e1 + 7a26d71
commit 6851315
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py
@@ -15,6 +15,10 @@
     unpackDttf = EventFilter.DTTFRawToDigi.dttfunpacker_cfi.dttfunpacker.clone(
         DTTF_FED_Source = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))    
 
+    import EventFilter.CSCTFRawToDigi.csctfunpacker_cfi
+    unpackCsctf = EventFilter.CSCTFRawToDigi.csctfunpacker_cfi.csctfunpacker.clone(
+        producer = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))    
+
     import EventFilter.CSCRawToDigi.cscUnpacker_cfi
     unpackCSC = EventFilter.CSCRawToDigi.cscUnpacker_cfi.muonCSCDigis.clone(
         InputObjects = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))
@@ -60,6 +64,13 @@
     simTwinMuxDigis.DTThetaDigi_Source = cms.InputTag("unpackDttf")
     simBmtfDigis.DTDigi_Source       = cms.InputTag("simTwinMuxDigis")
     simBmtfDigis.DTDigi_Theta_Source = cms.InputTag("unpackDttf")
+    simOmtfDigis.srcDTPh               = cms.InputTag("unpackDttf")
+    simOmtfDigis.srcDTTh               = cms.InputTag("unpackDttf")
+    #fix for broken simCscTriggerPrimitiveDigis
+    print "L1T INFO:  L1REPACK Using fix for CSCTF"
+    simEmtfDigis.CSCInput              = cms.InputTag("unpackCsctf")
+    simOmtfDigis.srcCSC                = cms.InputTag("unpackCsctf")
+
 
     # Finally, pack the new L1T output back into RAW
 
@@ -81,6 +92,6 @@
 
 
 
-    SimL1Emulator = cms.Sequence(unpackEcal+unpackHcal+unpackCSC+unpackDT+unpackRPC+unpackDttf
+    SimL1Emulator = cms.Sequence(unpackEcal+unpackHcal+unpackCSC+unpackDT+unpackRPC+unpackDttf+unpackCsctf
                                  +simHcalTriggerPrimitiveDigis+SimL1EmulatorCore+packCaloStage2
                                  +packGmtStage2+packGtStage2+rawDataCollector)
diff --git a/EventFilter/CSCTFRawToDigi/plugins/CSCTFUnpacker.cc b/EventFilter/CSCTFRawToDigi/plugins/CSCTFUnpacker.cc
@@ -78,7 +78,7 @@ CSCTFUnpacker::CSCTFUnpacker(const edm::ParameterSet& pset):edm::stream::EDProdu
 	produces<L1CSCStatusDigiCollection>();
 	produces<CSCTriggerContainer<csctf::TrackStub> >("DT");
 
-	Raw_token = consumes<FEDRawDataCollection>(edm::InputTag(producer.label(),producer.instance() ));
+	Raw_token = consumes<FEDRawDataCollection>(producer);
 
 }