106 |
|
{ |
107 |
|
const mithep::Muon *mu = (mithep::Muon*)((*muonArr)[i]); |
108 |
|
|
109 |
– |
SelectionStatus musel; |
109 |
|
|
110 |
< |
musel |= (*MuonPreSelector)(ctrl,mu,vtx,pfCandidates); |
111 |
< |
if( !(musel.getStatus() & SelectionStatus::PRESELECTION) ) continue; |
110 |
> |
SelectionStatus denomSel; |
111 |
> |
denomSel |= muonDenominatorSelection(ctrl,mu,vtx,pfCandidates); |
112 |
> |
if( !(denomSel.getStatus() & SelectionStatus::PRESELECTION) ) continue; |
113 |
|
|
114 |
+ |
SelectionStatus musel; |
115 |
+ |
musel |= (*MuonPreSelector)(ctrl,mu,vtx,pfCandidates); |
116 |
|
musel |= (*MuonIDSelector)(ctrl,mu,vtx,pfCandidates ); |
117 |
< |
|
116 |
< |
if( !(ctrl.doFSR) ) { |
117 |
< |
musel |= (*MuonIsoSelector)(ctrl,mu,vtx,pfCandidates,puEnergyDensity,eraMu,photonsToVeto); |
118 |
< |
} |
117 |
> |
musel |= (*MuonIsoSelector)(ctrl,mu,vtx,pfCandidates,puEnergyDensity,eraMu,photonsToVeto); |
118 |
|
|
119 |
|
SimpleLepton tmplep; |
120 |
|
float pt = mu->Pt(); |
155 |
|
{ |
156 |
|
const mithep::Electron *ele = (mithep::Electron*)((*electronArr)[i]); |
157 |
|
|
158 |
< |
SelectionStatus elesel; |
158 |
> |
SelectionStatus denomSel; |
159 |
> |
denomSel |= electronDenominatorSelection(ctrl,ele,vtx); |
160 |
> |
if( !(denomSel.getStatus() & SelectionStatus::PRESELECTION) ) continue; |
161 |
|
|
162 |
+ |
SelectionStatus elesel; |
163 |
|
elesel |= (*ElectronPreSelector)(ctrl,ele,vtx); |
162 |
– |
if( !(elesel.getStatus() & SelectionStatus::PRESELECTION) ) continue; |
163 |
– |
|
164 |
|
elesel |= (*ElectronIDSelector)(ctrl,ele,vtx); |
165 |
< |
|
166 |
< |
if( !(ctrl.doFSR) ) { |
167 |
< |
elesel |= (*ElectronIsoSelector)(ctrl,ele,vtx,pfCandidates,puEnergyDensity,eraEle,photonsToVeto); |
168 |
< |
} |
165 |
> |
elesel |= (*ElectronIsoSelector)(ctrl,ele,vtx,pfCandidates,puEnergyDensity,eraEle,photonsToVeto); |
166 |
|
|
167 |
|
SimpleLepton tmplep; |
168 |
|
float pt = ele->Pt(); |