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

New mixed triplet seed layers and updates to MVA selectors #9119

Merged
merged 37 commits into from
May 30, 2015
Merged

New mixed triplet seed layers and updates to MVA selectors #9119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
bdc520c
update Multi/Analytical TrackSelector for proper MVA use
Mar 9, 2015
2c32a58
update iterative step configs for proper MVA use
Mar 9, 2015
dd1c8b9
Merged fix-tracking-selector-MVA-use from repository mhwalker
VinInn Apr 3, 2015
0a97247
update for missing when 0 MVAs
Apr 3, 2015
493b49b
Merged fix-tracking-selector-MVA-use from repository mhwalker
VinInn Apr 3, 2015
ac02303
add lowPt sel to iter0, remove mix Sel from pixelless, add vtx to pix…
VinInn Apr 6, 2015
64fe418
move LostHitPenaltyto 5, add useMVAonly flag, reduce mva cut to 0.0 f…
VinInn Apr 7, 2015
5616264
Merged TkSelMVAredux from repository VinInn
VinInn Apr 12, 2015
218c59f
minor retune of lostHit cut, remove ClusterShapeFilter pending retuning
VinInn Apr 12, 2015
578b6fa
protect against zero vertices
VinInn Apr 12, 2015
32df730
Merged TkSelMVAredux from repository VinInn
Apr 20, 2015
4e9539a
changes to improve the MVA Selection
Apr 30, 2015
b24b4ee
updated mixed triplet seed layers - using detached layers
May 10, 2015
692d4fa
updated to correct seed layers
May 12, 2015
1a61c1b
Merged TkSelMVAUpdates from repository mhwalker
May 12, 2015
3fa5e28
updates to prepare for PR
May 15, 2015
05cf219
Merge branch 'mhwalker/TkSelMVAUpdates' into newMixedTripletSeedLayers
May 15, 2015
00668a4
update Multi/Analytical TrackSelector for proper MVA use
Mar 9, 2015
12e8fcf
update iterative step configs for proper MVA use
Mar 9, 2015
f2364fc
update for missing when 0 MVAs
Apr 3, 2015
2aa644f
add lowPt sel to iter0, remove mix Sel from pixelless, add vtx to pix…
VinInn Apr 6, 2015
030d40f
move LostHitPenaltyto 5, add useMVAonly flag, reduce mva cut to 0.0 f…
VinInn Apr 7, 2015
42671c3
minor retune of lostHit cut, remove ClusterShapeFilter pending retuning
VinInn Apr 12, 2015
fb14280
protect against zero vertices
VinInn Apr 12, 2015
419c6d6
changes to improve the MVA Selection
Apr 30, 2015
1d87b65
updated mixed triplet seed layers - using detached layers
May 10, 2015
f4b9692
updated to correct seed layers
May 12, 2015
408f2df
updates to prepare for PR
May 15, 2015
8efd715
fixed typo
May 16, 2015
32926ee
merge
May 16, 2015
0e97e61
updates to configs
May 21, 2015
edccbf8
updates to configs
May 21, 2015
8402646
changed code to match the payload labels
May 25, 2015
5b486a0
remove v1 from label names
May 26, 2015
f2ee2cd
new Global Tags with fixes and new features for Run1 and Run2
mmusich May 27, 2015
53e0dee
update to AnalyticalTrackSelector
May 29, 2015
870ce2c
switched to const refs
May 29, 2015
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
24 changes: 12 additions & 12 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@

### NEW KEYS ###
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
'run1_design' : 'DESRUN1_75_V0',
'run1_design' : 'DESRUN1_75_V2',
# GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
'run1_mc' : 'MCRUN1_75_V0',
'run1_mc' : 'MCRUN1_75_V2',
# GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
'run1_mc_hi' : 'MCHI1_75_V0',
'run1_mc_hi' : 'MCHI1_75_V2',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : 'MCPA1_75_V0',
'run1_mc_pa' : 'MCPA1_75_V2',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : 'DESRUN2_75_V0',
'run2_design' : 'DESRUN2_75_V2',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : 'MCRUN2_75_V0',
'run2_mc_50ns' : 'MCRUN2_75_V4',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : 'MCRUN2_75_V1',
'run2_mc' : 'MCRUN2_75_V5',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : 'MCHI2_75_V0',
'run2_mc_hi' : 'MCHI2_75_V2',
# GlobalTag for Run1 data reprocessing
'run1_data' : 'GR_R_75_V0A',
'run1_data' : 'GR_R_75_V4A',
# GlobalTag for Run2 data reprocessing
'run2_data' : 'GR_R_75_V1A',
'run2_data' : 'GR_R_75_V5A',
# GlobalTag for Run1 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
'run1_hlt' : 'GR_H_V59A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
'run1_hlt' : 'GR_H_V61A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
# GlobalTag for Run2 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
'run2_hlt' : 'GR_H_V60A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
'run2_hlt' : 'GR_H_V62A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
'phase1_2017_design' : 'DES17_70_V2', # placeholder (GT not meant for standard RelVal)
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
Expand Down
24 changes: 12 additions & 12 deletions Configuration/AlCa/python/autoCond_condDBv1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@

### NEW KEYS ###
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
'run1_design' : 'DESRUN1_75_V0::All',
'run1_design' : 'DESRUN1_75_V2::All',
# GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
'run1_mc' : 'MCRUN1_75_V0::All',
'run1_mc' : 'MCRUN1_75_V2::All',
# GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
'run1_mc_hi' : 'MCHI1_75_V0::All',
'run1_mc_hi' : 'MCHI1_75_V2::All',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : 'MCPA1_75_V0::All',
'run1_mc_pa' : 'MCPA1_75_V2::All',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : 'DESRUN2_75_V0::All',
'run2_design' : 'DESRUN2_75_V2::All',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : 'MCRUN2_75_V0::All',
'run2_mc_50ns' : 'MCRUN2_75_V4:All',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : 'MCRUN2_75_V1::All',
'run2_mc' : 'MCRUN2_75_V5::All',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : 'MCHI2_75_V0::All',
'run2_mc_hi' : 'MCHI2_75_V2::All',
# GlobalTag for Run1 data reprocessing
'run1_data' : 'GR_R_75_V0A::All',
'run1_data' : 'GR_R_75_V4A::All',
# GlobalTag for Run2 data reprocessing
'run2_data' : 'GR_R_75_V1A::All',
'run2_data' : 'GR_R_75_V5A::All',
# GlobalTag for Run1 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
'run1_hlt' : 'GR_H_V59A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
'run1_hlt' : 'GR_H_V61A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
# GlobalTag for Run2 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
'run2_hlt' : 'GR_H_V60A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
'run2_hlt' : 'GR_H_V62A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
'phase1_2017_design' : 'DES17_70_V2::All', # placeholder (GT not meant for standard RelVal)
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
Expand Down
33 changes: 31 additions & 2 deletions RecoTracker/FinalTrackSelectors/plugins/AnalyticalTrackSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,14 @@ AnalyticalTrackSelector::AnalyticalTrackSelector( const edm::ParameterSet & cfg
max_lostHitFraction_.reserve(1);
min_eta_.reserve(1);
max_eta_.reserve(1);
forest_.reserve(1);
mvaType_.reserve(1);
useMVA_.reserve(1);

produces<edm::ValueMap<float> >("MVAVals");
useAnyMVA_ = false;
forest_ = nullptr;
forest_[0] = nullptr;
if(cfg.exists("useAnyMVA")) useAnyMVA_ = cfg.getParameter<bool>("useAnyMVA");

src_ = consumes<reco::TrackCollection>(cfg.getParameter<edm::InputTag>( "src" ));
hSrc_ = consumes<TrackingRecHitCollection>(cfg.getParameter<edm::InputTag>( "src" ));
Expand Down Expand Up @@ -190,6 +194,31 @@ AnalyticalTrackSelector::AnalyticalTrackSelector( const edm::ParameterSet & cfg
max_d0NoPV_.push_back(0.);
max_z0NoPV_.push_back(0.);
}

if(useAnyMVA_){
bool thisMVA = false;
if(cfg.exists("useMVA"))thisMVA = cfg.getParameter<bool>("useMVA");
useMVA_.push_back(thisMVA);
if(thisMVA){
double minVal = -1;
if(cfg.exists("minMVA"))minVal = cfg.getParameter<double>("minMVA");
min_MVA_.push_back(minVal);
mvaType_.push_back(cfg.exists("mvaType") ? cfg.getParameter<std::string>("mvaType") : "Detached");
forestLabel_.push_back(cfg.exists("GBRForestLabel") ? cfg.getParameter<std::string>("GBRForestLabel") : "MVASelectorIter0");
useMVAonly_.push_back(cfg.exists("useMVAonly") ? cfg.getParameter<bool>("useMVAonly") : false);
}else{
min_MVA_.push_back(-9999.0);
useMVAonly_.push_back(false);
mvaType_.push_back("Detached");
forestLabel_.push_back("MVASelectorIter0");
}
}else{
useMVA_.push_back(false);
useMVAonly_.push_back(false);
min_MVA_.push_back(-9999.0);
mvaType_.push_back("Detached");
forestLabel_.push_back("MVASelectorIter0");
}

std::string alias( cfg.getParameter<std::string>( "@module_label" ) );
produces<reco::TrackCollection>().setBranchAlias( alias + "Tracks");
Expand Down Expand Up @@ -271,7 +300,7 @@ void AnalyticalTrackSelector::run( edm::Event& evt, const edm::EventSetup& es )
if (copyTrajectories_) trackRefs_.resize(hSrcTrack->size());

std::vector<float> mvaVals_(hSrcTrack->size(),-99.f);
processMVA(evt,es,mvaVals_);
processMVA(evt,es,vertexBeamSpot,*(hVtx.product()),0,mvaVals_,true);

// Loop over tracks
size_t current = 0;
Expand Down