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

Prescale access for stage-2 environment (81X) #14312

Merged
merged 19 commits into from
May 20, 2016
Merged

Prescale access for stage-2 environment (81X) #14312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9f7c9c8
Prescale Access for Stage-2 - HLT side
Martin-Grunewald Apr 29, 2016
993750f
More stage-2 prescale access work
Martin-Grunewald Apr 29, 2016
f2166a5
Add Helper Class
Martin-Grunewald Apr 29, 2016
fed6026
PrescaleSet access
Martin-Grunewald Apr 29, 2016
733a283
Fix
Martin-Grunewald Apr 29, 2016
fc3cf73
Assorted cleanups/fixes
Martin-Grunewald Apr 30, 2016
926f287
Assorted cleanups - take 2
Martin-Grunewald Apr 30, 2016
495d213
Unscheduled test
Martin-Grunewald Apr 30, 2016
7ef04d5
More fixes
Martin-Grunewald Apr 30, 2016
749eb6e
Reduce Verbosity
Martin-Grunewald Apr 30, 2016
dd121e8
Update tests
Martin-Grunewald Apr 30, 2016
5d267eb
More extensive tests
Martin-Grunewald Apr 30, 2016
a9c3d21
Update messages
Martin-Grunewald Apr 30, 2016
963ab0e
Assorted fixes
Martin-Grunewald Apr 30, 2016
1602e07
Final Fixes
Martin-Grunewald Apr 30, 2016
926724b
Improve error message
Martin-Grunewald May 3, 2016
58f6d3c
Improve error message
Martin-Grunewald May 3, 2016
2260022
Adjust
Martin-Grunewald May 5, 2016
1737d36
L1TGlobalUtil construction
Martin-Grunewald May 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions HLTrigger/Configuration/test/cmsDriver.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,58 +185,58 @@ foreach gtag ( MC DATA )

echo
echo "Creating L1RePack $name"
cmsDriver.py RelVal --step=$L1REPACK --conditions=$GTAG --filein=$InputLHCRaw --custom_conditions=$XL1T --fileout=RelVal_L1RePack_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_L1RePack_$name.py --customise=L1Trigger/Configuration/L1Trigger_custom.customiseResetPrescalesAndMasks
cmsDriver.py RelVal --step=$L1REPACK --conditions=$GTAG --filein=$InputLHCRaw --custom_conditions=$XL1T --fileout=RelVal_L1RePack_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_L1RePack_$name.py --customise=L1Trigger/Configuration/L1Trigger_custom.customiseResetPrescalesAndMasks

else

# echo
# echo "Creating TTbarGenToHLT $name"
# cmsDriver.py TTbar_Tauola_13TeV_cfi --step=GEN,SIM,DIGI,L1,DIGI2RAW,$XHLT --conditions=$GTAG --custom_conditions=$XL1T --fileout=RelVal_GenSim_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW-HLT' --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_GenSim_$name.py
# cmsDriver.py TTbar_Tauola_13TeV_cfi --step=GEN,SIM,DIGI,L1,DIGI2RAW,$XHLT --conditions=$GTAG --custom_conditions=$XL1T --fileout=RelVal_GenSim_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW-HLT' --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_GenSim_$name.py

echo
echo "Creating DigiL1Raw $name"
cmsDriver.py RelVal --step=DIGI,L1,DIGI2RAW --conditions=$GTAG --filein=$InputGenSim --custom_conditions=$XL1T --fileout=RelVal_DigiL1Raw_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW' --eventcontent=RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_DigiL1Raw_$name.py
cmsDriver.py RelVal --step=DIGI,L1,DIGI2RAW --conditions=$GTAG --filein=$InputGenSim --custom_conditions=$XL1T --fileout=RelVal_DigiL1Raw_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW' --eventcontent=RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_DigiL1Raw_$name.py

echo
echo "Creating DigiL1RawHLT $name"
cmsDriver.py RelVal --step=DIGI:pdigi_valid,L1,DIGI2RAW,$XHLT --conditions=$GTAG --filein=$InputGenSim --custom_conditions=$XL1T --fileout=RelVal_DigiL1RawHLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW-HLT' --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_DigiL1RawHLT_$name.py --processName=$PNAME
cmsDriver.py RelVal --step=DIGI:pdigi_valid,L1,DIGI2RAW,$XHLT --conditions=$GTAG --filein=$InputGenSim --custom_conditions=$XL1T --fileout=RelVal_DigiL1RawHLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RAW-HLT' --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_DigiL1RawHLT_$name.py --processName=$PNAME

echo
echo "Creating FastSim $name"
cmsDriver.py TTbar_Tauola_13TeV_cfi --step=GEN,SIM,RECOBEFMIX,DIGI,L1,DIGI2RAW,L1Reco,RECO,$XHLT --fast --conditions=$GTAG --custom_conditions=$XL1T --fileout=FastSim_GenToHLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RECO' --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=FastSim_GenToHLT_$name.py --processName=$PNAME
cmsDriver.py TTbar_Tauola_13TeV_cfi --step=GEN,SIM,RECOBEFMIX,DIGI,L1,DIGI2RAW,L1Reco,RECO,$XHLT --fast --conditions=$GTAG --custom_conditions=$XL1T --fileout=FastSim_GenToHLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-DIGI-RECO' --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=FastSim_GenToHLT_$name.py --processName=$PNAME

endif

echo
echo "Creating HLT $name"
cmsDriver.py RelVal --step=$XHLT --conditions=$GTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-DIGI-RAW-HLTDEBUG' --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_$name.py --processName=$PNAME
cmsDriver.py RelVal --step=$XHLT --conditions=$GTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-DIGI-RAW-HLTDEBUG' --eventcontent=FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_$name.py --processName=$PNAME

echo
echo "Creating HLT2 (re-running HLT) $name"
cmsDriver.py RelVal --step=$XHLT --conditions=$GTAG --filein=file:RelVal_HLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT2_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-DIGI-RAW-HLTDEBUG' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT2_$name.py --processName=HLT2
cmsDriver.py RelVal --step=$XHLT --conditions=$GTAG --filein=file:RelVal_HLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT2_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-DIGI-RAW-HLTDEBUG' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT2_$name.py --processName=HLT2


if ( $gtag == DATA ) then

echo
echo "Creating HLT+RECO $name"
cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME
echo "Creating HLT+L1Reco+RECO $name"
cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME

echo
echo "Creating RECO+DQM $name"
cmsDriver.py RelVal --step=RAW2DIGI,L1Reco,RECO,DQM --conditions=$RTAG --filein=file:RelVal_HLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME
echo "Creating RECO+EI+PAT+DQM $name"
cmsDriver.py RelVal --step=RAW2DIGI,L1Reco,RECO,EI,PAT,DQM --conditions=$RTAG --filein=file:RelVal_HLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'RECO,MINIAOD,DQMIO' --eventcontent=RECO,MINIAOD,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME --runUnscheduled

else

set RTAG = $GTAG

echo
echo "Creating HLT+RECO $name"
cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME
echo "Creating HLT+L1Reco+RECO $name"
cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME

echo
echo "Creating RECO+VALIDATION+DQM $name"
cmsDriver.py RelVal --step=RAW2DIGI,L1Reco,RECO,VALIDATION,DQM --conditions=$RTAG --filein=file:RelVal_DigiL1RawHLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME
echo "Creating RECO+EI+PAT+VALIDATION+DQM $name"
cmsDriver.py RelVal --step=RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION,DQM --conditions=$RTAG --filein=file:RelVal_DigiL1RawHLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-RECO,MINIAODSIM,DQMIO' --eventcontent=RECOSIM,MINIAODSIM,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME --runUnscheduled


endif
Expand Down
1 change: 1 addition & 0 deletions HLTrigger/HLTcore/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<use name="FWCore/Services"/>
<use name="FWCore/MessageLogger"/>
<use name="L1Trigger/GlobalTriggerAnalyzer"/>
<use name="L1Trigger/L1TGlobal"/>
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/HLTObjects"/>
<use name="CondFormats/DataRecord"/>
Expand Down
14 changes: 14 additions & 0 deletions HLTrigger/HLTcore/interface/HLTConfigData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ class HLTConfigData {
/// Is module an L3 filter (ie, tracked saveTags=true)
bool saveTags(const std::string& module) const;


/// L1T type (0=unknown, 1=legacy/stage-1 or 2=stage-2)
unsigned int l1tType() const;

/// HLTLevel1GTSeed module
/// HLTLevel1GTSeed modules for all trigger paths
const std::vector<std::vector<std::pair<bool,std::string> > >& hltL1GTSeeds() const;
Expand All @@ -96,6 +100,14 @@ class HLTConfigData {
/// HLTLevel1GTSeed modules for trigger path with index i
const std::vector<std::pair<bool,std::string> >& hltL1GTSeeds(unsigned int trigger) const;

/// HLTL1TSeed module
/// HLTL1TSeed modules for all trigger paths
const std::vector<std::vector<std::string> >& hltL1TSeeds() const;
/// HLTL1TSeed modules for trigger path with name
const std::vector<std::string>& hltL1TSeeds(const std::string& trigger) const;
/// HLTL1TSeed modules for trigger path with index i
const std::vector<std::string>& hltL1TSeeds(unsigned int trigger) const;


/// Streams
/// list of names of all streams
Expand Down Expand Up @@ -153,7 +165,9 @@ class HLTConfigData {
std::map<std::string,unsigned int> triggerIndex_;
std::vector<std::map<std::string,unsigned int> > moduleIndex_;

unsigned int l1tType_;
std::vector<std::vector<std::pair<bool,std::string> > > hltL1GTSeeds_;
std::vector<std::vector<std::string> > hltL1TSeeds_;

std::vector<std::string> streamNames_;
std::map<std::string,unsigned int> streamIndex_;
Expand Down
20 changes: 20 additions & 0 deletions HLTrigger/HLTcore/interface/HLTConfigProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ class HLTConfigProvider {
return hltConfigData_->saveTags(module);
}


/// L1T type (0=unknown, 1=legacy/stage-1 or 2=stage-2)
unsigned int l1tType() const {
return hltConfigData_->l1tType();
}

/// HLTLevel1GTSeed module
/// HLTLevel1GTSeed modules for all trigger paths
const std::vector<std::vector<std::pair<bool,std::string> > >& hltL1GTSeeds() const {
Expand All @@ -164,6 +170,20 @@ class HLTConfigProvider {
return hltConfigData_->hltL1GTSeeds(trigger);
}

/// HLTL1TSeed module
/// HLTL1TSeed modules for all trigger paths
const std::vector<std::vector<std::string> >& hltL1TSeeds() const {
return hltConfigData_->hltL1TSeeds();
}
/// HLTL1TSeed modules for trigger path with name
const std::vector<std::string>& hltL1TSeeds(const std::string& trigger) const {
return hltConfigData_->hltL1TSeeds(trigger);
}
/// HLTL1TSeed modules for trigger path with index i
const std::vector<std::string>& hltL1TSeeds(unsigned int trigger) const {
return hltConfigData_->hltL1TSeeds(trigger);
}


/// Streams
/// list of names of all streams
Expand Down
6 changes: 5 additions & 1 deletion HLTrigger/HLTcore/interface/HLTPrescaleProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
#include "L1Trigger/GlobalTriggerAnalyzer/interface/L1GtUtils.h"
#include "L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h"
#include "DataFormats/L1TGlobal/interface/GlobalLogicParser.h"

#include <string>
#include <utility>
Expand Down Expand Up @@ -52,6 +54,7 @@ class HLTPrescaleProvider {

HLTConfigProvider const& hltConfigProvider() const { return hltConfigProvider_; }
L1GtUtils const& l1GtUtils() const { return l1GtUtils_; }
l1t::L1TGlobalUtil const& l1tGlobalUtil() const { return l1tGlobalUtil_; }

/// HLT prescale values via (L1) EventSetup
/// current (default) prescale set index - to be taken from L1GtUtil via Event
Expand All @@ -78,6 +81,7 @@ class HLTPrescaleProvider {

HLTConfigProvider hltConfigProvider_;
L1GtUtils l1GtUtils_;
l1t::L1TGlobalUtil l1tGlobalUtil_;
unsigned char count_[5] = {0,0,0,0,0};

};
Expand All @@ -92,5 +96,5 @@ template <typename T>
HLTPrescaleProvider::HLTPrescaleProvider(edm::ParameterSet const& pset,
edm::ConsumesCollector& iC,
T& module) :
l1GtUtils_(pset, iC, false, module) { }
l1GtUtils_(pset, iC, false, module), l1tGlobalUtil_(pset, iC, module) { }
#endif
2 changes: 1 addition & 1 deletion HLTrigger/HLTcore/plugins/HLTEventAnalyzerAOD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ void HLTEventAnalyzerAOD::analyzeTrigger(const edm::Event& iEvent, const edm::Ev
<< endl
<< "prescales L1T: " << prescalesInDetail.first.size() << message.str()
<< endl
<< "prescale HLT: " << prescalesInDetail.second
<< " prescale HLT: " << prescalesInDetail.second
<< endl;

// modules on this trigger path
Expand Down
Loading