Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raw data mapper sequence backport #24921

Merged
merged 9 commits into from Oct 18, 2018
Merged

Raw data mapper sequence backport #24921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4681a52
the born of the remapper sequence
Oct 17, 2018
a19b6ff
first implementation of remapper
Oct 17, 2018
04871c9
fixing output commands
Oct 17, 2018
5caad34
fixing output commands
Oct 17, 2018
1915cc8
Remapper + cff
Oct 17, 2018
5076f71
changing sequence
Oct 17, 2018
e8f614e
renaming module
Oct 17, 2018
ffd46e6
fixing unused files and spaces
Oct 18, 2018
70c564b
fixing spaces
Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions Configuration/Applications/python/ConfigBuilder.py
View file
Open in desktop
Expand Up @@ -928,6 +928,7 @@ def define_Configs(self):
self.L1MENUDefaultCFF="Configuration/StandardSequences/L1TriggerDefaultMenu_cff"
self.HLTDefaultCFF="Configuration/StandardSequences/HLTtable_cff"
self.RAW2DIGIDefaultCFF="Configuration/StandardSequences/RawToDigi_Data_cff"
if self._options.isRepacked: self.RAW2DIGIDefaultCFF="Configuration/StandardSequences/RawToDigi_DataMapper_cff"
self.L1RecoDefaultCFF="Configuration/StandardSequences/L1Reco_cff"
self.L1TrackTriggerDefaultCFF="Configuration/StandardSequences/L1TrackTrigger_cff"
self.RECODefaultCFF="Configuration/StandardSequences/Reconstruction_Data_cff"
Expand Down Expand Up @@ -1549,7 +1550,7 @@ def prepare_RAW2RECO(self, sequence = None):
def prepare_RAW2DIGI(self, sequence = "RawToDigi"):
self.loadDefaultOrSpecifiedCFF(sequence,self.RAW2DIGIDefaultCFF)
self.scheduleSequence(sequence,'raw2digi_step')
# if self._options.isRepacked:
# if self._options.isRepacked:
#self.renameInputTagsInSequence(sequence)
return

Expand Down Expand Up @@ -2219,8 +2220,8 @@ def prepare(self, doChecking = False):
if self._options.isRepacked:
self.pythonCfgCode +="\n"
self.pythonCfgCode +="from Configuration.Applications.ConfigBuilder import MassReplaceInputTag\n"
self.pythonCfgCode +="MassReplaceInputTag(process)\n"
MassReplaceInputTag(self.process)
self.pythonCfgCode +="MassReplaceInputTag(process, new=\"rawDataMapperByLabel\", old=\"rawDataCollector\")\n"
MassReplaceInputTag(self.process, new="rawDataMapperByLabel", old="rawDataCollector")

# special treatment in case of production filter sequence 2/2
if self.productionFilterSequence:
Expand Down
3 changes: 2 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -1568,7 +1568,8 @@ def lhegensim2017(fragment,howMuch):
'--data':'',
'--era':'Run2_HI',
'--customise':'RecoLocalTracker/SiStripZeroSuppression/customiseHybrid.addHybridEmulationBeforeRepack',
'--processName':'EMULATEHYBRID',
'--processName':'EMULATEHYBRID',
'--outputCommands':'"drop FEDRawDataCollection_*__HLT","drop FEDRawDataCollection_*__LHC"',
#'--customise_commands':'\'process.RAWoutput.outputCommands.append(\"drop *_*_*_HLT*\")\'',
'-n':100
}
Expand Down
9 changes: 9 additions & 0 deletions Configuration/StandardSequences/python/RawToDigi_DataMapper_cff.py
View file
Open in desktop
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

from Configuration.StandardSequences.RawToDigi_Data_cff import *
from EventFilter.RawDataCollector.rawDataMapperByLabel_cfi import rawDataMapperByLabel

RawToDigi.insert(0, rawDataMapperByLabel)
RawToDigi_noTk.insert(0, rawDataMapperByLabel)
RawToDigi_pixelOnly.insert(0, rawDataMapperByLabel)

2 changes: 1 addition & 1 deletion EventFilter/RawDataCollector/src/RawDataMapperByLabel.cc
View file
Open in desktop
Expand Up @@ -102,7 +102,7 @@ void RawDataMapperByLabel::produce(Event & e, const EventSetup& c){
void RawDataMapperByLabel::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
edm::ParameterSetDescription desc;

desc.add<std::vector<edm::InputTag>>("rawCollectionList", {{"rawDataCollector"}, {"rawDataRepacker"}, {"rawDataReducedFormat"}});
desc.add<std::vector<edm::InputTag>>("rawCollectionList", {{"rawDataCollector","","@skipCurrentProcess"}, {"rawDataRepacker"}, {"rawDataReducedFormat"}});
desc.add<edm::InputTag>("mainCollection", edm::InputTag("rawDataCollector"));

descriptions.add("rawDataMapperByLabel", desc);
Expand Down