Skip to content

Commit 94b3ddd

Browse files
rauserrauser
authored
Merge pull request #124 from rauser/10_5_X
10_5_X setup
2 parents 73c3a95 + 126d425 commit 94b3ddd

File tree

5 files changed

+49
-37
lines changed

5 files changed

+49
-37
lines changed

‎README.md‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,23 @@
33
## Software setup
44

55
```
6-
cmsrel CMSSW_10_2_7
7-
cd CMSSW_10_2_7/src
6+
cmsrel CMSSW_10_5_0_pre1
7+
cd CMSSW_10_5_0_pre1/src
88
cmsenv
99
1010
setenv CMSSW_GIT_REFERENCE /cvmfs/cms.cern.ch/cmssw.git.daily
1111
git cms-init
1212
13-
git cms-addpkg RecoBTag
14-
git cms-addpkg PhysicsTools/PatAlgos
15-
git cms-merge-topic emilbols:PrunedTraining_NoPuppi_10_2_7
16-
git clone -b PrunedTraining_NoPuppi https://github.com/emilbols/RecoBTag-Combined RecoBTag/Combined/data
17-
18-
git clone -b 10_2_X_v1.04 --depth 1 https://github.com/cms-btv-pog/RecoBTag-PerformanceMeasurements.git RecoBTag/PerformanceMeasurements
13+
git clone -b 10_5_X_v1.01 --depth 1 https://github.com/cms-btv-pog/RecoBTag-PerformanceMeasurements.git RecoBTag/PerformanceMeasurements
1914
2015
scram b -j8
2116
2217
```
2318

24-
The ntuplizer can be run and configured through ```RecoBTag/PerformanceMeasurements/test/runBTagAnalyzer_cfg.py```, to run it for 2018 prompt reco
19+
The ntuplizer can be run and configured through ```RecoBTag/PerformanceMeasurements/test/runBTagAnalyzer_cfg.py```, to run it with the latest defaults
2520

2621
```
27-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=(True or False, depending on your needs)
22+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=(True or False, depending on your needs)
2823
```
2924

3025
To run the tests for integrating changes run:

‎plugins/TTbarSelectionProducer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ TTbarSelectionProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu
265265
if(!passKin) continue;
266266

267267
// Conversion rejection
268-
bool passConvVeto = !ConversionTools::hasMatchedConversion(*el,convHa,beamspot.position());
268+
bool passConvVeto = !ConversionTools::hasMatchedConversion(*el,*convHa,beamspot.position());
269269

270270
//cut-based electron id+iso
271271
//cf. https://twiki.cern.ch/twiki/bin/viewauth/CMS/CutBasedElectronIdentificationRun2

‎python/defaults/PixelStudies.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
common = {
2+
'eras' : ['Run2_2017'],
3+
'miniAOD' : True,
4+
'runDeepFlavourTagVariables' : True,
5+
}
6+
7+
mc = {
8+
'inputFiles' : ['/store/relval/CMSSW_10_5_0_pre1/RelValTTbar_13/MINIAODSIM/104X_upgrade2018_realistic_pixelCand_v1-v1/20000/BE6E5F4F-4AAE-C94F-BB04-946DC9406DB8.root'],
9+
'JPCalibration' : 'JPcalib_MC94X_2017_v1',
10+
'mcGlobalTag' : '104X_upgrade2018_realistic_pixelCand_v1',
11+
}
12+
13+
data = {
14+
'inputFiles' : ['/store/relval/CMSSW_10_5_0_pre1/JetHT/MINIAOD/104X_dataRun2_pixel2DTemplate_Cand_v1_ClRepairOn_RelVal_jetHT2018D-v1/20000/F8117214-B35A-BF42-8FEF-48CB817731C0.root'],
15+
'JPCalibration' : 'JPcalib_Data94X_2017_v1',
16+
'dataGlobalTag' : '104X_dataRun2_pixel2DTemplate_Cand_v1',
17+
}

‎test/runBTagAnalyzer_cfg.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -576,18 +576,18 @@
576576
, 'pfNegativeDeepFlavourJetTags:probuds'
577577
, 'pfNegativeDeepFlavourJetTags:probg'
578578
# DeepFlavour with pruned input
579-
, 'pfDeepFlavourPrunedJetTags:probb'
580-
, 'pfDeepFlavourPrunedJetTags:probbb'
581-
, 'pfDeepFlavourPrunedJetTags:problepb'
582-
, 'pfDeepFlavourPrunedJetTags:probc'
583-
, 'pfDeepFlavourPrunedJetTags:probuds'
584-
, 'pfDeepFlavourPrunedJetTags:probg'
585-
, 'pfNegativeDeepFlavourPrunedJetTags:probb'
586-
, 'pfNegativeDeepFlavourPrunedJetTags:probbb'
587-
, 'pfNegativeDeepFlavourPrunedJetTags:problepb'
588-
, 'pfNegativeDeepFlavourPrunedJetTags:probc'
589-
, 'pfNegativeDeepFlavourPrunedJetTags:probuds'
590-
, 'pfNegativeDeepFlavourPrunedJetTags:probg'
579+
# , 'pfDeepFlavourPrunedJetTags:probb'
580+
# , 'pfDeepFlavourPrunedJetTags:probbb'
581+
# , 'pfDeepFlavourPrunedJetTags:problepb'
582+
# , 'pfDeepFlavourPrunedJetTags:probc'
583+
# , 'pfDeepFlavourPrunedJetTags:probuds'
584+
# , 'pfDeepFlavourPrunedJetTags:probg'
585+
# , 'pfNegativeDeepFlavourPrunedJetTags:probb'
586+
# , 'pfNegativeDeepFlavourPrunedJetTags:probbb'
587+
# , 'pfNegativeDeepFlavourPrunedJetTags:problepb'
588+
# , 'pfNegativeDeepFlavourPrunedJetTags:probc'
589+
# , 'pfNegativeDeepFlavourPrunedJetTags:probuds'
590+
# , 'pfNegativeDeepFlavourPrunedJetTags:probg'
591591

592592
])
593593

@@ -658,7 +658,7 @@
658658
bTagDiscriminators_no_deepFlavour = {i for i in bTagDiscriminators if 'DeepFlavourJetTags' not in i}
659659
bTagDiscriminatorsFat = copy.deepcopy(bTagDiscriminators_no_deepFlavour)
660660
## Add DeepDoubleB tagger to fat jets
661-
bTagDiscriminatorsFat.update(set(['pfDeepDoubleBJetTags:probH']))
661+
# bTagDiscriminatorsFat.update(set(['pfDeepDoubleBJetTags:probH']))
662662

663663
if options.runJetClustering:
664664
options.remakeAllDiscr = True

‎test/run_tests.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
#! /bin/bash
22

33
set -o errexit
4-
function die { echo 'FAILED': status $1 ; exit $1;}
4+
function die { echo 'FAILED': status $1 ; }
55

66
echo 'Running on data'
7-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=True maxEvents=20 groups='test' &> last.log || die $?
7+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=True maxEvents=20 groups='test' &> last.log || die $?
88

99
echo 'Running on MC'
10-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=False maxEvents=20 groups='test' &> last.log || die $?
10+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=False maxEvents=20 groups='test' &> last.log || die $?
1111

12-
echo 'Rinning on AODSIM'
13-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=False maxEvents=20 miniAOD=False inputFiles=/store/mc/RunIIAutumn18DRPremix/QCD_Pt_80to120_TuneCP5_13TeV_pythia8/AODSIM/102X_upgrade2018_realistic_v15-v1/1010000/FA97679F-774B-7F43-9258-D8A0AE3A7A01.root useSelectedTracks=False produceJetTrackTree=True runCTagVariables=False groups='test' &> last.log || die $?
12+
# echo 'Rinning on AODSIM'
13+
# cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=False maxEvents=20 miniAOD=False inputFiles=/store/mc/RunIIAutumn18DRPremix/QCD_Pt_80to120_TuneCP5_13TeV_pythia8/AODSIM/102X_upgrade2018_realistic_v15-v1/1010000/FA97679F-774B-7F43-9258-D8A0AE3A7A01.root useSelectedTracks=False produceJetTrackTree=True runCTagVariables=False groups='test' &> last.log || die $?
1414

1515
echo 'Running on data -- FatJets'
16-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=True maxEvents=20 runFatJets=True groups='testfat' &> last.log || die $?
16+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=True maxEvents=20 runFatJets=True groups='testfat' &> last.log || die $?
1717

1818
echo 'Running on MC -- FatJets'
19-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=False maxEvents=20 runFatJets=True groups='testfat' &> last.log || die $?
19+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=False maxEvents=20 runFatJets=True groups='testfat' &> last.log || die $?
2020

2121
echo 'Running on data -- commissioning'
22-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 useSelectedTracks=False produceJetTrackTree=True runOnData=True maxEvents=20 groups='test'&> last.log || die $?
22+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies useSelectedTracks=False produceJetTrackTree=True runOnData=True maxEvents=20 groups='test'&> last.log || die $?
2323

2424
echo 'Running on MC -- commissioning'
25-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 useSelectedTracks=False produceJetTrackTree=True runOnData=False maxEvents=20 groups='test' &> last.log || die $?
25+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies useSelectedTracks=False produceJetTrackTree=True runOnData=False maxEvents=20 groups='test' &> last.log || die $?
2626

2727
echo 'Running on data -- ctag'
28-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=True maxEvents=20 runCTagVariables=True runFatJets=True runSubJets=True groups='testfat' &> last.log || die $?
28+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=True maxEvents=20 runCTagVariables=True runFatJets=True runSubJets=True groups='testfat' &> last.log || die $?
2929

3030
echo 'Running on MC -- ctag'
31-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=False maxEvents=20 runCTagVariables=True runFatJets=True runSubJets=True groups='testfat' &> last.log || die $?
31+
cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=False maxEvents=20 runCTagVariables=True runFatJets=True runSubJets=True groups='testfat' &> last.log || die $?
3232

33-
echo 'RECODEBUG'
34-
cmsRun runBTagAnalyzer_cfg.py defaults=Prompt18 runOnData=False maxEvents=20 miniAOD=False runFatJets=True runSubJets=True useTrackHistory=True produceJetTrackTree=True inputFiles=/store/mc/RunIIFall17DRPremix/QCD_Pt_15to30_TuneCP5_13TeV_pythia8/GEN-SIM-RECODEBUG/94X_mc2017_realistic_v10-v1/70000/04F991F0-C2DD-E711-B302-0CC47A78A3F8.root groups='testfat' &> last.log || die $?
33+
# echo 'RECODEBUG'
34+
# cmsRun runBTagAnalyzer_cfg.py defaults=PixelStudies runOnData=False maxEvents=20 miniAOD=False runFatJets=True runSubJets=True useTrackHistory=True produceJetTrackTree=True inputFiles=/store/mc/RunIIFall17DRPremix/QCD_Pt_15to30_TuneCP5_13TeV_pythia8/GEN-SIM-RECODEBUG/94X_mc2017_realistic_v10-v1/70000/04F991F0-C2DD-E711-B302-0CC47A78A3F8.root groups='testfat' &> last.log || die $?
3535

3636

3737

0 commit comments

Comments
 (0)