ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.cc
(Generate patch)

Comparing UserCode/OSUT3Analysis/AnaTools/plugins/OSUAnalysis.cc (file contents):
Revision 1.28 by jbrinson, Thu Mar 14 10:06:38 2013 UTC vs.
Revision 1.57 by ahart, Tue May 7 02:41:34 2013 UTC

# Line 11 | Line 11 | OSUAnalysis::OSUAnalysis (const edm::Par
11    tracks_ (cfg.getParameter<edm::InputTag> ("tracks")),
12    genjets_ (cfg.getParameter<edm::InputTag> ("genjets")),
13    mcparticles_ (cfg.getParameter<edm::InputTag> ("mcparticles")),
14 +  stops_ (cfg.getParameter<edm::InputTag> ("stops")),
15    primaryvertexs_ (cfg.getParameter<edm::InputTag> ("primaryvertexs")),
16    bxlumis_ (cfg.getParameter<edm::InputTag> ("bxlumis")),
17    photons_ (cfg.getParameter<edm::InputTag> ("photons")),
18    superclusters_ (cfg.getParameter<edm::InputTag> ("superclusters")),
19    triggers_ (cfg.getParameter<edm::InputTag> ("triggers")),
20 <  puFile_ (cfg.getParameter<std::string> ("puFile")),
21 <  deadEcalFile_ (cfg.getParameter<std::string> ("deadEcalFile")),
22 <  dataPU_ (cfg.getParameter<std::string> ("dataPU")),
23 <  dataset_ (cfg.getParameter<std::string> ("dataset")),
24 <  datasetType_ (cfg.getParameter<std::string> ("datasetType")),
20 >  trigobjs_ (cfg.getParameter<edm::InputTag> ("trigobjs")),
21 >  puFile_ (cfg.getParameter<string> ("puFile")),
22 >  deadEcalFile_ (cfg.getParameter<string> ("deadEcalFile")),
23 >  muonSFFile_ (cfg.getParameter<string> ("muonSFFile")),
24 >  dataPU_ (cfg.getParameter<string> ("dataPU")),
25 >  electronSFID_ (cfg.getParameter<string> ("electronSFID")),
26 >  muonSF_ (cfg.getParameter<string> ("muonSF")),
27 >  dataset_ (cfg.getParameter<string> ("dataset")),
28 >  datasetType_ (cfg.getParameter<string> ("datasetType")),
29    channels_  (cfg.getParameter<vector<edm::ParameterSet> >("channels")),
30    histogramSets_ (cfg.getParameter<vector<edm::ParameterSet> >("histogramSets")),
31 <  plotAllObjectsInPassingEvents_ (cfg.getParameter<bool> ("plotAllObjectsInPassingEvents"))
31 >  plotAllObjectsInPassingEvents_ (cfg.getParameter<bool> ("plotAllObjectsInPassingEvents")),
32 >  doPileupReweighting_ (cfg.getParameter<bool> ("doPileupReweighting")),
33 >  applyLeptonSF_ (cfg.getParameter<bool> ("applyLeptonSF")),
34 >  printEventInfo_ (cfg.getParameter<bool> ("printEventInfo")),
35 >  useTrackCaloRhoCorr_ (cfg.getParameter<bool> ("useTrackCaloRhoCorr")),
36 >  stopCTau_ (cfg.getParameter<vector<double> > ("stopCTau"))
37  
38   {
39  
40    TH1::SetDefaultSumw2 ();
41  
42    //create pile-up reweighting object, if necessary
43 <  //  if(datasetType_ != "data") puWeight_ = new PUWeight (puFile_, dataPU_, dataset_);
43 >  if(datasetType_ != "data") {
44 >    if(doPileupReweighting_) puWeight_ = new PUWeight (puFile_, dataPU_, dataset_);
45 >    if (applyLeptonSF_){
46 >      muonSFWeight_ = new MuonSFWeight (muonSFFile_, muonSF_);
47 >      electronSFWeight_ = new ElectronSFWeight ("53X", electronSFID_);
48 >    }
49 >  }
50 >  if (datasetType_ == "signalMC" && regex_match (dataset_, regex ("stop.*to.*_.*mm.*")))
51 >    stopCTauWeight_ = new StopCTauWeight (stopCTau_.at (0), stopCTau_.at (1), stops_);
52 >
53  
54    // Construct Cutflow Objects. These store the results of cut decisions and
55    // handle filling cut flow histograms.
56    masterCutFlow_ = new CutFlow (fs_);
57 <  std::vector<TFileDirectory> directories;
57 >  vector<TFileDirectory> directories;
58  
59    //always get vertex collection so we can assign the primary vertex in the event
60 <  
61 < objectsToGet.push_back("primaryvertexs");
62 <  //always make the plot of number of primary verticex (to check pile-up reweighting)
60 >  objectsToGet.push_back("primaryvertexs");
61 >
62 >  //always make the plot of number of primary vertices (to check pile-up reweighting)
63    objectsToPlot.push_back("primaryvertexs");
64  
65    //always get the MC particles to do GEN-matching
# Line 54 | Line 73 | objectsToGet.push_back("primaryvertexs")
73  
74      string tempInputCollection = histogramSets_.at(currentHistogramSet).getParameter<string> ("inputCollection");
75      if(tempInputCollection == "muon-electron pairs") tempInputCollection = "electron-muon pairs";
76 <    if(tempInputCollection.find("pairs")==std::string::npos){ //just a single object
77 <      objectsToGet.push_back(tempInputCollection);
76 >    if(tempInputCollection == "jet-electron pairs") tempInputCollection = "electron-jet pairs";
77 >    if(tempInputCollection == "jet-muon pairs") tempInputCollection = "muon-jet pairs";
78 >    if(tempInputCollection == "event-track pairs")   tempInputCollection = "track-event pairs";
79 >    if(tempInputCollection == "secondary muon-muon pairs")   tempInputCollection = "muon-secondary muon pairs";
80 >    if(tempInputCollection == "secondary electron-electron pairs")   tempInputCollection = "electron-secondary electron pairs";
81 >    if(tempInputCollection == "trigobj-electron pairs")   tempInputCollection = "electron-trigobj pairs";
82 >    if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
83 >    if(tempInputCollection.find("pairs")==string::npos){ //just a single object
84 >      if(tempInputCollection.find("secondary")!=string::npos){//secondary object
85 >        int spaceIndex = tempInputCollection.find(" ");
86 >        int secondWordLength = tempInputCollection.size() - spaceIndex;
87 >        objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
88 >      }
89 >      else{
90 >        objectsToGet.push_back(tempInputCollection);
91 >      }
92        objectsToPlot.push_back(tempInputCollection);
93        objectsToCut.push_back(tempInputCollection);
94      }
95 <    else{//pair of objects, need to add them both to the things to objectsToGet
96 <      int dashIndex = tempInputCollection.find("-");
97 <      int spaceIndex = tempInputCollection.find(" ");
98 <      int secondWordLength = spaceIndex - dashIndex;
99 <      objectsToGet.push_back(tempInputCollection);
67 <      objectsToGet.push_back(tempInputCollection.substr(0,dashIndex)+"s");
68 <      objectsToGet.push_back(tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s");
69 <      objectsToPlot.push_back(tempInputCollection);
70 <      objectsToPlot.push_back(tempInputCollection.substr(0,dashIndex)+"s");
71 <      objectsToPlot.push_back(tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s");
95 >    else{//pair of objects, need to add the pair and the individual objects to the lists of things to Get/Plot/Cut
96 >      string obj1;
97 >      string obj2;
98 >      getTwoObjs(tempInputCollection, obj1, obj2);
99 >      string obj2ToGet = getObjToGet(obj2);
100        objectsToCut.push_back(tempInputCollection);
101 <      objectsToCut.push_back(tempInputCollection.substr(0,dashIndex)+"s");
102 <      objectsToCut.push_back(tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s");
101 >      objectsToCut.push_back(obj1);
102 >      objectsToCut.push_back(obj2);
103 >      objectsToPlot.push_back(tempInputCollection);
104 >      objectsToPlot.push_back(obj1);
105 >      objectsToPlot.push_back(obj2);
106 >      objectsToGet.push_back(tempInputCollection);
107 >      objectsToGet.push_back(obj1);
108 >      objectsToGet.push_back(obj2ToGet);
109  
110 <      }
110 >    }
111  
112      vector<edm::ParameterSet> histogramList_  (histogramSets_.at(currentHistogramSet).getParameter<vector<edm::ParameterSet> >("histograms"));
113 <    
113 >
114      for(uint currentHistogram = 0; currentHistogram != histogramList_.size(); currentHistogram++){
115  
116 +      vector<double> defaultValue;
117 +      defaultValue.push_back (-1.0);
118 +
119        histogram tempHistogram;
120        tempHistogram.inputCollection = tempInputCollection;
121        tempHistogram.name = histogramList_.at(currentHistogram).getParameter<string>("name");
122        tempHistogram.title = histogramList_.at(currentHistogram).getParameter<string>("title");
123 <      tempHistogram.bins = histogramList_.at(currentHistogram).getParameter<vector<double> >("bins");
123 >      tempHistogram.bins = histogramList_.at(currentHistogram).getUntrackedParameter<vector<double> >("bins", defaultValue);
124 >      tempHistogram.variableBinsX = histogramList_.at(currentHistogram).getUntrackedParameter<vector<double> >("variableBinsX", defaultValue);
125 >      tempHistogram.variableBinsY = histogramList_.at(currentHistogram).getUntrackedParameter<vector<double> >("variableBinsY", defaultValue);
126        tempHistogram.inputVariables = histogramList_.at(currentHistogram).getParameter<vector<string> >("inputVariables");
127 <      
127 >
128        histograms.push_back(tempHistogram);
129  
130      }
# Line 100 | Line 139 | objectsToGet.push_back("primaryvertexs")
139    for(uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
140  
141      string currentObject = objectsToPlot.at(currentObjectIndex);
142 <    if(currentObject != "muons" && currentObject != "electrons" && currentObject != "taus" && currentObject != "tracks" && currentObject != "photons" && currentObject != "superclusters") continue;
142 >    if(currentObject != "muons" && currentObject != "secondary muons" && currentObject != "secondary electrons" && currentObject != "electrons" && currentObject != "taus" && currentObject != "tracks" && currentObject != "photons" && currentObject != "superclusters") continue;
143  
144      histogram tempIdHisto;
145      histogram tempMomIdHisto;
146      histogram tempGmaIdHisto;
147 +    histogram tempIdVsMomIdHisto;
148 +    histogram tempIdVsGmaIdHisto;
149  
150      tempIdHisto.inputCollection = currentObject;
151      tempMomIdHisto.inputCollection = currentObject;
152      tempGmaIdHisto.inputCollection = currentObject;
153 +    tempIdVsMomIdHisto.inputCollection = currentObject;
154 +    tempIdVsGmaIdHisto.inputCollection = currentObject;
155 +
156 +    if(currentObject == "secondary muons") currentObject = "secondaryMuons";
157 +    if(currentObject == "secondary electrons") currentObject = "secondaryElectrons";
158  
159      currentObject = currentObject.substr(0, currentObject.size()-1);
160      tempIdHisto.name = currentObject+"GenMatchId";
161      tempMomIdHisto.name = currentObject+"GenMatchMotherId";
162      tempGmaIdHisto.name = currentObject+"GenMatchGrandmotherId";
163 +    tempIdVsMomIdHisto.name = currentObject+"GenMatchIdVsMotherId";
164 +    tempIdVsGmaIdHisto.name = currentObject+"GenMatchIdVsGrandmotherId";
165  
166      currentObject.at(0) = toupper(currentObject.at(0));
167      tempIdHisto.title = currentObject+" Gen-matched Particle";
168      tempMomIdHisto.title = currentObject+" Gen-matched Particle's Mother";
169      tempGmaIdHisto.title = currentObject+" Gen-matched Particle's Grandmother";
170 +    tempIdVsMomIdHisto.title = currentObject+" Gen-matched Particle's Mother vs. Particle;Particle;Mother";
171 +    tempIdVsGmaIdHisto.title = currentObject+" Gen-matched Particle's Grandmother vs. Particle;Particle;Grandmother";
172 +
173  
174      int maxNum = 24;
175      vector<double> binVector;
# Line 132 | Line 183 | objectsToGet.push_back("primaryvertexs")
183      tempMomIdHisto.inputVariables.push_back("genMatchedMotherId");
184      tempGmaIdHisto.bins = binVector;
185      tempGmaIdHisto.inputVariables.push_back("genMatchedGrandmotherId");
186 +    binVector.push_back(maxNum);
187 +    binVector.push_back(0);
188 +    binVector.push_back(maxNum);
189 +    tempIdVsMomIdHisto.bins = binVector;
190 +    tempIdVsMomIdHisto.inputVariables.push_back("genMatchedId");
191 +    tempIdVsMomIdHisto.inputVariables.push_back("genMatchedMotherIdReverse");
192 +    tempIdVsGmaIdHisto.bins = binVector;
193 +    tempIdVsGmaIdHisto.inputVariables.push_back("genMatchedId");
194 +    tempIdVsGmaIdHisto.inputVariables.push_back("genMatchedGrandmotherIdReverse");
195  
196      histograms.push_back(tempIdHisto);
197      histograms.push_back(tempMomIdHisto);
198      histograms.push_back(tempGmaIdHisto);
199 <    
199 >    histograms.push_back(tempIdVsMomIdHisto);
200 >    histograms.push_back(tempIdVsGmaIdHisto);
201    }
202  
203  
143 –
204    channel tempChannel;
205    //loop over all channels (event selections)
206    for(uint currentChannel = 0; currentChannel != channels_.size(); currentChannel++){
# Line 171 | Line 231 | objectsToGet.push_back("primaryvertexs")
231      TFileDirectory subDir = fs_->mkdir( channelName );
232      directories.push_back(subDir);
233  
234 <    std::map<std::string, TH1D*> oneDhistoMap;
234 >    map<string, TH1D*> oneDhistoMap;
235      oneDHists_.push_back(oneDhistoMap);
236 <    std::map<std::string, TH2D*> twoDhistoMap;
236 >    map<string, TH2D*> twoDhistoMap;
237      twoDHists_.push_back(twoDhistoMap);
238  
239  
240 +
241      //book all histograms included in the configuration
242      for(uint currentHistogramIndex = 0; currentHistogramIndex != histograms.size(); currentHistogramIndex++){
243        histogram currentHistogram = histograms.at(currentHistogramIndex);
244        int numBinsElements = currentHistogram.bins.size();
245        int numInputVariables = currentHistogram.inputVariables.size();
246 +      int numBinEdgesX = currentHistogram.variableBinsX.size();
247 +      int numBinEdgesY = currentHistogram.variableBinsY.size();
248  
249 <      if(numBinsElements != 3 && numBinsElements !=6) {
250 <        std::cout << "Error: Didn't find correct number of bin specifications for histogram named '" << currentHistogram.name << "'\n";
251 <        exit(0);
249 >      if(numBinsElements == 1){
250 >        if(numBinEdgesX > 1){
251 >          if(numBinEdgesY > 1)
252 >            numBinsElements = 6;
253 >          else
254 >            numBinsElements = 3;
255 >        }
256 >      }
257 >      if(numBinsElements != 3 && numBinsElements !=6){
258 >        cout << "Error: Didn't find correct number of bin specifications for histogram named '" << currentHistogram.name << "'\n";
259 >        exit(0);
260        }
261        else if((numBinsElements == 3 && numInputVariables !=1) || (numBinsElements == 6 && numInputVariables!=2)){
262 <        std::cout << "Error: Didn't find correct number of input variables for histogram named '" << currentHistogram.name << "'\n";
263 <        exit(0);
262 >        cout << "Error: Didn't find correct number of input variables for histogram named '" << currentHistogram.name << "'\n";
263 >        exit(0);
264        }
265        else if(numBinsElements == 3){
266 <        oneDHists_.at(currentChannel)[currentHistogram.name] = directories.at(currentChannel).make<TH1D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, currentHistogram.bins.at(0), currentHistogram.bins.at(1), currentHistogram.bins.at(2));
266 >        if (currentHistogram.bins.size () == 3)
267 >          oneDHists_.at(currentChannel)[currentHistogram.name] = directories.at(currentChannel).make<TH1D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, currentHistogram.bins.at(0), currentHistogram.bins.at(1), currentHistogram.bins.at(2));
268 >        else
269 >          {
270 >            oneDHists_.at(currentChannel)[currentHistogram.name] = directories.at(currentChannel).make<TH1D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, numBinEdgesX - 1, currentHistogram.variableBinsX.data ());
271 >          }
272        }
273        else if(numBinsElements == 6){
274 <        twoDHists_.at(currentChannel)[currentHistogram.name] = directories.at(currentChannel).make<TH2D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, currentHistogram.bins.at(0), currentHistogram.bins.at(1), currentHistogram.bins.at(2),currentHistogram.bins.at(3),currentHistogram.bins.at(4),currentHistogram.bins.at(5));
275 <
274 >        if (currentHistogram.bins.size () == 6)
275 >          twoDHists_.at(currentChannel)[currentHistogram.name] = directories.at(currentChannel).make<TH2D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, currentHistogram.bins.at(0), currentHistogram.bins.at(1), currentHistogram.bins.at(2),currentHistogram.bins.at(3),currentHistogram.bins.at(4),currentHistogram.bins.at(5));
276 >        else
277 >          twoDHists_.at(currentChannel)[currentHistogram.name] = directories.at(currentChannel).make<TH2D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, numBinEdgesX - 1, currentHistogram.variableBinsX.data (), numBinEdgesY - 1, currentHistogram.variableBinsY.data ());
278        }
279  
280  
281 <      if(currentHistogram.name.find("GenMatch")==std::string::npos) continue;
282 <
283 < // bin      particle type
284 < // ---      -------------
285 < //  0        unmatched
286 < //  1        u
287 < //  2        d
288 < //  3        s
289 < //  4        c
290 < //  5        b
291 < //  6        t
292 < //  7        e
293 < //  8        mu
294 < //  9        tau
295 < // 10        nu
296 < // 11        g
297 < // 12        gamma
298 < // 13        Z
299 < // 14        W
300 < // 15        light meson
301 < // 16        K meson
302 < // 17        D meson
303 < // 18        B meson
304 < // 19        light baryon
305 < // 20        strange baryon
306 < // 21        charm baryon
307 < // 22        bottom baryon
308 < // 23        other
281 >      if(currentHistogram.name.find("GenMatch")==string::npos) continue;
282 >
283 >      // bin      particle type
284 >      // ---      -------------
285 >      //  0        unmatched
286 >      //  1        u
287 >      //  2        d
288 >      //  3        s
289 >      //  4        c
290 >      //  5        b
291 >      //  6        t
292 >      //  7        e
293 >      //  8        mu
294 >      //  9        tau
295 >      // 10        nu
296 >      // 11        g
297 >      // 12        gamma
298 >      // 13        Z
299 >      // 14        W
300 >      // 15        light meson
301 >      // 16        K meson
302 >      // 17        D meson
303 >      // 18        B meson
304 >      // 19        light baryon
305 >      // 20        strange baryon
306 >      // 21        charm baryon
307 >      // 22        bottom baryon
308 >      // 23        other
309  
310        vector<TString> labelArray;
311        labelArray.push_back("unmatched");
# Line 256 | Line 334 | objectsToGet.push_back("primaryvertexs")
334        labelArray.push_back("other");
335  
336        for(int bin = 0; bin !=currentHistogram.bins.at(0); bin++){
337 <        oneDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
337 >        if(currentHistogram.name.find("GenMatchIdVsMotherId")==string::npos && currentHistogram.name.find("GenMatchIdVsGrandmotherId")==string::npos) {
338 >          oneDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
339 >        }
340 >        else {
341 >          twoDHists_.at(currentChannel)[currentHistogram.name]->GetYaxis()->SetBinLabel(bin+1,labelArray.at(currentHistogram.bins.at(0)-bin-1));
342 >          twoDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
343 >        }
344 >      }
345 >      if(currentHistogram.name.find("GenMatchIdVsMotherId")!=string::npos || currentHistogram.name.find("GenMatchIdVsGrandmotherId")!=string::npos) {
346 >        twoDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->CenterTitle();
347 >        twoDHists_.at(currentChannel)[currentHistogram.name]->GetYaxis()->CenterTitle();
348        }
261 –    }
349  
350 <    //book a histogram for the number of each object type to be plotted
350 >    }
351  
352 +    // Book a histogram for the number of each object type to be plotted.
353 +    // Name of objectToPlot here must match the name specified in OSUAnalysis::analyze().
354      for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
355        string currentObject = objectsToPlot.at(currentObjectIndex);
356        int maxNum = 10;
357        if(currentObject == "mcparticles") maxNum = 50;
358        else if(currentObject == "primaryvertexs") maxNum = 50;
359 <      else if(currentObject == "muon-muon pairs")
360 <        {
361 <          currentObject = "dimuonPairs";
362 <        }
363 <      else if(currentObject == "electron-electron pairs") currentObject = "dielectronPairs";
364 <      else if(currentObject == "electron-muon pairs") currentObject = "electronMuonPairs";
359 >
360 >      if(currentObject == "muon-muon pairs")                currentObject = "dimuonPairs";
361 >      else if(currentObject == "electron-electron pairs")   currentObject = "dielectronPairs";
362 >      else if(currentObject == "electron-muon pairs")       currentObject = "electronMuonPairs";
363 >      else if(currentObject == "jet-jet pairs")             currentObject = "dijetPairs";
364 >      else if(currentObject == "electron-jet pairs")        currentObject = "electronJetPairs";
365 >      else if(currentObject == "muon-jet pairs")            currentObject = "muonJetPairs";
366 >      else if(currentObject == "track-event pairs")         currentObject = "trackEventPairs";
367 >      else if(currentObject == "electron-track pairs")      currentObject = "electronTrackPairs";
368 >      else if(currentObject == "muon-track pairs")          currentObject = "muonTrackPairs";
369 >      else if(currentObject == "muon-tau pairs")            currentObject = "muonTauPairs";
370 >      else if(currentObject == "tau-tau pairs")             currentObject = "ditauPairs";
371 >      else if(currentObject == "tau-track pairs")           currentObject = "tauTrackPairs";
372 >      else if(currentObject == "muon-secondary muon pairs") currentObject = "muonSecondaryMuonPairs";
373 >      else if(currentObject == "secondary muons")           currentObject = "secondaryMuons";
374 >      else if(currentObject == "electron-secondary electron pairs") currentObject = "electronSecondaryElectronPairs";
375 >      else if(currentObject == "secondary electrons")           currentObject = "secondaryElectrons";
376 >      else if(currentObject == "electron-trigobj pairs")    currentObject = "electronTrigobjPairs";
377 >      else if(currentObject == "muon-trigobj pairs")        currentObject = "muonTrigobjPairs";
378  
379        currentObject.at(0) = toupper(currentObject.at(0));
380        string histoName = "num" + currentObject;
381  
382        if(histoName == "numPrimaryvertexs"){
383 <        string newHistoName = histoName + "BeforePileupCorrection";
384 <        oneDHists_.at(currentChannel)[newHistoName] = directories.at(currentChannel).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+" Before Pileup Correction; # "+currentObject, maxNum, 0, maxNum);    
385 <        newHistoName = histoName + "AfterPileupCorrection";
386 <        oneDHists_.at(currentChannel)[newHistoName] = directories.at(currentChannel).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+ " After Pileup Correction; # "+currentObject, maxNum, 0, maxNum);
383 >        string newHistoName = histoName + "BeforePileupCorrection";
384 >        oneDHists_.at(currentChannel)[newHistoName] = directories.at(currentChannel).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+" Before Pileup Correction; # "+currentObject, maxNum, 0, maxNum);
385 >        newHistoName = histoName + "AfterPileupCorrection";
386 >        oneDHists_.at(currentChannel)[newHistoName] = directories.at(currentChannel).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+ " After Pileup Correction; # "+currentObject, maxNum, 0, maxNum);
387        }
388        else
389 <        oneDHists_.at(currentChannel)[histoName] = directories.at(currentChannel).make<TH1D> (TString(histoName),channelLabel+" channel: Number of Selected "+currentObject+"; # "+currentObject, maxNum, 0, maxNum);
389 >        oneDHists_.at(currentChannel)[histoName] = directories.at(currentChannel).make<TH1D> (TString(histoName),channelLabel+" channel: Number of Selected "+currentObject+"; # "+currentObject, maxNum, 0, maxNum);
390      }
391  
392  
291 –    
393  
394  
395      //get list of cuts for this channel
# Line 299 | Line 400 | objectsToGet.push_back("primaryvertexs")
400        cut tempCut;
401        //store input collection for cut
402        string tempInputCollection = cuts_.at(currentCut).getParameter<string> ("inputCollection");
403 +      if(tempInputCollection == "muon-electron pairs") tempInputCollection = "electron-muon pairs";
404 +      if(tempInputCollection == "jet-electron pairs") tempInputCollection = "electron-jet pairs";
405 +      if(tempInputCollection == "jet-muon pairs") tempInputCollection = "muon-jet pairs";
406 +      if(tempInputCollection == "event-track pairs")   tempInputCollection = "track-event pairs";
407 +      if(tempInputCollection == "secondary muon-muon pairs")   tempInputCollection = "muon-secondary muon pairs";
408 +      if(tempInputCollection == "secondary electron-electron pairs")   tempInputCollection = "electron-secondary electron pairs";
409 +      if(tempInputCollection == "trigobj-electron pairs")   tempInputCollection = "electron-trigobj pairs";
410 +      if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
411        tempCut.inputCollection = tempInputCollection;
412 <      if(tempInputCollection.find("pairs")==std::string::npos){ //just a single object
413 <        objectsToGet.push_back(tempInputCollection);
414 <        objectsToCut.push_back(tempInputCollection);
415 <      }
416 <      else{//pair of objects, need to add them both to the things to objectsToGet
417 <        int dashIndex = tempInputCollection.find("-");
418 <        int spaceIndex = tempInputCollection.find(" ");
419 <        int secondWordLength = spaceIndex - dashIndex;
420 <        objectsToGet.push_back(tempInputCollection);
421 <        objectsToGet.push_back(tempInputCollection.substr(0,dashIndex)+"s");
422 <        objectsToGet.push_back(tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s");
423 <        objectsToCut.push_back(tempInputCollection);
424 <        objectsToCut.push_back(tempInputCollection.substr(0,dashIndex)+"s");
425 <        objectsToCut.push_back(tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s");
412 >      if(tempInputCollection.find("pairs")==string::npos){ //just a single object
413 >        if(tempInputCollection.find("secondary")!=string::npos){//secondary object
414 >          int spaceIndex = tempInputCollection.find(" ");
415 >          int secondWordLength = tempInputCollection.size() - spaceIndex;
416 >          objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
417 >        }
418 >        else{
419 >          objectsToGet.push_back(tempInputCollection);
420 >        }
421 >        objectsToCut.push_back(tempInputCollection);
422 >      }
423 >      else{//pair of objects, need to add them both to objectsToGet
424 >        string obj1;
425 >        string obj2;
426 >        getTwoObjs(tempInputCollection, obj1, obj2);
427 >        string obj2ToGet = getObjToGet(obj2);
428 >        objectsToCut.push_back(tempInputCollection);
429 >        objectsToCut.push_back(obj1);
430 >        objectsToCut.push_back(obj2);
431 >        objectsToGet.push_back(tempInputCollection);
432 >        objectsToGet.push_back(obj1);
433 >        objectsToGet.push_back(obj2ToGet);
434  
435        }
436  
# Line 321 | Line 438 | objectsToGet.push_back("primaryvertexs")
438  
439        //split cut string into parts and store them
440        string cutString = cuts_.at(currentCut).getParameter<string> ("cutString");
441 <      std::vector<string> cutStringVector = splitString(cutString);
441 >      vector<string> cutStringVector = splitString(cutString);
442        if(cutStringVector.size()!=3 && cutStringVector.size() % 4 !=3){
443 <        std::cout << "Error: Didn't find the expected number elements in the following cut string: '" << cutString << "'\n";
444 <        exit(0);
443 >        cout << "Error: Didn't find the expected number elements in the following cut string: '" << cutString << "'\n";
444 >        exit(0);
445        }
446        tempCut.numSubcuts = (cutStringVector.size()+1)/4;
447        for(int subcutIndex = 0; subcutIndex != tempCut.numSubcuts; subcutIndex++){//loop over all the pieces of the cut combined using &,|
448 <        int indexOffset = 4 * subcutIndex;
449 <        string currentVariableString = cutStringVector.at(indexOffset);
450 <        if(currentVariableString.find("(")==std::string::npos){
451 <          tempCut.functions.push_back("");//no function was specified
452 <          tempCut.variables.push_back(currentVariableString);// variable to cut on
453 <        }
454 <        else{
455 <          tempCut.functions.push_back(currentVariableString.substr(0,currentVariableString.find("(")));//function comes before the "("
456 <          string tempVariable = currentVariableString.substr(currentVariableString.find("(")+1);//get rest of string
457 <          tempCut.variables.push_back(tempVariable.substr(0,tempVariable.size()-1));//remove trailing ")"
458 <        }
459 <        tempCut.comparativeOperators.push_back(cutStringVector.at(indexOffset+1));// comparison to make
460 <        tempCut.cutValues.push_back(atof(cutStringVector.at(indexOffset+2).c_str()));// threshold value to pass cut
461 <        if(subcutIndex != 0) tempCut.logicalOperators.push_back(cutStringVector.at(indexOffset-1)); // logical comparison (and, or)
448 >        int indexOffset = 4 * subcutIndex;
449 >        string currentVariableString = cutStringVector.at(indexOffset);
450 >        if(currentVariableString.find("(")==string::npos){
451 >          tempCut.functions.push_back("");//no function was specified
452 >          tempCut.variables.push_back(currentVariableString);// variable to cut on
453 >        }
454 >        else{
455 >          tempCut.functions.push_back(currentVariableString.substr(0,currentVariableString.find("(")));//function comes before the "("
456 >          string tempVariable = currentVariableString.substr(currentVariableString.find("(")+1);//get rest of string
457 >          tempCut.variables.push_back(tempVariable.substr(0,tempVariable.size()-1));//remove trailing ")"
458 >        }
459 >        tempCut.comparativeOperators.push_back(cutStringVector.at(indexOffset+1));// comparison to make
460 >        tempCut.cutValues.push_back(atof(cutStringVector.at(indexOffset+2).c_str()));// threshold value to pass cut
461 >        tempCut.cutStringValues.push_back(cutStringVector.at(indexOffset+2));// string value to pass cut
462 >        if(subcutIndex != 0) tempCut.logicalOperators.push_back(cutStringVector.at(indexOffset-1)); // logical comparison (and, or)
463        }
464  
465        //get number of objects required to pass cut for event to pass
466        string numberRequiredString = cuts_.at(currentCut).getParameter<string> ("numberRequired");
467 <      std::vector<string> numberRequiredVector = splitString(numberRequiredString);
467 >      vector<string> numberRequiredVector = splitString(numberRequiredString);
468        if(numberRequiredVector.size()!=2){
469 <        std::cout << "Error: Didn't find two elements in the following number requirement string: '" << numberRequiredString << "'\n";
469 >        cout << "Error: Didn't find two elements in the following number requirement string: '" << numberRequiredString << "'\n";
470          exit(0);
471        }
472  
# Line 370 | Line 488 | objectsToGet.push_back("primaryvertexs")
488        }
489        tempCut.name = tempCutName;
490  
373 –
491        tempChannel.cuts.push_back(tempCut);
492  
493  
377 –
494      }//end loop over cuts
495  
496      channels.push_back(tempChannel);
# Line 408 | Line 524 | OSUAnalysis::analyze (const edm::Event &
524  
525    // Retrieve necessary collections from the event.
526  
527 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "triggers") != objectsToGet.end())
527 >  if (find(objectsToGet.begin(), objectsToGet.end(), "triggers") != objectsToGet.end())
528      event.getByLabel (triggers_, triggers);
529  
530 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "jets") != objectsToGet.end())
530 >  if (find(objectsToGet.begin(), objectsToGet.end(), "trigobjs") != objectsToGet.end())
531 >    event.getByLabel (trigobjs_, trigobjs);
532 >
533 >  if (find(objectsToGet.begin(), objectsToGet.end(), "jets") != objectsToGet.end())
534      event.getByLabel (jets_, jets);
535  
536 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "muons") != objectsToGet.end())
536 >  if (find(objectsToGet.begin(), objectsToGet.end(), "muons") != objectsToGet.end())
537      event.getByLabel (muons_, muons);
538  
539 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "electrons") != objectsToGet.end())
539 >  if (find(objectsToGet.begin(), objectsToGet.end(), "electrons") != objectsToGet.end())
540      event.getByLabel (electrons_, electrons);
541  
542 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "events") != objectsToGet.end())
542 >  if (find(objectsToGet.begin(), objectsToGet.end(), "events") != objectsToGet.end())
543      event.getByLabel (events_, events);
544  
545 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "taus") != objectsToGet.end())
545 >  if (find(objectsToGet.begin(), objectsToGet.end(), "taus") != objectsToGet.end())
546      event.getByLabel (taus_, taus);
547  
548 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "mets") != objectsToGet.end())
548 >  if (find(objectsToGet.begin(), objectsToGet.end(), "mets") != objectsToGet.end())
549      event.getByLabel (mets_, mets);
550  
551 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "tracks") != objectsToGet.end())
551 >  if (find(objectsToGet.begin(), objectsToGet.end(), "tracks") != objectsToGet.end())
552      event.getByLabel (tracks_, tracks);
553  
554 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "genjets") != objectsToGet.end())
554 >  if (find(objectsToGet.begin(), objectsToGet.end(), "genjets") != objectsToGet.end())
555      event.getByLabel (genjets_, genjets);
556  
557 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "mcparticles") != objectsToGet.end())
558 <        event.getByLabel (mcparticles_, mcparticles);
440 <    
557 >  if (find(objectsToGet.begin(), objectsToGet.end(), "mcparticles") != objectsToGet.end())
558 >    event.getByLabel (mcparticles_, mcparticles);
559  
560 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "primaryvertexs") != objectsToGet.end())
560 >  if (find(objectsToGet.begin(), objectsToGet.end(), "primaryvertexs") != objectsToGet.end())
561      event.getByLabel (primaryvertexs_, primaryvertexs);
562  
563 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "bxlumis") != objectsToGet.end())
563 >  if (find(objectsToGet.begin(), objectsToGet.end(), "bxlumis") != objectsToGet.end())
564      event.getByLabel (bxlumis_, bxlumis);
565  
566 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "photons") != objectsToGet.end())
566 >  if (find(objectsToGet.begin(), objectsToGet.end(), "photons") != objectsToGet.end())
567      event.getByLabel (photons_, photons);
568  
569 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "superclusters") != objectsToGet.end())
569 >  if (find(objectsToGet.begin(), objectsToGet.end(), "superclusters") != objectsToGet.end())
570      event.getByLabel (superclusters_, superclusters);
571  
572 +  if (datasetType_ == "signalMC"){
573 +    if (find(objectsToGet.begin(), objectsToGet.end(), "stops") != objectsToGet.end())
574 +      event.getByLabel (stops_, stops);
575 +  }
576  
577 <  //get pile-up event weight
578 <  double puScaleFactor = 1.00;
579 <  //  if(datasetType_ != "data"){
580 <  // puScaleFactor = puWeight_->at (events->at (0).numTruePV);
581 <    //    cout << puScaleFactor << endl;
582 <  //}
583 <
577 >  if (useTrackCaloRhoCorr_) {
578 >    // Used only for pile-up correction of by-hand calculation of isolation energy.
579 >    // This rho collection is not available in all BEANs.
580 >    // For description of rho values for different jet reconstruction algorithms, see
581 >    // https://twiki.cern.ch/twiki/bin/view/CMS/JetAlgorithms#Algorithms
582 >    event.getByLabel ("kt6CaloJets","rho", rhokt6CaloJetsHandle_);
583 >  }
584  
585 +  double scaleFactor = 1.0;
586  
587    //loop over all channels
588  
# Line 467 | Line 590 | OSUAnalysis::analyze (const edm::Event &
590      channel currentChannel = channels.at(currentChannelIndex);
591  
592      flagMap individualFlags;
470 –    flagMap cumulativeFlags;
593      counterMap passingCounter;
594 +    cumulativeFlags.clear ();
595  
596      bool triggerDecision = true;
597      if(currentChannel.triggers.size() != 0){  //triggers specified
# Line 478 | Line 601 | OSUAnalysis::analyze (const edm::Event &
601  
602      //loop over all cuts
603  
481 –
482 –
604      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
605        cut currentCut = currentChannel.cuts.at(currentCutIndex);
606  
607        for(uint currentObjectIndex = 0; currentObjectIndex != objectsToCut.size(); currentObjectIndex++){
608          string currentObject = objectsToCut.at(currentObjectIndex);
609  
610 <        //initialize maps to get ready to set cuts
610 >        //initialize maps to get ready to set cuts
611          individualFlags[currentObject].push_back (vector<bool> ());
612          cumulativeFlags[currentObject].push_back (vector<bool> ());
613  
# Line 494 | Line 615 | OSUAnalysis::analyze (const edm::Event &
615        for(uint currentObjectIndex = 0; currentObjectIndex != objectsToCut.size(); currentObjectIndex++){
616          string currentObject = objectsToCut.at(currentObjectIndex);
617  
618 <        int flagsForPairCutsIndex = max(int(currentCutIndex-1),0);
618 >        int flagsForPairCutsIndex = max(int(currentCutIndex-1),0);
619 >
620  
621          if(currentObject == "jets") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"jets");
622 +
623          else if(currentObject == "muons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"muons");
624 +
625 +        else if(currentObject == "secondary muons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"secondary muons");
626 +        else if(currentObject == "secondary electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"secondary electrons");
627          else if(currentObject == "electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"electrons");
628          else if(currentObject == "events") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,events.product(),"events");
629          else if(currentObject == "taus") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),"taus");
# Line 509 | Line 635 | OSUAnalysis::analyze (const edm::Event &
635          else if(currentObject == "bxlumis") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,bxlumis.product(),"bxlumis");
636          else if(currentObject == "photons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"photons");
637          else if(currentObject == "superclusters") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,superclusters.product(),"superclusters");
638 +        else if(currentObject == "trigobjs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,trigobjs.product(),"trigobjs");
639 +
640  
513 –        
514 –        else if(currentObject == "muon-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
515 –                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
516 –                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
517 –                                                                   "muon-muon pairs");
518 –        else if(currentObject == "electron-electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
519 –                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
520 –                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
521 –                                                                           "electron-electron pairs");
522 –        else if(currentObject == "electron-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),muons.product(), \
523 –                                                                       cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
524 –                                                                       cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
525 –                                                                       "electron-muon pairs");
641  
642 +        else if(currentObject == "muon-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
643 +                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
644 +                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
645 +                                                                   "muon-muon pairs");
646 +
647 +        else if(currentObject == "muon-secondary muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
648 +                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
649 +                                                                   cumulativeFlags.at("secondary muons").at(flagsForPairCutsIndex), \
650 +                                                                   "muon-secondary muon pairs");
651 +
652 +        else if(currentObject == "electron-secondary electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
653 +                                                                   cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
654 +                                                                   cumulativeFlags.at("secondary electrons").at(flagsForPairCutsIndex), \
655 +                                                                   "electron-secondary electron pairs");
656 +
657 +        else if(currentObject == "electron-electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
658 +                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
659 +                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
660 +                                                                           "electron-electron pairs");
661 +        else if(currentObject == "electron-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),muons.product(), \
662 +                                                                       cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
663 +                                                                       cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
664 +                                                                       "electron-muon pairs");
665 +        else if(currentObject == "jet-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), \
666 +                                                                           cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
667 +                                                                           cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
668 +                                                                           "jet-jet pairs");
669 +        else if(currentObject == "electron-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), \
670 +                                                                       cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
671 +                                                                       cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
672 +                                                                       "electron-jet pairs");
673 +        else if(currentObject == "muon-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), \
674 +                                                                       cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
675 +                                                                       cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
676 +                                                                       "muon-jet pairs");
677 +        else if(currentObject == "track-event pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(),
678 +                                                                     cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
679 +                                                                     cumulativeFlags.at("events").at(flagsForPairCutsIndex),
680 +                                                                     "track-event pairs");
681 +        else if(currentObject == "electron-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),
682 +                                                                        cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
683 +                                                                        cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
684 +                                                                        "electron-track pairs");
685 +        else if(currentObject == "muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),
686 +                                                                    cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
687 +                                                                    cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
688 +                                                                    "muon-track pairs");
689 +        else if(currentObject == "muon-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),
690 +                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
691 +                                                                  cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
692 +                                                                  "muon-tau pairs");
693 +        else if(currentObject == "tau-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),
694 +                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
695 +                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
696 +                                                                 "tau-tau pairs");
697 +        else if(currentObject == "tau-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),
698 +                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
699 +                                                                 cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
700 +                                                                 "tau-track pairs");
701 +        else if(currentObject == "electron-trigobj pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),trigobjs.product(),
702 +                                                                          cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
703 +                                                                          cumulativeFlags.at("trigobjs").at(flagsForPairCutsIndex),
704 +                                                                          "electron-trigobj pairs");
705 +        else if(currentObject == "muon-trigobj pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),trigobjs.product(),
706 +                                                                      cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
707 +                                                                      cumulativeFlags.at("trigobjs").at(flagsForPairCutsIndex),
708 +                                                                      "muon-trigobj pairs");
709  
710 +        if(currentObject == "stops" && datasetType_ == "signalMC") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,stops.product(),"stops");
711        }
712  
713  
# Line 540 | Line 723 | OSUAnalysis::analyze (const edm::Event &
723      eventPassedAllCuts = eventPassedAllCuts && triggerDecision;
724  
725  
543 –
726      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
727  
728        //loop over all objects and count how many passed the cumulative selection up to this point
# Line 548 | Line 730 | OSUAnalysis::analyze (const edm::Event &
730        int numberPassing = 0;
731  
732        for (uint object = 0; object != cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).size() ; object++){
733 <          if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object)) numberPassing++;
733 >        if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object)) numberPassing++;
734        }
553 –
735        bool cutDecision = evaluateComparison(numberPassing,currentCut.eventComparativeOperator,currentCut.numberRequired);
736        cutFlows_.at(currentChannelIndex)->at (currentCut.name) = cutDecision;
556 –
737        eventPassedAllCuts = eventPassedAllCuts && cutDecision;
738  
739      }
740  
741 <    cutFlows_.at(currentChannelIndex)->fillCutFlow(puScaleFactor);
741 >  //get pile-up event weight
742 >  if (datasetType_ != "data"){
743 >    if(doPileupReweighting_) scaleFactor *= puWeight_->at (events->at (0).numTruePV);
744 >    if(applyLeptonSF_){
745 >      if (chosenMuon ()) scaleFactor *= muonSFWeight_->at (chosenMuon ()->eta);
746 >      if (chosenElectron ()) scaleFactor *= electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
747 >    }
748 >  }
749  
750 +  stopCTauScaleFactor_ = 1.0;
751 +  if (datasetType_ == "signalMC" && regex_match (dataset_, regex ("stop.*to.*_.*mm.*")))
752 +    stopCTauScaleFactor_ = stopCTauWeight_->at (event);
753 +  scaleFactor *= stopCTauScaleFactor_;
754  
755 +    cutFlows_.at(currentChannelIndex)->fillCutFlow(scaleFactor);
756  
757      if(!eventPassedAllCuts)continue;
758  
759 <
760 <    
761 <
762 <    //set position of primary vertex in event, in order to calculate quantities relative to it
763 <    if(std::find(objectsToCut.begin(), objectsToCut.end(), "primaryvertexs") != objectsToCut.end()) {
764 <      vector<bool> vertexFlags = cumulativeFlags.at("primaryvertexs").back();
765 <      for (uint vertexIndex = 0; vertexIndex != vertexFlags.size(); vertexIndex++){
574 <        if(!vertexFlags.at(vertexIndex)) continue;
575 <        chosenPrimaryVertex = & primaryvertexs->at(vertexIndex);
576 <        break;
577 <      }
578 <    }
579 <    else {
580 <      chosenPrimaryVertex = & primaryvertexs->at(0);
759 >    if (printEventInfo_) {
760 >      // Write information about event to screen, for testing purposes.
761 >      cout << "Event passed all cuts in channel " <<  currentChannel.name
762 >           << ": run="  << events->at(0).run
763 >           << "  lumi=" << events->at(0).lumi
764 >           << "  event=" << events->at(0).evt
765 >           << endl;
766      }
767  
583 –
584 –
768      //filling histograms
769      for (uint histogramIndex = 0; histogramIndex != histograms.size(); histogramIndex++){
770        histogram currentHistogram = histograms.at(histogramIndex);
771  
772        if(currentHistogram.inputVariables.size() == 1){
773 <        TH1D* histo;
774 <        histo = oneDHists_.at(currentChannelIndex).at(currentHistogram.name);
592 <
773 >        TH1D* histo;
774 >        histo = oneDHists_.at(currentChannelIndex).at(currentHistogram.name);
775  
776 <
777 <        if(currentHistogram.inputCollection == "jets") fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").back(),puScaleFactor);
778 <        else if(currentHistogram.inputCollection == "muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),puScaleFactor);
779 <        else if(currentHistogram.inputCollection == "muon-muon pairs")
780 <          {
781 <            fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
782 <                            cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
783 <                            
784 <                            cumulativeFlags.at("muon-muon pairs").back(),puScaleFactor);
785 <
786 <          }
787 <        else if(currentHistogram.inputCollection == "electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").back(),puScaleFactor);
788 <        else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),\
789 <                                                                                               cumulativeFlags.at("electrons").back(),cumulativeFlags.at("electrons").back(),\
790 <                                                                                               cumulativeFlags.at("electron-electron pairs").back(),puScaleFactor);
791 <        else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(), \
792 <                                                                                              cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(),
793 <                                                                                              cumulativeFlags.at("electron-muon pairs").back(),puScaleFactor);
794 <        else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),puScaleFactor);
795 <        else if(currentHistogram.inputCollection == "taus") fill1DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),puScaleFactor);
796 <        else if(currentHistogram.inputCollection == "mets") fill1DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").back(),puScaleFactor);
797 <        else if(currentHistogram.inputCollection == "tracks") fill1DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").back(),puScaleFactor);
798 <        else if(currentHistogram.inputCollection == "genjets") fill1DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").back(),puScaleFactor);
799 <        else if(currentHistogram.inputCollection == "mcparticles") fill1DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").back(),puScaleFactor);
800 <        else if(currentHistogram.inputCollection == "primaryvertexs") fill1DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").back(),puScaleFactor);
801 <        else if(currentHistogram.inputCollection == "bxlumis") fill1DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),puScaleFactor);
802 <        else if(currentHistogram.inputCollection == "photons") fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),puScaleFactor);
803 <        else if(currentHistogram.inputCollection == "superclusters") fill1DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),puScaleFactor);
776 >        if(currentHistogram.inputCollection == "jets") fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").back(),scaleFactor);
777 >        else if(currentHistogram.inputCollection == "muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),scaleFactor);
778 >        else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").back(),scaleFactor);
779 >        else if(currentHistogram.inputCollection == "secondary electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").back(),scaleFactor);
780 >        else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
781 >                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
782 >                                                                                       cumulativeFlags.at("muon-muon pairs").back(),scaleFactor);
783 >        else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
784 >                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("secondary muons").back(), \
785 >                                                                                       cumulativeFlags.at("muon-secondary muon pairs").back(),scaleFactor);
786 >        else if(currentHistogram.inputCollection == "electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").back(),scaleFactor);
787 >        else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),\
788 >                                                                                               cumulativeFlags.at("electrons").back(),cumulativeFlags.at("electrons").back(),\
789 >                                                                                               cumulativeFlags.at("electron-electron pairs").back(),scaleFactor);
790 >        else if(currentHistogram.inputCollection == "jet-jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),\
791 >                                                                                               cumulativeFlags.at("jets").back(),cumulativeFlags.at("jets").back(),\
792 >                                                                                               cumulativeFlags.at("jet-jet pairs").back(),scaleFactor);
793 >        else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
794 >                                                                                       cumulativeFlags.at("electrons").back(),cumulativeFlags.at("secondary electrons").back(), \
795 >                                                                                       cumulativeFlags.at("electron-secondary electron pairs").back(),scaleFactor);
796 >        else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(), \
797 >                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(),
798 >                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
799 >        else if(currentHistogram.inputCollection == "electron-jet pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),jets.product(), \
800 >                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("jets").back(),
801 >                                                                                           cumulativeFlags.at("electron-jet pairs").back(),scaleFactor);
802 >        else if(currentHistogram.inputCollection == "muon-jet pairs") fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(), \
803 >                                                                                           cumulativeFlags.at("muons").back(),cumulativeFlags.at("jets").back(),
804 >                                                                                           cumulativeFlags.at("muon-jet pairs").back(),scaleFactor);
805 >        else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),
806 >                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),
807 >                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);
808 >        else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),
809 >                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),
810 >                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);
811 >        else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),
812 >                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),
813 >                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);
814 >        else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),
815 >                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),
816 >                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);
817 >        else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
818 >                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("tracks").back(),
819 >                                                                                     cumulativeFlags.at("tau-track pairs").back(),scaleFactor);
820 >        else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),trigobjs.product(),
821 >                                                                                              cumulativeFlags.at("electrons").back(),cumulativeFlags.at("trigobjs").back(),
822 >                                                                                              cumulativeFlags.at("electron-trigobj pairs").back(),scaleFactor);
823 >        else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill1DHistogram(histo,currentHistogram, muons.product(),trigobjs.product(),
824 >                                                                                          cumulativeFlags.at("muons").back(),cumulativeFlags.at("trigobjs").back(),
825 >                                                                                          cumulativeFlags.at("muon-trigobj pairs").back(),scaleFactor);
826 >
827 >        else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),scaleFactor);
828 >        else if(currentHistogram.inputCollection == "taus") fill1DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),scaleFactor);
829 >        else if(currentHistogram.inputCollection == "mets") fill1DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").back(),scaleFactor);
830 >        else if(currentHistogram.inputCollection == "tracks") fill1DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").back(),scaleFactor);
831 >        else if(currentHistogram.inputCollection == "genjets") fill1DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").back(),scaleFactor);
832 >        else if(currentHistogram.inputCollection == "mcparticles") fill1DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").back(),scaleFactor);
833 >        else if(currentHistogram.inputCollection == "primaryvertexs") fill1DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").back(),scaleFactor);
834 >        else if(currentHistogram.inputCollection == "bxlumis") fill1DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),scaleFactor);
835 >        else if(currentHistogram.inputCollection == "photons") fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),scaleFactor);
836 >        else if(currentHistogram.inputCollection == "superclusters") fill1DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),scaleFactor);
837 >        else if(currentHistogram.inputCollection == "trigobjs") fill1DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").back(),scaleFactor);
838 >        else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill1DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").back(),scaleFactor);
839        }
840        else if(currentHistogram.inputVariables.size() == 2){
841 <        TH2D* histo;
842 <        histo = twoDHists_.at(currentChannelIndex).at(currentHistogram.name);
841 >        TH2D* histo;
842 >        histo = twoDHists_.at(currentChannelIndex).at(currentHistogram.name);
843  
844 +        if(currentHistogram.inputCollection == "jets") fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").back(),scaleFactor);
845 +        else if(currentHistogram.inputCollection == "muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),scaleFactor);
846 +        else if(currentHistogram.inputCollection == "secondary muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").back(),scaleFactor);
847 +        else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
848 +                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
849 +                                                                                       cumulativeFlags.at("muon-muon pairs").back(),scaleFactor);
850 +        else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
851 +                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("secondary muons").back(), \
852 +                                                                                       cumulativeFlags.at("muon-secondary muon pairs").back(),scaleFactor);
853 +        else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").back(),scaleFactor);
854 +        else if(currentHistogram.inputCollection == "secondary electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").back(),scaleFactor);
855 +        else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
856 +                                                                                               cumulativeFlags.at("electrons").back(),cumulativeFlags.at("electrons").back(), \
857 +                                                                                               cumulativeFlags.at("electron-electron pairs").back(),scaleFactor);
858 +        else if(currentHistogram.inputCollection == "jet-jet pairs") fill2DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
859 +                                                                                               cumulativeFlags.at("jets").back(),cumulativeFlags.at("jets").back(), \
860 +                                                                                               cumulativeFlags.at("jet-jet pairs").back(),scaleFactor);
861 +        else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
862 +                                                                                       cumulativeFlags.at("electrons").back(),cumulativeFlags.at("secondary electrons").back(), \
863 +                                                                                       cumulativeFlags.at("electron-secondary electron pairs").back(),scaleFactor);
864 +        else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(), \
865 +                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(), \
866 +                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
867 +        else if(currentHistogram.inputCollection == "electron-jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
868 +                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("jets").back(), \
869 +                                                                                           cumulativeFlags.at("electron-jet pairs").back(),scaleFactor);
870 +        else if(currentHistogram.inputCollection == "muon-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
871 +                                                                                           cumulativeFlags.at("muons").back(),cumulativeFlags.at("jets").back(), \
872 +                                                                                           cumulativeFlags.at("muon-jet pairs").back(),scaleFactor);
873 +        else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),
874 +                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),
875 +                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);
876 +        else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),
877 +                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),
878 +                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);
879 +        else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),
880 +                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),
881 +                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);
882 +        else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),
883 +                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),
884 +                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);
885 +        else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
886 +                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("tracks").back(),
887 +                                                                                     cumulativeFlags.at("tau-track pairs").back(),scaleFactor);
888 +        else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),trigobjs.product(),
889 +                                                                                              cumulativeFlags.at("electrons").back(),cumulativeFlags.at("trigobjs").back(),
890 +                                                                                              cumulativeFlags.at("electron-trigobj pairs").back(),scaleFactor);
891 +        else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill2DHistogram(histo,currentHistogram,muons.product(),trigobjs.product(),
892 +                                                                                          cumulativeFlags.at("muons").back(),cumulativeFlags.at("trigobjs").back(),
893 +                                                                                          cumulativeFlags.at("muon-trigobj pairs").back(),scaleFactor);
894 +        else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),scaleFactor);
895 +        else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),scaleFactor);
896 +        else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").back(),scaleFactor);
897 +        else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").back(),scaleFactor);
898 +        else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
899 +                                                                                         cumulativeFlags.at("tracks").back(),cumulativeFlags.at("events").back(),
900 +                                                                                         cumulativeFlags.at("track-event pairs").back(),scaleFactor);
901 +        else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").back(),scaleFactor);
902 +        else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").back(),scaleFactor);
903 +        else if(currentHistogram.inputCollection == "primaryvertexs") fill2DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").back(),scaleFactor);
904 +        else if(currentHistogram.inputCollection == "bxlumis") fill2DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),scaleFactor);
905 +        else if(currentHistogram.inputCollection == "photons") fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),scaleFactor);
906 +        else if(currentHistogram.inputCollection == "superclusters") fill2DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),scaleFactor);
907 +        else if(currentHistogram.inputCollection == "trigobjs") fill2DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").back(),scaleFactor);
908 +        else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill2DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").back(),scaleFactor);
909 +      }
910 +    }
911  
912  
629 –        if(currentHistogram.inputCollection == "jets") fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").back(),puScaleFactor);
630 –        else if(currentHistogram.inputCollection == "muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),puScaleFactor);
631 –        else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
632 –                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
633 –                                                                                       cumulativeFlags.at("muon-muon pairs").back(),puScaleFactor);
634 –        else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").back(),puScaleFactor);
635 –        else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
636 –                                                                                               cumulativeFlags.at("electrons").back(),cumulativeFlags.at("electrons").back(), \
637 –                                                                                               cumulativeFlags.at("electron-electron pairs").back(),puScaleFactor);
638 –        else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(), \
639 –                                                                                               cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(), \
640 –                                                                                               cumulativeFlags.at("electron-muon pairs").back(),puScaleFactor);
641 –        else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),puScaleFactor);
642 –        else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),puScaleFactor);
643 –        else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").back(),puScaleFactor);
644 –        else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").back(),puScaleFactor);
645 –        else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").back(),puScaleFactor);
646 –        else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").back(),puScaleFactor);
647 –        else if(currentHistogram.inputCollection == "primaryvertexs") fill2DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").back(),puScaleFactor);
648 –        else if(currentHistogram.inputCollection == "bxlumis") fill2DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),puScaleFactor);
649 –        else if(currentHistogram.inputCollection == "photons") fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),puScaleFactor);
650 –        else if(currentHistogram.inputCollection == "superclusters") fill2DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),puScaleFactor);
651 –      }
652 –    }
913  
914      //fills histograms with the sizes of collections
915      for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
916 +
917        string currentObject = objectsToPlot.at(currentObjectIndex);
918  
919        string objectToPlot = "";
920  
921 <      if(currentObject == "muon-muon pairs") objectToPlot = "dimuonPairs";
922 <      else if(currentObject == "electron-electron pairs") objectToPlot = "dielectronPairs";
923 <      else if(currentObject == "electron-muon pairs") objectToPlot = "electronMuonPairs";
921 >      // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().
922 >      if(currentObject == "muon-muon pairs")                         objectToPlot = "dimuonPairs";
923 >      else if(currentObject == "electron-electron pairs")            objectToPlot = "dielectronPairs";
924 >      else if(currentObject == "electron-muon pairs")                objectToPlot = "electronMuonPairs";
925 >      else if(currentObject == "electron-jet pairs")                 objectToPlot = "electronJetPairs";
926 >      else if(currentObject == "muon-jet pairs")                     objectToPlot = "muonJetPairs";
927 >      else if(currentObject == "jet-jet pairs")            objectToPlot = "dijetPairs";
928 >      else if(currentObject == "electron-track pairs")               objectToPlot = "electronTrackPairs";
929 >      else if(currentObject == "muon-track pairs")                   objectToPlot = "muonTrackPairs";
930 >      else if(currentObject == "muon-tau pairs")                     objectToPlot = "muonTauPairs";
931 >      else if(currentObject == "tau-tau pairs")                      objectToPlot = "ditauPairs";
932 >      else if(currentObject == "tau-track pairs")                    objectToPlot = "tauTrackPairs";
933 >      else if(currentObject == "track-event pairs")                  objectToPlot = "trackEventPairs";
934 >      else if(currentObject == "muon-secondary muon pairs")          objectToPlot = "muonSecondaryMuonPairs";
935 >      else if(currentObject == "secondary muons")                    objectToPlot = "secondaryMuons";
936 >      else if(currentObject == "electron-secondary electron pairs")  objectToPlot = "electronSecondaryElectronPairs";
937 >      else if(currentObject == "secondary electrons")                objectToPlot = "secondaryElectrons";
938 >      else if(currentObject == "electron-trigobj pairs")             objectToPlot = "electronTrigobjPairs";
939 >      else if(currentObject == "muon-trigobj pairs")                 objectToPlot = "muonTrigobjPairs";
940        else objectToPlot = currentObject;
941 +
942        string tempCurrentObject = objectToPlot;
943        tempCurrentObject.at(0) = toupper(tempCurrentObject.at(0));
944        string histoName = "num" + tempCurrentObject;
945  
668 –
669 –
670 –
946        //set position of primary vertex in event, in order to calculate quantities relative to it
947 <      if(std::find(objectsToCut.begin(), objectsToCut.end(), currentObject) != objectsToCut.end()) {
948 <        vector<bool> lastCutFlags = cumulativeFlags.at(currentObject).back();
949 <        int numToPlot = 0;
950 <        for (uint currentFlag = 0; currentFlag != lastCutFlags.size(); currentFlag++){
951 <          if(lastCutFlags.at(currentFlag)) numToPlot++;
952 <        }
953 <        if(objectToPlot == "primaryvertexs"){
954 <          oneDHists_.at(currentChannelIndex).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
955 <          oneDHists_.at(currentChannelIndex).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),puScaleFactor);
956 <        }
957 <        else
958 <          oneDHists_.at(currentChannelIndex).at(histoName)->Fill(numToPlot,puScaleFactor);        
959 <      }
960 <      else if(objectToPlot == "jets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(jets->size(),puScaleFactor);
961 <      else if(objectToPlot == "muons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size(),puScaleFactor);
962 <      else if(objectToPlot == "dimuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*(muons->size()-1)/2,puScaleFactor);
963 <      else if(objectToPlot == "electrons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size(),puScaleFactor);
964 <      else if(objectToPlot == "dielectronPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*(electrons->size()-1)/2,puScaleFactor);
965 <      else if(objectToPlot == "electronMuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*muons->size(),puScaleFactor);
966 <      else if(objectToPlot == "events") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(events->size(),puScaleFactor);
967 <      else if(objectToPlot == "taus") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(taus->size(),puScaleFactor);
968 <      else if(objectToPlot == "mets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(mets->size(),puScaleFactor);
969 <      else if(objectToPlot == "tracks") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(tracks->size(),puScaleFactor);
970 <      else if(objectToPlot == "genjets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(genjets->size(),puScaleFactor);
971 <      else if(objectToPlot == "mcparticles") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(mcparticles->size(),puScaleFactor);
972 <      else if(objectToPlot == "bxlumis") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(bxlumis->size(),puScaleFactor);
973 <      else if(objectToPlot == "photons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(photons->size(),puScaleFactor);
974 <      else if(objectToPlot == "superclusters") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(superclusters->size(),puScaleFactor);
947 >      if(find(objectsToCut.begin(), objectsToCut.end(), currentObject) != objectsToCut.end()) {
948 >        vector<bool> lastCutFlags = cumulativeFlags.at(currentObject).back();
949 >        int numToPlot = 0;
950 >        for (uint currentFlag = 0; currentFlag != lastCutFlags.size(); currentFlag++){
951 >          if(lastCutFlags.at(currentFlag)) numToPlot++;
952 >        }
953 >        if(objectToPlot == "primaryvertexs"){
954 >          oneDHists_.at(currentChannelIndex).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
955 >          oneDHists_.at(currentChannelIndex).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
956 >        }
957 >        else {
958 >          oneDHists_.at(currentChannelIndex).at(histoName)->Fill(numToPlot,scaleFactor);
959 >        }
960 >      }
961 >      else if(objectToPlot == "jets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(jets->size(),scaleFactor);
962 >      else if(objectToPlot == "muons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size(),scaleFactor);
963 >      else if(objectToPlot == "secondaryMuons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size(),scaleFactor);
964 >      else if(objectToPlot == "dimuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*(muons->size()-1)/2,scaleFactor);
965 >      else if(objectToPlot == "muonSecondaryMuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*(muons->size()-1)/2,scaleFactor);
966 >      else if(objectToPlot == "electrons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size(),scaleFactor);
967 >      else if(objectToPlot == "secondaryElectrons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size(),scaleFactor);
968 >      else if(objectToPlot == "dielectronPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*(electrons->size()-1)/2,scaleFactor);
969 >      else if(objectToPlot == "electronSecondaryElectronPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*(electrons->size()-1)/2,scaleFactor);
970 >      else if(objectToPlot == "electronMuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*muons->size(),scaleFactor);
971 >      else if(objectToPlot == "electronJetPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*jets->size(),scaleFactor);
972 >      else if(objectToPlot == "muonJetPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*jets->size(),scaleFactor);
973 >      else if(objectToPlot == "electronTrackPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*tracks->size(),scaleFactor);
974 >      else if(objectToPlot == "electronTrigobjPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*trigobjs->size(),scaleFactor);
975 >      else if(objectToPlot == "muonTrigobjPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*trigobjs->size(),scaleFactor);
976 >      else if(objectToPlot == "events") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(events->size(),scaleFactor);
977 >      else if(objectToPlot == "taus") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(taus->size(),scaleFactor);
978 >      else if(objectToPlot == "mets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(mets->size(),scaleFactor);
979 >      else if(objectToPlot == "tracks") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(tracks->size(),scaleFactor);
980 >      else if(objectToPlot == "genjets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(genjets->size(),scaleFactor);
981 >      else if(objectToPlot == "mcparticles") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(mcparticles->size(),scaleFactor);
982 >      else if(objectToPlot == "bxlumis") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(bxlumis->size(),scaleFactor);
983 >      else if(objectToPlot == "photons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(photons->size(),scaleFactor);
984 >      else if(objectToPlot == "superclusters") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(superclusters->size(),scaleFactor);
985 >      else if(objectToPlot == "trigobjs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(trigobjs->size(),scaleFactor);
986        else if(objectToPlot == "primaryvertexs"){
987 <        oneDHists_.at(currentChannelIndex).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
988 <        oneDHists_.at(currentChannelIndex).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),puScaleFactor);
987 >        oneDHists_.at(currentChannelIndex).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
988 >        oneDHists_.at(currentChannelIndex).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
989        }
990 +      if(objectToPlot == "stops" && datasetType_ == "signalMC") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(stops->size(),scaleFactor);
991  
992 <    }
992 >    } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++)
993  
994 +  } //end loop over channel
995  
996 +  masterCutFlow_->fillCutFlow(scaleFactor);
997  
998 + } // end void OSUAnalysis::analyze (const edm::Event &event, const edm::EventSetup &setup)
999  
710 –  } //end loop over channel
1000  
712 –  masterCutFlow_->fillCutFlow(puScaleFactor);
1001  
1002 + bool
1003 + OSUAnalysis::evaluateComparison (double testValue, string comparison, double cutValue){
1004  
1005  
1006 < }
1006 >  if(comparison == ">")       return testValue >  cutValue;
1007 >  else if(comparison == ">=") return testValue >= cutValue;
1008 >  else if(comparison == "<")  return testValue <  cutValue;
1009 >  else if(comparison == "<=") return testValue <= cutValue;
1010 >  else if(comparison == "==") return testValue == cutValue;
1011 >  else if(comparison == "=") return testValue == cutValue;
1012 >  else if(comparison == "!=") return testValue != cutValue;
1013 >  else {cout << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1014  
1015 + }
1016  
1017   bool
1018 < OSUAnalysis::evaluateComparison (double testValue, string comparison, double cutValue){
1018 > OSUAnalysis::evaluateComparison (string testValue, string comparison, string cutValue){
1019  
1020  
1021    if(comparison == ">")       return testValue >  cutValue;
# Line 727 | Line 1025 | OSUAnalysis::evaluateComparison (double
1025    else if(comparison == "==") return testValue == cutValue;
1026    else if(comparison == "=") return testValue == cutValue;
1027    else if(comparison == "!=") return testValue != cutValue;
1028 <  else {std::cout << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1028 >  else {cout << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1029  
1030   }
1031  
# Line 741 | Line 1039 | OSUAnalysis::evaluateTriggers (vector<st
1039        if(trigger->pass != 1) continue;
1040        for(uint triggerName = 0; triggerName != triggersToTest.size(); triggerName++)
1041          {
1042 <          if(trigger->name.find(triggersToTest.at(triggerName))!=std::string::npos){
1042 >          if(trigger->name.find(triggersToTest.at(triggerName))!=string::npos){
1043              triggerDecision = true;
1044            }
1045          }
# Line 750 | Line 1048 | OSUAnalysis::evaluateTriggers (vector<st
1048  
1049   }
1050  
1051 < std::vector<std::string>
1051 > vector<string>
1052   OSUAnalysis::splitString (string inputString){
1053  
1054 <  std::stringstream stringStream(inputString);
1055 <  std::istream_iterator<std::string> begin(stringStream);
1056 <  std::istream_iterator<std::string> end;
1057 <  std::vector<std::string> stringVector(begin, end);
1054 >  stringstream stringStream(inputString);
1055 >  istream_iterator<string> begin(stringStream);
1056 >  istream_iterator<string> end;
1057 >  vector<string> stringVector(begin, end);
1058    return stringVector;
1059  
1060   }
1061  
1062 +
1063 + void OSUAnalysis::getTwoObjs(string tempInputCollection, string& obj1, string& obj2) {
1064 +  // Set two object strings from the tempInputCollection string,
1065 +  // For example, if tempInputCollection is "electron-muon pairs",
1066 +  // then obj1 = "electrons" and obj2 = "muons".
1067 +  // Note that the objects have an "s" appended.
1068 +
1069 +  int dashIndex = tempInputCollection.find("-");
1070 +  int spaceIndex = tempInputCollection.find_last_of(" ");
1071 +  int secondWordLength = spaceIndex - dashIndex;
1072 +  obj1 = tempInputCollection.substr(0,dashIndex) + "s";
1073 +  obj2 = tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s";
1074 +
1075 + }
1076 +
1077 +
1078 + string OSUAnalysis::getObjToGet(string obj) {
1079 +  // Return the string corresponding to the object to get for the given obj string.
1080 +  // Right now this only handles the case in which obj contains "secondary",
1081 +  // e.g, "secondary muons".
1082 +  // Note that "s" is NOT appended.
1083 +
1084 +  if (obj.find("secondary")==string::npos) return obj;  // "secondary" is not found
1085 +  int firstSpaceIndex = obj.find_first_of(" ");
1086 +  return obj.substr(firstSpaceIndex+1,obj.length()-1);
1087 +
1088 + }
1089 +
1090 +
1091 + //!jet valueLookup
1092   double
1093 < OSUAnalysis::valueLookup (const BNjet* object, string variable, string function){
1093 > OSUAnalysis::valueLookup (const BNjet* object, string variable, string function, string &stringValue){
1094  
1095    double value = 0.0;
1096    if(variable == "energy") value = object->energy;
# Line 882 | Line 1210 | OSUAnalysis::valueLookup (const BNjet* o
1210    else if(variable == "puJetId_loose_cutbased") value = object->puJetId_loose_cutbased;
1211  
1212  
1213 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1213 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1214  
1215    value = applyFunction(function, value);
1216  
# Line 890 | Line 1218 | OSUAnalysis::valueLookup (const BNjet* o
1218   }
1219  
1220  
1221 <
1221 > //!muon valueLookup
1222   double
1223 < OSUAnalysis::valueLookup (const BNmuon* object, string variable, string function){
1223 > OSUAnalysis::valueLookup (const BNmuon* object, string variable, string function, string &stringValue){
1224  
1225    double value = 0.0;
1226    if(variable == "energy") value = object->energy;
# Line 1047 | Line 1375 | OSUAnalysis::valueLookup (const BNmuon*
1375    else if(variable == "time_ndof") value = object->time_ndof;
1376  
1377    //user-defined variables
1378 <  else if(variable == "correctedD0VertexErr") value =  hypot (object->tkD0err, hypot (chosenPrimaryVertex->xError, chosenPrimaryVertex->yError));
1379 <  else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenPrimaryVertex->xError, chosenPrimaryVertex->yError));
1378 >  else if(variable == "correctedD0VertexErr") value =  hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1379 >  else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1380    else if(variable == "detIso") value = (object->trackIsoDR03) / object->pt;
1381 <  else if(variable == "relPFdBetaIso") value = (object->pfIsoR04SumChargedHadronPt + max(0.0, object->pfIsoR04SumNeutralHadronEt + object->pfIsoR04SumPhotonEt - 0.5*object->pfIsoR04SumPUPt)) / object->pt;
1381 >  else if(variable == "relPFdBetaIso") value = (object->pfIsoR04SumChargedHadronPt + max(0.0, object->pfIsoR04SumNeutralHadronEt + object->pfIsoR04SumPhotonEt - 0.5*object->pfIsoR04SumPUPt)) / object->pt;
1382    else if(variable == "relPFrhoIso") value = ( object->chargedHadronIso + max(0.0, object->neutralHadronIso + object->photonIso - object->AEffDr03*object->rhoPrime) ) / object->pt;
1383 +  else if(variable == "metMT") {
1384 +    const BNmet *met = chosenMET ();
1385 +    if (met)
1386 +      {
1387 +        TLorentzVector p1 (object->px, object->py, object->pz, object->energy),
1388 +          p2 (met->px, met->py, 0.0, met->pt);
1389 +
1390 +        value = (p1 + p2).Mt ();
1391 +      }
1392 +    else
1393 +      value = -999;
1394 +  }
1395  
1396  
1397  
# Line 1162 | Line 1502 | OSUAnalysis::valueLookup (const BNmuon*
1502  
1503  
1504    else if(variable == "tightID") {
1505 <    value = object->isGlobalMuon > 0            \
1506 <      && object->isPFMuon > 0                   \
1507 <      && object->normalizedChi2 < 10            \
1508 <      && object->numberOfValidMuonHits > 0      \
1509 <      && object->numberOfMatchedStations > 1    \
1510 <      && fabs(object->correctedD0Vertex) < 0.2  \
1511 <      && fabs(object->correctedDZ) < 0.5        \
1512 <      && object->numberOfValidPixelHits > 0             \
1505 >    value = object->isGlobalMuon > 0                \
1506 >      && object->isPFMuon > 0                        \
1507 >      && object->normalizedChi2 < 10                \
1508 >                                  && object->numberOfValidMuonHits > 0        \
1509 >      && object->numberOfMatchedStations > 1        \
1510 >      && fabs(object->correctedD0Vertex) < 0.2        \
1511 >      && fabs(object->correctedDZ) < 0.5        \
1512 >      && object->numberOfValidPixelHits > 0                \
1513        && object->numberOfLayersWithMeasurement > 5;
1514    }
1515    else if(variable == "tightIDdisplaced"){
1516 <    value = object->isGlobalMuon > 0            \
1517 <      && object->normalizedChi2 < 10            \
1518 <      && object->numberOfValidMuonHits > 0      \
1519 <      && object->numberOfMatchedStations > 1    \
1520 <      && object->numberOfValidPixelHits > 0     \
1516 >    value = object->isGlobalMuon > 0                \
1517 >      && object->normalizedChi2 < 10                \
1518 >                                  && object->numberOfValidMuonHits > 0        \
1519 >      && object->numberOfMatchedStations > 1        \
1520 >      && object->numberOfValidPixelHits > 0        \
1521        && object->numberOfLayersWithMeasurement > 5;
1522    }
1523  
1524 +  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
1525  
1526 +  else if(variable == "genMatchedPdgId"){
1527 +    int index = getGenMatchedParticleIndex(object);
1528 +    if(index == -1) value = 0;
1529 +    else value = mcparticles->at(index).id;
1530 +  }
1531  
1532    else if(variable == "genMatchedId"){
1533      int index = getGenMatchedParticleIndex(object);
# Line 1193 | Line 1539 | OSUAnalysis::valueLookup (const BNmuon*
1539      if(index == -1) value = 0;
1540      else value = getPdgIdBinValue(mcparticles->at(index).motherId);
1541    }
1542 +  else if(variable == "genMatchedMotherIdReverse"){
1543 +    int index = getGenMatchedParticleIndex(object);
1544 +    if(index == -1) value = 23;
1545 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).motherId);
1546 +  }
1547    else if(variable == "genMatchedGrandmotherId"){
1548      int index = getGenMatchedParticleIndex(object);
1549      if(index == -1) value = 0;
# Line 1203 | Line 1554 | OSUAnalysis::valueLookup (const BNmuon*
1554      }
1555      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1556    }
1557 +  else if(variable == "genMatchedGrandmotherIdReverse"){
1558 +    int index = getGenMatchedParticleIndex(object);
1559 +    if(index == -1) value = 23;
1560 +    else if(fabs(mcparticles->at(index).motherId) == 15){
1561 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
1562 +      if(motherIndex == -1) value = 23;
1563 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
1564 +    }
1565 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1566 +  }
1567  
1568  
1569  
1570 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1570 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1571  
1572    value = applyFunction(function, value);
1573  
1574    return value;
1575   }
1576  
1577 <
1577 > //!electron valueLookup
1578   double
1579 < OSUAnalysis::valueLookup (const BNelectron* object, string variable, string function){
1579 > OSUAnalysis::valueLookup (const BNelectron* object, string variable, string function, string &stringValue){
1580  
1581    double value = 0.0;
1582    if(variable == "energy") value = object->energy;
# Line 1376 | Line 1737 | OSUAnalysis::valueLookup (const BNelectr
1737    else if(variable == "passConvVeto") value = object->passConvVeto;
1738  
1739    //user-defined variables
1740 <  else if(variable == "correctedD0VertexErr") value =  hypot (object->tkD0err, hypot (chosenPrimaryVertex->xError, chosenPrimaryVertex->yError));
1741 <  else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenPrimaryVertex->xError, chosenPrimaryVertex->yError));
1740 >  else if(variable == "correctedD0VertexErr") value =  hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1741 >  else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1742    else if(variable == "detIso") value = (object->trackIso) / object->pt;
1743    else if(variable == "relPFrhoIso") value = ( object->chargedHadronIsoDR03 + max(0.0, object->neutralHadronIsoDR03 + object->photonIsoDR03 - object->AEffDr03*object->rhoPrime) ) / object->pt;
1744 +  else if(variable == "metMT") {
1745 +    const BNmet *met = chosenMET ();
1746 +    if (met)
1747 +      {
1748 +        TLorentzVector p1 (object->px, object->py, object->pz, object->energy),
1749 +          p2 (met->px, met->py, 0.0, met->pt);
1750  
1751 +        value = (p1 + p2).Mt ();
1752 +      }
1753 +    else
1754 +      value = -999;
1755 +  }
1756  
1757    else if(variable == "correctedD0VertexEEPositiveChargeLowPt"){
1758      if(fabs(object->eta) > 1.479 && object->charge > 0 && object->pt > 45) value = object->correctedD0Vertex;
# Line 1391 | Line 1763 | OSUAnalysis::valueLookup (const BNelectr
1763      else value = -999;
1764    }
1765  
1394 –
1766    else if(variable == "correctedD0VertexInEBPlus"){
1767      if(fabs(object->eta) < 0.8 && object->eta > 0) value = object->correctedD0Vertex;
1768      else value = -999;
# Line 1444 | Line 1815 | OSUAnalysis::valueLookup (const BNelectr
1815      else value = -999;
1816    }
1817  
1818 +  else if(variable == "tightID"){
1819 +    if (object->isEB)
1820 +      {
1821 +        value = fabs(object->delEtaIn) < 0.004 \
1822 +          && fabs (object->delPhiIn) < 0.03 \
1823 +          && object->scSigmaIEtaIEta < 0.01 \
1824 +          && object->hadOverEm < 0.12 \
1825 +          && fabs (object->correctedD0Vertex) < 0.02 \
1826 +          && fabs (object->correctedDZ) < 0.1 \
1827 +          && object->absInvEMinusInvPin < 0.05 \
1828 +          && object->passConvVeto;
1829 +      }
1830 +    else
1831 +      {
1832 +        value = fabs(object->delEtaIn) < 0.005 \
1833 +          && fabs (object->delPhiIn) < 0.02 \
1834 +          && object->scSigmaIEtaIEta < 0.03 \
1835 +          && object->hadOverEm < 0.10 \
1836 +          && fabs (object->correctedD0Vertex) < 0.02 \
1837 +          && fabs (object->correctedDZ) < 0.1 \
1838 +          && object->absInvEMinusInvPin < 0.05 \
1839 +          && object->passConvVeto;
1840 +      }
1841 +  }
1842  
1843    else if(variable == "correctedD0VertexInEBPositiveCharge"){
1844      if(fabs(object->eta) < 0.8 && object->charge > 0) value = object->correctedD0Vertex;
# Line 1501 | Line 1896 | OSUAnalysis::valueLookup (const BNelectr
1896    else if(variable == "tightIDdisplaced"){
1897      if (object->isEB)
1898        {
1899 <        value = fabs(object->delEtaIn) < 0.004 \
1900 <          && fabs (object->delPhiIn) < 0.03 \
1899 >        value = fabs(object->delEtaIn) < 0.004 \
1900 >          && fabs (object->delPhiIn) < 0.03 \
1901            && object->scSigmaIEtaIEta < 0.01 \
1902            && object->hadOverEm < 0.12 \
1903 <          && object->absInvEMinusInvPin < 0.05;
1903 >          && object->absInvEMinusInvPin < 0.05;
1904        }
1905      else
1906        {
1907 <        value = fabs (object->delEtaIn) < 0.005 \
1908 <          && fabs (object->delPhiIn) < 0.02 \
1907 >        value = fabs (object->delEtaIn) < 0.005 \
1908 >          && fabs (object->delPhiIn) < 0.02 \
1909            && object->scSigmaIEtaIEta < 0.03 \
1910            && object->hadOverEm < 0.10 \
1911 <          && object->absInvEMinusInvPin < 0.05;
1911 >          && object->absInvEMinusInvPin < 0.05;
1912        }
1913    }
1914  
1915 +
1916 +  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
1917 +
1918 +  else if(variable == "genMatchedPdgId"){
1919 +    int index = getGenMatchedParticleIndex(object);
1920 +    if(index == -1) value = 0;
1921 +    else value = mcparticles->at(index).id;
1922 +  }
1923 +
1924 +
1925    else if(variable == "genMatchedId"){
1926      int index = getGenMatchedParticleIndex(object);
1927      if(index == -1) value = 0;
# Line 1527 | Line 1932 | OSUAnalysis::valueLookup (const BNelectr
1932      if(index == -1) value = 0;
1933      else value = getPdgIdBinValue(mcparticles->at(index).motherId);
1934    }
1935 +  else if(variable == "genMatchedMotherIdReverse"){
1936 +    int index = getGenMatchedParticleIndex(object);
1937 +    if(index == -1) value = 23;
1938 +    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
1939 +  }
1940    else if(variable == "genMatchedGrandmotherId"){
1941      int index = getGenMatchedParticleIndex(object);
1942      if(index == -1) value = 0;
# Line 1537 | Line 1947 | OSUAnalysis::valueLookup (const BNelectr
1947      }
1948      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1949    }
1950 +  else if(variable == "genMatchedGrandmotherIdReverse"){
1951 +    int index = getGenMatchedParticleIndex(object);
1952 +    if(index == -1) value = 23;
1953 +    else if(fabs(mcparticles->at(index).motherId) == 15){
1954 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
1955 +      if(motherIndex == -1) value = 23;
1956 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
1957 +    }
1958 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1959 +  }
1960  
1961  
1962  
1963 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1963 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1964  
1965    value = applyFunction(function, value);
1966  
1967    return value;
1968   }
1969  
1970 <
1970 > //!event valueLookup
1971   double
1972 < OSUAnalysis::valueLookup (const BNevent* object, string variable, string function){
1972 > OSUAnalysis::valueLookup (const BNevent* object, string variable, string function, string &stringValue){
1973  
1974    double value = 0.0;
1975  
# Line 1617 | Line 2037 | OSUAnalysis::valueLookup (const BNevent*
2037    else if(variable == "id1") value = object->id1;
2038    else if(variable == "id2") value = object->id2;
2039    else if(variable == "evt") value = object->evt;
2040 +  else if(variable == "puScaleFactor"){
2041 +    if(datasetType_ != "data")
2042 +      value = puWeight_->at (events->at (0).numTruePV);
2043 +    else
2044 +      value = 1.0;
2045 +  }
2046 +  else if(variable == "muonScaleFactor"){
2047 +    if(datasetType_ != "data" && applyLeptonSF_)
2048 +      value = muonSFWeight_->at (chosenMuon ()->eta);
2049 +    else
2050 +      value = 1.0;
2051 +  }
2052 +  else if(variable == "electronScaleFactor"){
2053 +    if(datasetType_ != "data" && applyLeptonSF_)
2054 +      value = electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
2055 +    else
2056 +      value = 1.0;
2057 +  }
2058 +  else if(variable == "stopCTauScaleFactor")
2059 +    value = stopCTauScaleFactor_;
2060  
2061 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2061 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2062  
2063    value = applyFunction(function, value);
2064  
2065    return value;
2066   }
2067  
2068 + //!tau valueLookup
2069   double
2070 < OSUAnalysis::valueLookup (const BNtau* object, string variable, string function){
2070 > OSUAnalysis::valueLookup (const BNtau* object, string variable, string function, string &stringValue){
2071  
2072    double value = 0.0;
2073  
# Line 1671 | Line 2112 | OSUAnalysis::valueLookup (const BNtau* o
2112    else if(variable == "leadingTrackValid") value = object->leadingTrackValid;
2113  
2114  
2115 +
2116 +  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2117 +
2118 +  else if(variable == "genMatchedPdgId"){
2119 +    int index = getGenMatchedParticleIndex(object);
2120 +    if(index == -1) value = 0;
2121 +    else value = mcparticles->at(index).id;
2122 +  }
2123 +
2124    else if(variable == "genMatchedId"){
2125      int index = getGenMatchedParticleIndex(object);
2126      if(index == -1) value = 0;
# Line 1681 | Line 2131 | OSUAnalysis::valueLookup (const BNtau* o
2131      if(index == -1) value = 0;
2132      else value = getPdgIdBinValue(mcparticles->at(index).motherId);
2133    }
2134 +  else if(variable == "genMatchedMotherIdReverse"){
2135 +    int index = getGenMatchedParticleIndex(object);
2136 +    if(index == -1) value = 23;
2137 +    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
2138 +  }
2139    else if(variable == "genMatchedGrandmotherId"){
2140      int index = getGenMatchedParticleIndex(object);
2141      if(index == -1) value = 0;
# Line 1691 | Line 2146 | OSUAnalysis::valueLookup (const BNtau* o
2146      }
2147      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2148    }
2149 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2150 +    int index = getGenMatchedParticleIndex(object);
2151 +    if(index == -1) value = 23;
2152 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2153 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2154 +      if(motherIndex == -1) value = 23;
2155 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2156 +    }
2157 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2158 +  }
2159  
2160  
2161 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2161 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2162  
2163    value = applyFunction(function, value);
2164  
2165    return value;
2166   }
2167  
2168 + //!met valueLookup
2169   double
2170 < OSUAnalysis::valueLookup (const BNmet* object, string variable, string function){
2170 > OSUAnalysis::valueLookup (const BNmet* object, string variable, string function, string &stringValue){
2171  
2172    double value = 0.0;
2173  
# Line 1765 | Line 2231 | OSUAnalysis::valueLookup (const BNmet* o
2231    else if(variable == "pfT1jet10pt") value = object->pfT1jet10pt;
2232    else if(variable == "pfT1jet10phi") value = object->pfT1jet10phi;
2233  
2234 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2234 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2235  
2236    value = applyFunction(function, value);
2237  
2238    return value;
2239   }
2240  
2241 + //!track valueLookup
2242   double
2243 < OSUAnalysis::valueLookup (const BNtrack* object, string variable, string function){
2243 > OSUAnalysis::valueLookup (const BNtrack* object, string variable, string function, string &stringValue){
2244  
2245    double value = 0.0;
2246    double pMag = sqrt(object->pt * object->pt +
2247 <                         object->pz * object->pz);
2248 <  
2247 >                     object->pz * object->pz);
2248 >
2249    if(variable == "pt") value = object->pt;
2250    else if(variable == "px") value = object->px;
2251    else if(variable == "py") value = object->py;
# Line 1798 | Line 2265 | OSUAnalysis::valueLookup (const BNtrack*
2265    else if(variable == "isHighPurity") value = object->isHighPurity;
2266  
2267  
2268 <  //additional BNs info for disappTrks  
1802 <  else if(variable == "isGoodPtResolution") value = object->isGoodPtResolution;
2268 >  //additional BNs info for disappTrks
2269    else if(variable == "caloEMDeltaRp3") value = object->caloEMDeltaRp3;
2270    else if(variable == "caloHadDeltaRp3") value = object->caloHadDeltaRp3;
2271    else if(variable == "caloEMDeltaRp4") value = object->caloEMDeltaRp4;
# Line 1809 | Line 2275 | OSUAnalysis::valueLookup (const BNtrack*
2275    else if(variable == "nHitsMissingOuter") value = object->nHitsMissingOuter;
2276    else if(variable == "nHitsMissingInner") value = object->nHitsMissingInner;
2277    else if(variable == "nHitsMissingMiddle") value = object->nHitsMissingMiddle;
2278 +
2279 +
2280    //user defined variables
2281    else if(variable == "d0wrtBS") value = (object->vx-events->at(0).BSx)*object->py/object->pt - (object->vy-events->at(0).BSy)*object->px/object->pt;
2282    else if(variable == "dZwrtBS") value = object->dZ - events->at(0).BSz;
2283 <  else if(variable == "caloTotDeltaRp5") value =(object->caloHadDeltaRp5 + object->caloEMDeltaRp5);
2284 <  else if(variable == "caloTotDeltaRp5ByP") value =( (object->caloHadDeltaRp5 + object->caloEMDeltaRp5)/pMag);
2285 <  else if(variable == "isIso") value = getTrkIsIso(object, tracks.product());
2286 <  else if(variable == "isMatchedDeadEcal") value = getTrkIsMatchedDeadEcal(object);
2287 <  else if(variable == "ptErrorByPt") value = (object->ptError/object->pt);
2288 <  else if(variable == "ptError") value = object->ptError;
2289 <  else if(variable == "ptRes") value = getTrkPtRes(object);  
2283 >  else if(variable == "caloTotDeltaRp5")            value =  (object->caloHadDeltaRp5 + object->caloEMDeltaRp5);
2284 >  else if(variable == "caloTotDeltaRp5ByP")         value = ((object->caloHadDeltaRp5 + object->caloEMDeltaRp5)/pMag);
2285 >  else if(variable == "caloTotDeltaRp5RhoCorr")     value = getTrkCaloTotRhoCorr(object);
2286 >  else if(variable == "caloTotDeltaRp5ByPRhoCorr")  value = getTrkCaloTotRhoCorr(object) / pMag;
2287 >  else if(variable == "isIso")                      value = getTrkIsIso(object, tracks.product());
2288 >  else if(variable == "isMatchedDeadEcal")          value = getTrkIsMatchedDeadEcal(object);
2289 >  else if(variable == "ptErrorByPt")                value = (object->ptError/object->pt);
2290 >  else if(variable == "ptError")                    value = object->ptError;
2291 >  else if(variable == "ptRes")                      value = getTrkPtRes(object);
2292 >  else if (variable == "d0wrtPV"){
2293 >    double vx = object->vx - chosenVertex ()->x,
2294 >      vy = object->vy - chosenVertex ()->y,
2295 >      px = object->px,
2296 >      py = object->py,
2297 >      pt = object->pt;
2298 >    value = (-vx * py + vy * px) / pt;
2299 >  }
2300 >  else if (variable == "dZwrtPV"){
2301 >    double vx = object->vx - chosenVertex ()->x,
2302 >      vy = object->vy - chosenVertex ()->y,
2303 >      vz = object->vz - chosenVertex ()->z,
2304 >      px = object->px,
2305 >      py = object->py,
2306 >      pz = object->pz,
2307 >      pt = object->pt;
2308 >    value = vz - (vx * px + vy * py)/pt * (pz/pt);
2309 >  }
2310 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2311 >
2312 >  else if(variable == "genMatchedPdgId"){
2313 >    int index = getGenMatchedParticleIndex(object);
2314 >    if(index == -1) value = 0;
2315 >    else value = mcparticles->at(index).id;
2316 >  }
2317  
2318  
2319    else if(variable == "genMatchedId"){
# Line 1831 | Line 2326 | OSUAnalysis::valueLookup (const BNtrack*
2326      if(index == -1) value = 0;
2327      else value = getPdgIdBinValue(mcparticles->at(index).motherId);
2328    }
2329 +  else if(variable == "genMatchedMotherIdReverse"){
2330 +    int index = getGenMatchedParticleIndex(object);
2331 +    if(index == -1) value = 23;
2332 +    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
2333 +  }
2334    else if(variable == "genMatchedGrandmotherId"){
2335      int index = getGenMatchedParticleIndex(object);
2336      if(index == -1) value = 0;
# Line 1841 | Line 2341 | OSUAnalysis::valueLookup (const BNtrack*
2341      }
2342      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2343    }
2344 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2345 +    int index = getGenMatchedParticleIndex(object);
2346 +    if(index == -1) value = 23;
2347 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2348 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2349 +      if(motherIndex == -1) value = 23;
2350 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2351 +    }
2352 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2353 +  }
2354  
2355  
2356  
2357 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2357 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2358  
2359    value = applyFunction(function, value);
2360  
2361    return value;
2362   }
2363  
2364 + //!genjet valueLookup
2365   double
2366 < OSUAnalysis::valueLookup (const BNgenjet* object, string variable, string function){
2366 > OSUAnalysis::valueLookup (const BNgenjet* object, string variable, string function, string &stringValue){
2367  
2368    double value = 0.0;
2369  
# Line 1872 | Line 2383 | OSUAnalysis::valueLookup (const BNgenjet
2383    else if(variable == "charge") value = object->charge;
2384  
2385  
2386 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2386 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2387  
2388    value = applyFunction(function, value);
2389  
2390    return value;
2391   }
2392  
2393 + //!mcparticle valueLookup
2394   double
2395 < OSUAnalysis::valueLookup (const BNmcparticle* object, string variable, string function){
2395 > OSUAnalysis::valueLookup (const BNmcparticle* object, string variable, string function, string &stringValue){
2396  
2397    double value = 0.0;
2398  
# Line 1971 | Line 2483 | OSUAnalysis::valueLookup (const BNmcpart
2483  
2484    //user-defined variables
2485    else if (variable == "d0"){
2486 <    double vx = object->vx - chosenPrimaryVertex->x,
2487 <      vy = object->vy - chosenPrimaryVertex->y,
2486 >    double vx = object->vx - chosenVertex ()->x,
2487 >      vy = object->vy - chosenVertex ()->y,
2488        px = object->px,
2489        py = object->py,
2490        pt = object->pt;
2491      value = (-vx * py + vy * px) / pt;
2492    }
2493    else if (variable == "dz"){
2494 <    double vx = object->vx - chosenPrimaryVertex->x,
2495 <      vy = object->vy - chosenPrimaryVertex->y,
2496 <      vz = object->vz - chosenPrimaryVertex->z,
2494 >    double vx = object->vx - chosenVertex ()->x,
2495 >      vy = object->vy - chosenVertex ()->y,
2496 >      vz = object->vz - chosenVertex ()->z,
2497        px = object->px,
2498        py = object->py,
2499        pz = object->pz,
# Line 1992 | Line 2504 | OSUAnalysis::valueLookup (const BNmcpart
2504      value = sqrt(object->vx*object->vx + object->vy*object->vy);
2505    }
2506    else if(variable == "deltaV0"){
2507 <    value = sqrt((object->vx-chosenPrimaryVertex->x)*(object->vx-chosenPrimaryVertex->x) + (object->vy-chosenPrimaryVertex->y)*(object->vy-chosenPrimaryVertex->y));
2507 >    value = sqrt((object->vx-chosenVertex ()->x)*(object->vx-chosenVertex ()->x) + (object->vy-chosenVertex ()->y)*(object->vy-chosenVertex ()->y));
2508    }
2509    else if (variable == "deltaVx"){
2510 <    value = object->vx - chosenPrimaryVertex->x;
2510 >    value = object->vx - chosenVertex ()->x;
2511    }
2512    else if (variable == "deltaVy"){
2513 <    value = object->vy - chosenPrimaryVertex->y;
2513 >    value = object->vy - chosenVertex ()->y;
2514    }
2515    else if (variable == "deltaVz"){
2516 <    value = object->vz - chosenPrimaryVertex->z;
2516 >    value = object->vz - chosenVertex ()->z;
2517    }
2518  
2519  
2520 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2520 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2521  
2522    value = applyFunction(function, value);
2523  
2524    return value;
2525   }
2526  
2527 + //!primaryvertex valueLookup
2528   double
2529 < OSUAnalysis::valueLookup (const BNprimaryvertex* object, string variable, string function){
2529 > OSUAnalysis::valueLookup (const BNprimaryvertex* object, string variable, string function, string &stringValue){
2530  
2531    double value = 0.0;
2532  
# Line 2032 | Line 2545 | OSUAnalysis::valueLookup (const BNprimar
2545    else if(variable == "isGood") value = object->isGood;
2546  
2547  
2548 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2548 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2549  
2550    value = applyFunction(function, value);
2551  
2552    return value;
2553   }
2554  
2555 + //!bxlumi valueLookup
2556   double
2557 < OSUAnalysis::valueLookup (const BNbxlumi* object, string variable, string function){
2557 > OSUAnalysis::valueLookup (const BNbxlumi* object, string variable, string function, string &stringValue){
2558  
2559    double value = 0.0;
2560  
# Line 2049 | Line 2563 | OSUAnalysis::valueLookup (const BNbxlumi
2563    else if(variable == "bx_LUMI_now") value = object->bx_LUMI_now;
2564  
2565  
2566 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2566 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2567  
2568    value = applyFunction(function, value);
2569  
2570    return value;
2571   }
2572  
2573 + //!photon valueLookup
2574   double
2575 < OSUAnalysis::valueLookup (const BNphoton* object, string variable, string function){
2575 > OSUAnalysis::valueLookup (const BNphoton* object, string variable, string function, string &stringValue){
2576  
2577    double value = 0.0;
2578  
# Line 2132 | Line 2647 | OSUAnalysis::valueLookup (const BNphoton
2647    else if(variable == "seedRecoFlag") value = object->seedRecoFlag;
2648  
2649  
2650 +
2651 +
2652 +  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2653 +
2654 +  else if(variable == "genMatchedPdgId"){
2655 +    int index = getGenMatchedParticleIndex(object);
2656 +    if(index == -1) value = 0;
2657 +    else value = mcparticles->at(index).id;
2658 +  }
2659 +
2660 +
2661 +
2662    else if(variable == "genMatchedId"){
2663      int index = getGenMatchedParticleIndex(object);
2664      if(index == -1) value = 0;
# Line 2142 | Line 2669 | OSUAnalysis::valueLookup (const BNphoton
2669      if(index == -1) value = 0;
2670      else value = getPdgIdBinValue(mcparticles->at(index).motherId);
2671    }
2672 +  else if(variable == "genMatchedMotherIdReverse"){
2673 +    int index = getGenMatchedParticleIndex(object);
2674 +    if(index == -1) value = 23;
2675 +    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
2676 +  }
2677    else if(variable == "genMatchedGrandmotherId"){
2678      int index = getGenMatchedParticleIndex(object);
2679      if(index == -1) value = 0;
# Line 2152 | Line 2684 | OSUAnalysis::valueLookup (const BNphoton
2684      }
2685      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2686    }
2687 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2688 +    int index = getGenMatchedParticleIndex(object);
2689 +    if(index == -1) value = 23;
2690 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2691 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2692 +      if(motherIndex == -1) value = 23;
2693 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2694 +    }
2695 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2696 +  }
2697  
2698  
2699 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2699 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2700  
2701    value = applyFunction(function, value);
2702  
2703    return value;
2704   }
2705  
2706 + //!supercluster valueLookup
2707   double
2708 < OSUAnalysis::valueLookup (const BNsupercluster* object, string variable, string function){
2708 > OSUAnalysis::valueLookup (const BNsupercluster* object, string variable, string function, string &stringValue){
2709  
2710    double value = 0.0;
2711  
# Line 2176 | Line 2719 | OSUAnalysis::valueLookup (const BNsuperc
2719    else if(variable == "theta") value = object->theta;
2720  
2721  
2722 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2722 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2723  
2724    value = applyFunction(function, value);
2725  
2726    return value;
2727   }
2728  
2729 + //!trigobj valueLookup
2730 + double
2731 + OSUAnalysis::valueLookup (const BNtrigobj* object, string variable, string function, string &stringValue){
2732 +
2733 +  double value = 0.0;
2734 +
2735 +  if(variable == "pt") value = object->pt;
2736 +  else if(variable == "eta") value = object->eta;
2737 +  else if(variable == "phi") value = object->phi;
2738 +  else if(variable == "px") value = object->px;
2739 +  else if(variable == "py") value = object->py;
2740 +  else if(variable == "pz") value = object->pz;
2741 +  else if(variable == "et") value = object->et;
2742 +  else if(variable == "energy") value = object->energy;
2743 +  else if(variable == "etTotal") value = object->etTotal;
2744 +  else if(variable == "id") value = object->id;
2745 +  else if(variable == "charge") value = object->charge;
2746 +  else if(variable == "isIsolated") value = object->isIsolated;
2747 +  else if(variable == "isMip") value = object->isMip;
2748 +  else if(variable == "isForward") value = object->isForward;
2749 +  else if(variable == "isRPC") value = object->isRPC;
2750 +  else if(variable == "bx") value = object->bx;
2751 +  else if(variable == "filter") {
2752 +    if ((stringValue = object->filter) == "")
2753 +      stringValue = "none";  // stringValue should only be empty if value is filled
2754 +  }
2755 +
2756 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2757 +
2758 +  value = applyFunction(function, value);
2759  
2760 +  return value;
2761 + }
2762 +
2763 + //!muon-muon pair valueLookup
2764   double
2765 < OSUAnalysis::valueLookup (const BNmuon* object1, const BNmuon* object2, string variable, string function){
2765 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNmuon* object2, string variable, string function, string &stringValue){
2766  
2767    double value = 0.0;
2768  
2769    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
2770 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
2771    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
2772    else if(variable == "invMass"){
2773      TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2774      TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2775 <
2776 <    value = (fourVector1 + fourVector2).M();}
2777 <
2775 >    value = (fourVector1 + fourVector2).M();
2776 >  }
2777 >  else if(variable == "pt"){
2778 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2779 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2780 >    value = (fourVector1 + fourVector2).Pt();
2781 >  }
2782    else if(variable == "threeDAngle")
2783      {
2784        TVector3 threeVector1(object1->px, object1->py, object1->pz);
# Line 2208 | Line 2790 | OSUAnalysis::valueLookup (const BNmuon*
2790        static const double pi = 3.1415926535897932384626433832795028841971693993751058;
2791        TVector3 threeVector1(object1->px, object1->py, object1->pz);
2792        TVector3 threeVector2(object2->px, object2->py, object2->pz);
2793 <      value = (pi-threeVector1.Angle( threeVector2));
2793 >      value = (pi-threeVector1.Angle(threeVector2));
2794      }
2213 –
2214 –  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
2215 –
2216 –
2795    else if(variable == "deltaCorrectedD0Vertex") value = object1->correctedD0Vertex - object2->correctedD0Vertex;
2796    else if(variable == "deltaAbsCorrectedD0Vertex") value = fabs(object1->correctedD0Vertex) - fabs(object2->correctedD0Vertex);
2797    else if(variable == "d0Sign"){
# Line 2222 | Line 2800 | OSUAnalysis::valueLookup (const BNmuon*
2800      else if (d0Sign > 0) value = 0.5;
2801      else value = -999;
2802    }
2803 +  else if(variable == "chargeProduct"){
2804 +    value = object1->charge*object2->charge;
2805 +  }
2806    else if(variable == "muon1CorrectedD0Vertex"){
2807      value = object1->correctedD0Vertex;
2808    }
2809    else if(variable == "muon2CorrectedD0Vertex"){
2810      value = object2->correctedD0Vertex;
2811    }
2812 < else if(variable == "muon1timeAtIpInOut"){
2812 >  else if(variable == "muon1timeAtIpInOut"){
2813      value = object1->timeAtIpInOut;
2814    }
2815 < else if(variable == "muon2timeAtIpInOut"){
2815 >  else if(variable == "muon2timeAtIpInOut"){
2816      value = object2->timeAtIpInOut;
2817    }
2818 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2819 <
2820 <
2821 <
2822 <
2823 <
2824 <
2818 >  else if(variable == "muon1correctedD0")
2819 >    {
2820 >      value = object1->correctedD0;
2821 >    }
2822 >  else if(variable == "muon2correctedD0")
2823 >    {
2824 >      value = object2->correctedD0;
2825 >    }
2826  
2827 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2828  
2829    value = applyFunction(function, value);
2830  
2831    return value;
2832   }
2833  
2834 + //!electron-electron pair valueLookup
2835   double
2836 < OSUAnalysis::valueLookup (const BNelectron* object1, const BNelectron* object2, string variable, string function){
2836 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNelectron* object2, string variable, string function, string &stringValue){
2837  
2838    double value = 0.0;
2839  
2840    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
2841 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
2842    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
2843    else if(variable == "invMass"){
2844      TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2845      TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2846 <
2847 <    value = (fourVector1 + fourVector2).M();}
2848 < else if(variable == "threeDAngle")
2846 >    value = (fourVector1 + fourVector2).M();
2847 >  }
2848 >  else if(variable == "pt"){
2849 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2850 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2851 >    value = (fourVector1 + fourVector2).Pt();
2852 >  }
2853 >  else if(variable == "threeDAngle")
2854      {
2855        TVector3 threeVector1(object1->px, object1->py, object1->pz);
2856        TVector3 threeVector2(object2->px, object2->py, object2->pz);
2857        value = (threeVector1.Angle(threeVector2));
2858      }
2269 –  
2270 –
2271 –
2272 –
2859    else if(variable == "deltaCorrectedD0Vertex") value = object1->correctedD0Vertex - object2->correctedD0Vertex;
2860    else if(variable == "deltaAbsCorrectedD0Vertex") value = fabs(object1->correctedD0Vertex) - fabs(object2->correctedD0Vertex);
2275 –
2276 –  else if(variable == "d0Sign") value = object1->correctedD0Vertex*object2->correctedD0Vertex/fabs(object1->correctedD0Vertex*object2->correctedD0Vertex);
2277 –
2278 –
2279 –
2861    else if(variable == "d0Sign"){
2862      double d0Sign = (object1->correctedD0Vertex*object2->correctedD0Vertex)/fabs(object1->correctedD0Vertex*object2->correctedD0Vertex);
2863      if(d0Sign < 0) value = -0.5;
2864      else if (d0Sign > 0) value = 0.5;
2865      else value = -999;
2866    }
2867 +  else if(variable == "chargeProduct"){
2868 +    value = object1->charge*object2->charge;
2869 +  }
2870    else if(variable == "electron1CorrectedD0Vertex"){
2871      value = object1->correctedD0Vertex;
2872    }
2873    else if(variable == "electron2CorrectedD0Vertex"){
2874      value = object2->correctedD0Vertex;
2875    }
2876 +  else if(variable == "electron1CorrectedD0"){
2877 +    value = object1->correctedD0;
2878 +  }
2879 +  else if(variable == "electron2CorrectedD0"){
2880 +    value = object2->correctedD0;
2881 +  }
2882  
2883 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2883 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2884  
2885    value = applyFunction(function, value);
2886  
2887    return value;
2888   }
2889 <
2889 > //!electron-muon pair valueLookup
2890   double
2891 < OSUAnalysis::valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function){
2891 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function, string &stringValue){
2892  
2893    double value = 0.0;
2894  
2895    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
2896 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
2897    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
2898    else if(variable == "invMass"){
2899      TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2900      TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2901 <
2902 <    value = (fourVector1 + fourVector2).M();}
2903 < else if(variable == "threeDAngle")
2901 >    value = (fourVector1 + fourVector2).M();
2902 >  }
2903 >  else if(variable == "pt"){
2904 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2905 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2906 >    value = (fourVector1 + fourVector2).Pt();
2907 >  }
2908 >  else if(variable == "threeDAngle")
2909      {
2910        TVector3 threeVector1(object1->px, object1->py, object1->pz);
2911        TVector3 threeVector2(object2->px, object2->py, object2->pz);
2912        value = (threeVector1.Angle(threeVector2));
2913      }
2318 –
2319 –
2914    else if(variable == "deltaCorrectedD0Vertex") value = object1->correctedD0Vertex - object2->correctedD0Vertex;
2915    else if(variable == "deltaAbsCorrectedD0Vertex") value = fabs(object1->correctedD0Vertex) - fabs(object2->correctedD0Vertex);
2916    else if(variable == "d0Sign"){
# Line 2325 | Line 2919 | OSUAnalysis::valueLookup (const BNelectr
2919      else if (d0Sign > 0) value = 0.5;
2920      else value = -999;
2921    }
2922 +  else if(variable == "chargeProduct"){
2923 +    value = object1->charge*object2->charge;
2924 +  }
2925    else if(variable == "electronCorrectedD0Vertex"){
2926      value = object1->correctedD0Vertex;
2927    }
# Line 2337 | Line 2934 | OSUAnalysis::valueLookup (const BNelectr
2934    else if(variable == "muonCorrectedD0"){
2935      value = object2->correctedD0;
2936    }
2937 +  else if(variable == "electronDetIso"){
2938 +    value = (object1->trackIso) / object1->pt;
2939 +  }
2940 +  else if(variable == "muonDetIso"){
2941 +    value = (object2->trackIsoDR03) / object2->pt;
2942 +  }
2943 +  else if(variable == "electronRelPFrhoIso"){
2944 +    value = ( object1->chargedHadronIsoDR03 + max(0.0, object1->neutralHadronIsoDR03 + object1->photonIsoDR03 - object1->AEffDr03*object1->rhoPrime) ) / object1->pt;
2945 +  }
2946 +  else if(variable == "muonRelPFdBetaIso"){
2947 +    value = (object2->pfIsoR04SumChargedHadronPt + max(0.0, object2->pfIsoR04SumNeutralHadronEt + object2->pfIsoR04SumPhotonEt - 0.5*object2->pfIsoR04SumPUPt)) / object2->pt;
2948 +  }
2949 +
2950 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2951 +
2952 +  value = applyFunction(function, value);
2953 +
2954 +  return value;
2955 + }
2956 +
2957 + //!electron-jet pair valueLookup
2958 + double
2959 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNjet* object2, string variable, string function, string &stringValue){
2960 +
2961 +  double value = 0.0;
2962 +
2963 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
2964 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
2965 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
2966 +  else if(variable == "invMass"){
2967 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2968 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2969 +    value = (fourVector1 + fourVector2).M();
2970 +  }
2971 +  else if(variable == "pt"){
2972 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2973 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2974 +    value = (fourVector1 + fourVector2).Pt();
2975 +  }
2976 +  else if(variable == "threeDAngle")
2977 +    {
2978 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
2979 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
2980 +      value = (threeVector1.Angle(threeVector2));
2981 +    }
2982 +  else if(variable == "chargeProduct"){
2983 +    value = object1->charge*object2->charge;
2984 +  }
2985 +
2986 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2987 +
2988 +  value = applyFunction(function, value);
2989 +
2990 +  return value;
2991 + }
2992 +
2993 + //!muon-jet pair valueLookup
2994 + double
2995 + OSUAnalysis::valueLookup (const BNmuon* object1, const BNjet* object2, string variable, string function, string &stringValue){
2996 +
2997 +  double value = 0.0;
2998 +
2999 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3000 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3001 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3002 +  else if(variable == "invMass"){
3003 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3004 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3005 +    value = (fourVector1 + fourVector2).M();
3006 +  }
3007 +  else if(variable == "pt"){
3008 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3009 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3010 +    value = (fourVector1 + fourVector2).Pt();
3011 +  }
3012 +  else if(variable == "threeDAngle")
3013 +    {
3014 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3015 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3016 +      value = (threeVector1.Angle(threeVector2));
3017 +    }
3018 +  else if(variable == "chargeProduct"){
3019 +    value = object1->charge*object2->charge;
3020 +  }
3021 +
3022 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3023 +
3024 +  value = applyFunction(function, value);
3025 +
3026 +  return value;
3027 + }
3028 +
3029 + //!jet-jet pair valueLookup
3030 + double
3031 + OSUAnalysis::valueLookup (const BNjet* object1, const BNjet* object2, string variable, string function, string &stringValue){
3032 +
3033 +  double value = 0.0;
3034 +
3035 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3036 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3037 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3038 +  else if(variable == "invMass"){
3039 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3040 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3041 +    value = (fourVector1 + fourVector2).M();
3042 +  }
3043 +  else if(variable == "pt"){
3044 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3045 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3046 +    value = (fourVector1 + fourVector2).Pt();
3047 +  }
3048 +  else if(variable == "threeDAngle")
3049 +    {
3050 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3051 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3052 +      value = (threeVector1.Angle(threeVector2));
3053 +    }
3054 +  else if(variable == "chargeProduct"){
3055 +    value = object1->charge*object2->charge;
3056 +  }
3057 +
3058 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3059 +
3060 +  value = applyFunction(function, value);
3061 +
3062 +  return value;
3063 + }
3064 + //!electron-track pair valueLookup
3065 + double
3066 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrack* object2, string variable, string function, string &stringValue){
3067 +  double electronMass = 0.000511;
3068 +  double value = 0.0;
3069 +  TLorentzVector fourVector1(0, 0, 0, 0);
3070 +  TLorentzVector fourVector2(0, 0, 0, 0);
3071 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3072 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3073 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3074 +  else if(variable == "invMass"){
3075 +    fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, electronMass);
3076 +    fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, electronMass );
3077 +
3078 +    value = (fourVector1 + fourVector2).M();
3079 +  }
3080 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3081 +  value = applyFunction(function, value);
3082 +  return value;
3083 + }
3084 +
3085 +
3086 + //!muon-track pair valueLookup
3087 + double
3088 + OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrack* object2, string variable, string function, string &stringValue){
3089 +  double pionMass = 0.140;
3090 +  double muonMass = 0.106;
3091 +  double value = 0.0;
3092 +  TLorentzVector fourVector1(0, 0, 0, 0);
3093 +  TLorentzVector fourVector2(0, 0, 0, 0);
3094 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3095 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3096 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3097 +  else if(variable == "invMass"){
3098 +    fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, muonMass);
3099 +    fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, pionMass );
3100 +
3101 +    value = (fourVector1 + fourVector2).M();
3102 +  }
3103 +
3104 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3105 +  value = applyFunction(function, value);
3106 +  return value;
3107 + }
3108 +
3109 + //!tau-tau pair valueLookup
3110 + double
3111 + OSUAnalysis::valueLookup (const BNtau* object1, const BNtau* object2, string variable, string function, string &stringValue){
3112 +  double value = 0.0;
3113 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3114 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3115 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3116 +  else if(variable == "invMass"){
3117 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3118 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3119 +    value = (fourVector1 + fourVector2).M();
3120 +  }
3121 +
3122 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3123 +  value = applyFunction(function, value);
3124 +  return value;
3125 + }
3126 +
3127 + //!muon-tau pair valueLookup
3128 + double
3129 + OSUAnalysis::valueLookup (const BNmuon* object1, const BNtau* object2, string variable, string function, string &stringValue){
3130 +  double value = 0.0;
3131 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3132 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3133 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3134 +  else if(variable == "invMass"){
3135 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3136 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3137 +    value = (fourVector1 + fourVector2).M();
3138 +  }
3139 +
3140 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3141 +  value = applyFunction(function, value);
3142 +  return value;
3143 + }
3144 +
3145 + //!tau-track pair valueLookup
3146 + double
3147 + OSUAnalysis::valueLookup (const BNtau* object1, const BNtrack* object2, string variable, string function, string &stringValue){
3148 +  double value = 0.0;
3149 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3150 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3151 +
3152 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3153 +  value = applyFunction(function, value);
3154 +  return value;
3155 + }
3156 +
3157 +
3158 + //!track-event pair valueLookup
3159 + double
3160 + OSUAnalysis::valueLookup (const BNtrack* object1, const BNevent* object2, string variable, string function, string &stringValue){
3161 +
3162 +  double value = 0.0;
3163 +  double pMag = sqrt(object1->pt * object1->pt +
3164 +                     object1->pz * object1->pz);
3165 +
3166 +  if      (variable == "numPV")                      value = object2->numPV;
3167 +  else if (variable == "caloTotDeltaRp5")            value =  (object1->caloHadDeltaRp5 + object1->caloEMDeltaRp5);
3168 +  else if (variable == "caloTotDeltaRp5ByP")         value = ((object1->caloHadDeltaRp5 + object1->caloEMDeltaRp5)/pMag);
3169 +  else if (variable == "caloTotDeltaRp5_RhoCorr")    value = getTrkCaloTotRhoCorr(object1);
3170 +  else if (variable == "caloTotDeltaRp5ByP_RhoCorr") value = getTrkCaloTotRhoCorr(object1) / pMag;
3171 +
3172 +  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3173 +
3174 +  value = applyFunction(function, value);
3175 +
3176 +  return value;
3177 +
3178 + }
3179 +
3180 + //!electron-trigobj pair valueLookup
3181 + double
3182 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrigobj* object2, string variable, string function, string &stringValue){
3183 +
3184 +  double value = 0.0;
3185 +
3186 +  if (variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3187 +
3188 +  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3189 +
3190 +  value = applyFunction(function, value);
3191 +
3192 +  return value;
3193 +
3194 + }
3195 +
3196 + //!muon-trigobj pair valueLookup
3197 + double
3198 + OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrigobj* object2, string variable, string function, string &stringValue){
3199 +
3200 +  double value = 0.0;
3201 +
3202 +  if (variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3203 +
3204 +  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3205 +
3206 +  value = applyFunction(function, value);
3207 +
3208 +  return value;
3209 +
3210 + }
3211 +
3212 + //!stop valueLookup
3213 + double
3214 + OSUAnalysis::valueLookup (const BNstop* object, string variable, string function, string &stringValue){
3215 +
3216 +
3217 +  double value = 0.0;
3218 +
3219 +  if(variable == "ctau") value = object->ctau;
3220 +
3221 +  else if (variable == "d0"){
3222 +    double vx = object->vx - chosenVertex ()->x,
3223 +      vy = object->vy - chosenVertex ()->y,
3224 +      px = object->px,
3225 +      py = object->py,
3226 +      pt = object->pt;
3227 +    value = (-vx * py + vy * px) / pt;
3228 +  }
3229 +
3230 +  else if (variable == "dz"){
3231 +    double vx = object->vx - chosenVertex ()->x,
3232 +      vy = object->vy - chosenVertex ()->y,
3233 +      vz = object->vz - chosenVertex ()->z,
3234 +      px = object->px,
3235 +      py = object->py,
3236 +      pz = object->pz,
3237 +      pt = object->pt;
3238 +    value = vz - (vx * px + vy * py)/pt * (pz/pt);
3239 +  }
3240 +
3241 +  else if (variable == "minD0"){
3242 +    double minD0=999;
3243 +    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3244 +      double vx = object->vx - vertex->x,
3245 +        vy = object->vy - vertex->y,
3246 +        px = object->px,
3247 +        py = object->py,
3248 +        pt = object->pt;
3249 +      value = (-vx * py + vy * px) / pt;
3250 +      if(abs(value) < abs(minD0)) minD0 = value;
3251 +    }
3252 +    value = minD0;
3253 +  }
3254 +  else if (variable == "minDz"){
3255 +    double minDz=999;
3256 +    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3257 +      double vx = object->vx - vertex->x,
3258 +        vy = object->vy - vertex->y,
3259 +        vz = object->vz - vertex->z,
3260 +        px = object->px,
3261 +        py = object->py,
3262 +        pz = object->pz,
3263 +        pt = object->pt;
3264 +      value = vz - (vx * px + vy * py)/pt * (pz/pt);
3265 +      if(abs(value) < abs(minDz)) minDz = value;
3266 +    }
3267 +    value = minDz;
3268 +  }
3269 +  else if(variable == "distToVertex"){
3270 +    value = sqrt((object->vx-chosenVertex()->x)*(object->vx-chosenVertex()->x) + \
3271 +                 (object->vy-chosenVertex()->y)*(object->vy-chosenVertex()->y) + \
3272 +                 (object->vz-chosenVertex()->z)*(object->vz-chosenVertex()->z));
3273 +  }
3274 +  else if (variable == "minDistToVertex"){
3275 +    double minDistToVertex=999;
3276 +    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3277 +      value = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
3278 +                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
3279 +                   (object->vz-vertex->z)*(object->vz-vertex->z));
3280 +
3281 +      if(abs(value) < abs(minDistToVertex)) minDistToVertex = value;
3282 +    }
3283 +    value = minDistToVertex;
3284 +  }
3285 +  else if (variable == "distToVertexDifference"){
3286 +    double minDistToVertex=999;
3287 +    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3288 +      value = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
3289 +                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
3290 +                   (object->vz-vertex->z)*(object->vz-vertex->z));
3291 +
3292 +      if(abs(value) < abs(minDistToVertex)) minDistToVertex = value;
3293 +    }
3294 +    double distToChosenVertex = sqrt((object->vx-chosenVertex()->x)*(object->vx-chosenVertex()->x) + \
3295 +                                     (object->vy-chosenVertex()->y)*(object->vy-chosenVertex()->y) + \
3296 +                                     (object->vz-chosenVertex()->z)*(object->vz-chosenVertex()->z));
3297 +
3298 +    value = distToChosenVertex - minDistToVertex;
3299 +  }
3300 +
3301 +  else if (variable == "closestVertexRank"){
3302 +    double minDistToVertex=999;
3303 +    int vertex_rank = 0;
3304 +    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3305 +      vertex_rank++;
3306 +      int dist = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
3307 +                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
3308 +                   (object->vz-vertex->z)*(object->vz-vertex->z));
3309 +
3310 +      if(abs(dist) < abs(minDistToVertex)){
3311 +        value = vertex_rank;
3312 +        minDistToVertex = dist;
3313 +      }
3314 +    }
3315 +  }
3316 +
3317  
3318  
3319 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3319 >
3320 >  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3321  
3322    value = applyFunction(function, value);
3323  
3324    return value;
3325 +
3326   }
3327  
3328  
3329 < // Calculate the number of tracks in cone of DeltaR<0.5 around track1.  
3330 < // Return true iff no other tracks are found in this cone.  
3331 < int
3329 >
3330 >
3331 > // Calculate the number of tracks in cone of DeltaR<0.5 around track1.
3332 > // Return true iff no other tracks are found in this cone.
3333 > int
3334   OSUAnalysis::getTrkIsIso (const BNtrack* track1, const BNtrackCollection* trackColl){
3335    for(BNtrackCollection::const_iterator track2 = trackColl->begin(); track2 !=trackColl->end(); track2++){
3336 <    if(track1->eta == track2->eta && track1->phi == track2->phi) continue; // Do not compare the track to itself.  
3336 >    if(track1->eta == track2->eta && track1->phi == track2->phi) continue; // Do not compare the track to itself.
3337      double deltaRtrk = deltaR(track1->eta, track1->phi, track2->eta, track2->phi);
3338      if(deltaRtrk < 0.5) return 0;
3339    }
3340    return 1;
3341 <  
3341 >
3342   }
3343  
3344  
3345 < double
3345 > double
3346   OSUAnalysis::getTrkPtRes (const BNtrack* track1){
3347  
3348    double ptTrue = getTrkPtTrue(track1, mcparticles.product());
3349    double PtRes = (track1->pt - ptTrue) / ptTrue;
3350  
3351    return PtRes;
3352 <  
3352 >
3353   }
3354  
3355  
3356 < double
3356 > double
3357   OSUAnalysis::getTrkPtTrue (const BNtrack* track1, const BNmcparticleCollection* genPartColl){
3358    double value = -99;
3359    double genDeltaRLowest = 999;
# Line 2381 | Line 3362 | OSUAnalysis::getTrkPtTrue (const BNtrack
3362      double genDeltaRtemp = deltaR(genPart->eta, genPart->phi,track1->eta, track1->phi);
3363      if (genDeltaRtemp < genDeltaRLowest) {
3364        genDeltaRLowest = genDeltaRtemp;
3365 <      if (genDeltaRLowest < 0.05) {   // Only consider it truth-matched if DeltaR<0.15.  
3366 <        double ptTrue = genPart->pt;
3367 <        value = ptTrue;
3365 >      if (genDeltaRLowest < 0.05) {   // Only consider it truth-matched if DeltaR<0.15.
3366 >        double ptTrue = genPart->pt;
3367 >        value = ptTrue;
3368        }
3369 <    }
3369 >    }
3370    }
3371  
3372    return value;
3373  
3374   }
3375  
3376 + double
3377 + OSUAnalysis::getTrkCaloTotRhoCorr(const BNtrack* track) {
3378 +  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.
3379 +  if (!useTrackCaloRhoCorr_) return -99;
3380 +  // if (!rhokt6CaloJetsHandle_) {
3381 +  //   cout << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;
3382 +  //   return -99;
3383 +  // }
3384 +  double radDeltaRCone = 0.5;
3385 +  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  // Define effective area as pi*r^2, where r is radius of DeltaR cone.
3386 +  double rawCaloTot = track->caloHadDeltaRp5 + track->caloEMDeltaRp5;
3387 +  double caloTotRhoCorrCalo = TMath::Max(0., rawCaloTot - rhoCorr_kt6CaloJets);
3388 +  return caloTotRhoCorrCalo;
3389 +
3390 + }
3391 +
3392 +
3393 +
3394 +
3395   //creates a map of the dead Ecal channels in the barrel and endcap
3396   //to see how the map of dead Ecal channels is created look at function getChannelStatusMaps() here:
3397   //http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/UserCode/jbrinson/DisappTrk/OSUT3Analysis/AnaTools/src/OSUAnalysis.cc?revision=1.88&view=markup
3398 < void
3398 > void
3399   OSUAnalysis::WriteDeadEcal (){
3400    double etaEcal, phiEcal;
3401    ifstream DeadEcalFile(deadEcalFile_);
3402    if(!DeadEcalFile) {
3403      cout << "Error: DeadEcalFile has not been found." << endl;
3404 <    return;
3405 <  }
3406 <  if(DeadEcalVec.size()!= 0){
3404 >    return;
3405 >  }
3406 >  if(DeadEcalVec.size()!= 0){
3407      cout << "Error: DeadEcalVec has a nonzero size" << endl;
3408      return;
3409 <  }
3409 >  }
3410    while(!DeadEcalFile.eof())
3411      {
3412        DeadEcalFile >> etaEcal >> phiEcal;
# Line 2419 | Line 3419 | OSUAnalysis::WriteDeadEcal (){
3419   }
3420  
3421   //if a track is found within dR<0.05 of a dead Ecal channel value = 1, otherwise value = 0
3422 < int
3422 > int
3423   OSUAnalysis::getTrkIsMatchedDeadEcal (const BNtrack* track1){
3424    double deltaRLowest = 999;
3425    int value = 0;
3426    if (DeadEcalVec.size() == 0) WriteDeadEcal();
3427 <  for(std::vector<DeadEcal>::const_iterator ecal = DeadEcalVec.begin(); ecal != DeadEcalVec.end(); ++ecal){
3427 >  for(vector<DeadEcal>::const_iterator ecal = DeadEcalVec.begin(); ecal != DeadEcalVec.end(); ++ecal){
3428      double eta = ecal->etaEcal;
3429      double phi = ecal->phiEcal;
3430      double deltaRtemp = deltaR(eta, track1->eta, phi, track1->phi);
# Line 2435 | Line 3435 | OSUAnalysis::getTrkIsMatchedDeadEcal (co
3435    return value;
3436   }
3437  
3438 <
3439 <
3438 > // Returns the smallest DeltaR between the object and any generated true particle in the event.
3439 > template <class InputObject>
3440 > double OSUAnalysis::getGenDeltaRLowest(InputObject object){
3441 >  double genDeltaRLowest = 999.;
3442 >  for(BNmcparticleCollection::const_iterator mcparticle = mcparticles->begin (); mcparticle != mcparticles->end (); mcparticle++){
3443 >    double deltaRtemp = deltaR(mcparticle->eta, mcparticle->phi, object->eta, object->phi);
3444 >    if (deltaRtemp < genDeltaRLowest) genDeltaRLowest = deltaRtemp;
3445 >  }
3446 >  return genDeltaRLowest;
3447 > }
3448  
3449   double
3450   OSUAnalysis::applyFunction(string function, double value){
# Line 2447 | Line 3455 | OSUAnalysis::applyFunction(string functi
3455    else if(function == "log") value = log10(value);
3456  
3457    else if(function == "") value = value;
3458 <  else{std::cout << "WARNING: invalid function '" << function << "'\n";}
3458 >  else{cout << "WARNING: invalid function '" << function << "'\n";}
3459  
3460    return value;
3461  
# Line 2457 | Line 3465 | OSUAnalysis::applyFunction(string functi
3465   template <class InputCollection>
3466   void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, InputCollection inputCollection, string inputType){
3467  
3468 +  if (currentCut.inputCollection.find("pair")!=string::npos)  {
3469 +    string obj1, obj2;
3470 +    getTwoObjs(currentCut.inputCollection, obj1, obj2);
3471 +    if (inputType==obj1 ||
3472 +          inputType==obj2) {
3473 +      // Do not add a cut to individualFlags or cumulativeFlags, if the cut is on a paired collection,
3474 +      // and the inputType is a member of the pair.
3475 +      // The cut will instead be applied when the setObjectFlags() is called for the paired collection.
3476 +      // For example, if currentCut.inputCollection==electron-muon pairs,
3477 +      // then the flags should not be set here when inputType==muons or inputType==electrons.
3478 +      return;
3479 +    }
3480 +  }
3481  
3482    for (uint object = 0; object != inputCollection->size(); object++){
3483  
2463 –
3484      bool decision = true;//object passes if this cut doesn't cut on that type of object
3485  
2466 –
3486      if(currentCut.inputCollection == inputType){
3487  
3488        vector<bool> subcutDecisions;
3489        for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
3490 <        double value = valueLookup(&inputCollection->at(object), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex));
3491 <        subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3490 >        string stringValue = "";
3491 >        double value = valueLookup(&inputCollection->at(object), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex), stringValue);
3492 >        if (stringValue == "") subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3493 >        else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
3494 >
3495        }
3496        if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
3497        else{
3498 <        bool tempDecision = true;
3499 <        for( int subcutIndex = 0;subcutIndex != currentCut.numSubcuts-1; subcutIndex++){
3500 <          if(currentCut.logicalOperators.at(subcutIndex) == "&" || currentCut.logicalOperators.at(subcutIndex) == "&&")
3501 <            tempDecision = subcutDecisions.at(subcutIndex) && subcutDecisions.at(subcutIndex+1);
3502 <          else if(currentCut.logicalOperators.at(subcutIndex) == "|"|| currentCut.logicalOperators.at(subcutIndex) == "||")
3498 >        bool tempDecision = true;
3499 >        for( int subcutIndex = 0;subcutIndex != currentCut.numSubcuts-1; subcutIndex++){
3500 >          if(currentCut.logicalOperators.at(subcutIndex) == "&" || currentCut.logicalOperators.at(subcutIndex) == "&&")
3501 >            tempDecision = subcutDecisions.at(subcutIndex) && subcutDecisions.at(subcutIndex+1);
3502 >          else if(currentCut.logicalOperators.at(subcutIndex) == "|"|| currentCut.logicalOperators.at(subcutIndex) == "||")
3503              tempDecision = subcutDecisions.at(subcutIndex) || subcutDecisions.at(subcutIndex+1);
3504 <        }
3505 <        decision = tempDecision;
3504 >        }
3505 >        decision = tempDecision;
3506        }
3507      }
2486 –    individualFlags.at(inputType).at(currentCutIndex).push_back(decision);
3508  
3509 +    individualFlags.at(inputType).at(currentCutIndex).push_back(decision);
3510  
3511      //set flags for objects that pass each cut AND all the previous cuts
3512      bool previousCumulativeFlag = true;
# Line 2494 | Line 3516 | void OSUAnalysis::setObjectFlags(cut &cu
3516      }
3517      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(previousCumulativeFlag && decision);
3518  
2497 –
3519    }
3520  
3521   }
# Line 2502 | Line 3523 | void OSUAnalysis::setObjectFlags(cut &cu
3523  
3524   template <class InputCollection1, class InputCollection2>
3525   void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, \
3526 <                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, string inputType){
3526 >                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, string inputType){
3527  
3528  
3529    bool sameObjects = false;
3530    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
3531  
3532 +  // Get the strings for the two objects that make up the pair.
3533 +  string obj1Type, obj2Type;
3534 +  getTwoObjs(inputType, obj1Type, obj2Type);
3535 +  bool isTwoTypesOfObject = true;
3536 +  if (obj1Type==obj2Type) isTwoTypesOfObject = false;
3537 +
3538 +  // Initialize the flags for individual objects to all be false, if the cut is on the pair.
3539 +  // Set them to true later, if any paired object passes (in which case both of its constituents should pass).
3540 +  if (currentCut.inputCollection == inputType) {
3541 +    for (uint object1 = 0; object1 != inputCollection1->size(); object1++) {
3542 +      individualFlags.at(obj1Type).at(currentCutIndex).push_back(false);
3543 +      cumulativeFlags.at(obj1Type).at(currentCutIndex).push_back(false);
3544 +    }
3545 +    if (isTwoTypesOfObject) { // Only initialize the second object if it is different from the first.
3546 +      for (uint object2 = 0; object2 != inputCollection2->size(); object2++)  {
3547 +        individualFlags.at(obj2Type).at(currentCutIndex).push_back(false);
3548 +        cumulativeFlags.at(obj2Type).at(currentCutIndex).push_back(false);
3549 +      }
3550 +    }
3551 +  }
3552 +
3553 +  int counter = 0;
3554  
2512 –  int counter = 0;  
3555    for (uint object1 = 0; object1 != inputCollection1->size(); object1++){
3556      for (uint object2 = 0; object2 != inputCollection2->size(); object2++){
3557 <      
3557 >
3558        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
3559  
3560  
# Line 2520 | Line 3562 | void OSUAnalysis::setObjectFlags(cut &cu
3562  
3563        if(currentCut.inputCollection == inputType){
3564  
3565 <        vector<bool> subcutDecisions;
3566 <        for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
3567 <          double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex));
3568 <          subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3569 <        }
3570 <
3571 <        if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
3572 <        else{
3573 <          bool tempDecision = true;
3574 <          for( int subcutIndex = 0;subcutIndex != currentCut.numSubcuts-1; subcutIndex++){
3575 <            if(currentCut.logicalOperators.at(subcutIndex) == "&" || currentCut.logicalOperators.at(subcutIndex) == "&&")
3576 <              tempDecision = subcutDecisions.at(subcutIndex) && subcutDecisions.at(subcutIndex+1);
3577 <            else if(currentCut.logicalOperators.at(subcutIndex) == "|"|| currentCut.logicalOperators.at(subcutIndex) == "||")
3578 <              tempDecision = subcutDecisions.at(subcutIndex) || subcutDecisions.at(subcutIndex+1);
3579 <          }
3580 <          decision = tempDecision;
3581 <        }
3565 >        vector<bool> subcutDecisions;
3566 >        for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
3567 >          string stringValue = "";
3568 >          double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex), stringValue);
3569 >          if (stringValue == "") subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3570 >          else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
3571 >        }
3572 >
3573 >        if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
3574 >        else{
3575 >          bool tempDecision = subcutDecisions.at(0);
3576 >          for( int subcutIndex = 1; subcutIndex < currentCut.numSubcuts; subcutIndex++){
3577 >            if(currentCut.logicalOperators.at(subcutIndex-1) == "&" || currentCut.logicalOperators.at(subcutIndex-1) == "&&")
3578 >              tempDecision = tempDecision && subcutDecisions.at(subcutIndex);
3579 >            else if(currentCut.logicalOperators.at(subcutIndex-1) == "|"|| currentCut.logicalOperators.at(subcutIndex-1) == "||")
3580 >              tempDecision = tempDecision || subcutDecisions.at(subcutIndex);
3581 >          }
3582 >          decision = tempDecision;
3583 >        }
3584        }
3585 +      // if (decision) isPassObj1.at(object1) = true;
3586 +      // if (decision) isPassObj2.at(object2) = true;
3587        individualFlags.at(inputType).at(currentCutIndex).push_back(decision);
3588 <      
3588 >      if (decision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
3589 >        individualFlags.at(obj1Type).at(currentCutIndex).at(object1) = true;
3590 >        individualFlags.at(obj2Type).at(currentCutIndex).at(object2) = true;
3591 >      }
3592 >
3593        //set flags for objects that pass each cut AND all the previous cuts
3594        bool previousCumulativeFlag = true;
3595        for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
3596 <        if(previousCumulativeFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter)) previousCumulativeFlag = true;
3597 <        else{ previousCumulativeFlag = false; break;}
3596 >        if(previousCumulativeFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter)) previousCumulativeFlag = true;
3597 >        else{ previousCumulativeFlag = false; break;}
3598        }
3599        //apply flags for the components of the composite object as well
3600        bool currentCumulativeFlag = true;
# Line 2553 | Line 3603 | void OSUAnalysis::setObjectFlags(cut &cu
3603        else if(flags2.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1);
3604        else currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1) && flags2.at(object2);
3605        cumulativeFlags.at(inputType).at(currentCutIndex).push_back(currentCumulativeFlag);
3606 +      if (currentCumulativeFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
3607 +        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1);
3608 +        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2);
3609 +      }
3610 +      counter++;
3611  
3612 <      counter++;      
3613 <    }
3614 <    
3615 <  }
3612 >    } // end   for (uint object2 = 0; object2 != inputCollection2->size(); object2++)
3613 >  }  // end   for (uint object1 = 0; object1 != inputCollection1->size(); object1++)
3614 >
3615 > }
3616  
3617  
3618 + bool OSUAnalysis::getPreviousCumulativeFlags(uint currentCutIndex, flagMap &individualFlags, string obj1Type, uint object1) {
3619 +  // Return true iff for the collection obj1Type, the element with index object1 has individal flags set to true for
3620 +  // all cuts up to currentCutIndex
3621 +  bool previousCumulativeFlag = true;
3622 +  for (uint previousCutIndex = 0; previousCutIndex < currentCutIndex; previousCutIndex++) {
3623 +    if (previousCumulativeFlag && individualFlags.at(obj1Type).at(previousCutIndex).at(object1)) previousCumulativeFlag = true;
3624 +    else {
3625 +      previousCumulativeFlag = false; break;
3626 +    }
3627 +  }
3628 +  return previousCumulativeFlag;
3629   }
3630  
3631  
3632   template <class InputCollection>
3633 < void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double puScaleFactor){
3633 > void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double scaleFactor){
3634  
3635    for (uint object = 0; object != inputCollection->size(); object++){
3636  
# Line 2573 | Line 3639 | void OSUAnalysis::fill1DHistogram(TH1* h
3639      string currentString = parameters.inputVariables.at(0);
3640      string inputVariable = "";
3641      string function = "";
3642 <    if(currentString.find("(")==std::string::npos){
3643 <      inputVariable = currentString;// variable to cut on                                                                                                                                        
3642 >    if(currentString.find("(")==string::npos){
3643 >      inputVariable = currentString;// variable to cut on
3644      }
3645      else{
3646 <      function = currentString.substr(0,currentString.find("("));//function comes before the "("                                                                                          
3647 <      inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string                                                                                                    
3648 <      inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"                                                                                                    
3646 >      function = currentString.substr(0,currentString.find("("));//function comes before the "("
3647 >      inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3648 >      inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3649      }
3650  
3651 <    double value = valueLookup(&inputCollection->at(object), inputVariable, function);
3652 <    histo->Fill(value,puScaleFactor);
3651 >    string stringValue = "";
3652 >    double value = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
3653 >    histo->Fill(value,scaleFactor);
3654 >
3655 >    if (printEventInfo_) {
3656 >      // Write information about event to screen, for testing purposes.
3657 >      cout << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << endl;
3658 >    }
3659  
3660    }
2589 –
3661   }
3662  
3663   template <class InputCollection1, class InputCollection2>
3664 < void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double puScaleFactor){
3664 > void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double scaleFactor){
3665  
3666    bool sameObjects = false;
3667    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
3668  
3669 <  int pairCounter = 0;  
3669 >  int pairCounter = -1;
3670    for (uint object1 = 0; object1 != inputCollection1->size(); object1++){
3671      for (uint object2 = 0; object2 != inputCollection2->size(); object2++){
3672 <      
3672 >
3673        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
3674  
3675 +      pairCounter++;
3676        //only take objects which have passed all cuts and pairs which have passed all cuts
3677        if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1)) continue;
3678        if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2)) continue;
# Line 2609 | Line 3681 | void OSUAnalysis::fill1DHistogram(TH1* h
3681        string currentString = parameters.inputVariables.at(0);
3682        string inputVariable = "";
3683        string function = "";
3684 <      if(currentString.find("(")==std::string::npos){
3685 <        inputVariable = currentString;// variable to cut on                                                                                                          
3684 >      if(currentString.find("(")==string::npos){
3685 >        inputVariable = currentString;// variable to cut on
3686        }
3687        else{
3688 <        function = currentString.substr(0,currentString.find("("));//function comes before the "("                                                                                          
3689 <        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string                                                                                                    
3690 <        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"                                                                                                    
3691 <      }
3692 <      
3693 <      double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
3694 <      histo->Fill(value,puScaleFactor);
3688 >        function = currentString.substr(0,currentString.find("("));//function comes before the "("
3689 >        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3690 >        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3691 >      }
3692 >
3693 >      string stringValue = "";
3694 >      double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
3695 >      histo->Fill(value,scaleFactor);
3696  
2624 –      pairCounter++;      
3697      }
3698    }
3699  
# Line 2629 | Line 3701 | void OSUAnalysis::fill1DHistogram(TH1* h
3701  
3702  
3703   template <class InputCollection>
3704 < void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double puScaleFactor){
3704 > void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double scaleFactor){
3705  
3706    for (uint object = 0; object != inputCollection->size(); object++){
3707  
3708      if(!plotAllObjectsInPassingEvents_ && !flags.at(object)) continue;
3709  
3710 +    string stringValue = "";
3711      string currentString = parameters.inputVariables.at(0);
3712      string inputVariable = "";
3713      string function = "";
3714 <    if(currentString.find("(")==std::string::npos){
3715 <      inputVariable = currentString;// variable to cut on                                                                                                                                        
3714 >    if(currentString.find("(")==string::npos){
3715 >      inputVariable = currentString;// variable to cut on
3716      }
3717      else{
3718 <      function = currentString.substr(0,currentString.find("("));//function comes before the "("                                                                                          
3719 <      inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string                                                                                                    
3720 <      inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"                                                                                                    
3718 >      function = currentString.substr(0,currentString.find("("));//function comes before the "("
3719 >      inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3720 >      inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3721      }
3722 <    double valueX = valueLookup(&inputCollection->at(object), inputVariable, function);
3722 >    double valueX = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
3723  
3724      currentString = parameters.inputVariables.at(1);
3725      inputVariable = "";
3726      function = "";
3727 <    if(currentString.find("(")==std::string::npos){
3728 <      inputVariable = currentString;// variable to cut on                                                                                                                                        
3727 >    if(currentString.find("(")==string::npos){
3728 >      inputVariable = currentString;// variable to cut on
3729      }
3730      else{
3731 <      function = currentString.substr(0,currentString.find("("));//function comes before the "("                                                                                          
3732 <      inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string                                                                                                    
3733 <      inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"                                                                                                    
3731 >      function = currentString.substr(0,currentString.find("("));//function comes before the "("
3732 >      inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3733 >      inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3734      }
3735  
3736 <    double valueY = valueLookup(&inputCollection->at(object), inputVariable, function);
3736 >    double valueY = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
3737  
3738 <    histo->Fill(valueX,valueY,puScaleFactor);
3738 >    histo->Fill(valueX,valueY,scaleFactor);
3739  
3740    }
3741  
3742   }
3743  
3744   template <class InputCollection1, class InputCollection2>
3745 < void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double puScaleFactor){
3745 > void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double scaleFactor){
3746  
3747    bool sameObjects = false;
3748    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
3749  
3750 <  int pairCounter = 0;  
3750 >  int pairCounter = -1;
3751    for (uint object1 = 0; object1 != inputCollection1->size(); object1++){
3752      for (uint object2 = 0; object2 != inputCollection2->size(); object2++){
3753 <      
3753 >
3754        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
3755  
3756 +      pairCounter++;
3757 +
3758        //only take objects which have passed all cuts and pairs which have passed all cuts
3759        if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1)) continue;
3760        if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2)) continue;
3761        if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter)) continue;
3762  
3763 +      string stringValue = "";
3764        string currentString = parameters.inputVariables.at(0);
3765        string inputVariable = "";
3766        string function = "";
3767 <      if(currentString.find("(")==std::string::npos){
3768 <        inputVariable = currentString;// variable to cut on                                                                                                          
3767 >      if(currentString.find("(")==string::npos){
3768 >        inputVariable = currentString;// variable to cut on
3769        }
3770        else{
3771 <        function = currentString.substr(0,currentString.find("("));//function comes before the "("                                                                                          
3772 <        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string                                                                                                    
3773 <        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"                                                                                                    
3771 >        function = currentString.substr(0,currentString.find("("));//function comes before the "("
3772 >        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3773 >        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3774        }
3775 <      double valueX = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
3775 >      double valueX = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
3776  
3777        currentString = parameters.inputVariables.at(1);
3778        inputVariable = "";
3779        function = "";
3780 <      if(currentString.find("(")==std::string::npos){
3781 <        inputVariable = currentString;// variable to cut on                                                                                                          
3780 >      if(currentString.find("(")==string::npos){
3781 >        inputVariable = currentString;// variable to cut on
3782        }
3783        else{
3784 <        function = currentString.substr(0,currentString.find("("));//function comes before the "("                                                                                          
3785 <        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string                                                                                                    
3786 <        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"                                                                                                    
3784 >        function = currentString.substr(0,currentString.find("("));//function comes before the "("
3785 >        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3786 >        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3787        }
3788 <      double valueY = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
2713 <
3788 >      double valueY = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
3789  
2715 –      histo->Fill(valueX,valueY,puScaleFactor);
3790  
3791 <      pairCounter++;      
3791 >      histo->Fill(valueX,valueY,scaleFactor);
3792  
3793      }
3794    }
# Line 2732 | Line 3806 | int OSUAnalysis::getGenMatchedParticleIn
3806  
3807      double currentDeltaR = deltaR(object->eta,object->phi,mcparticle->eta,mcparticle->phi);
3808      if(currentDeltaR > 0.05) continue;
3809 <
3809 >    //     cout << setprecision(3) << setw(20)
3810 >    //          << "\tcurrentParticle:  eta = " << mcparticles->at(mcparticle - mcparticles->begin()).eta
3811 >    //          << setw(20)
3812 >    //          << "\tphi = " << mcparticles->at(mcparticle - mcparticles->begin()).phi
3813 >    //          << setw(20)
3814 >    //          << "\tdeltaR = " << currentDeltaR
3815 >    //          << setprecision(1)
3816 >    //          << setw(20)
3817 >    //          << "\tid = " << mcparticles->at(mcparticle - mcparticles->begin()).id
3818 >    //          << setw(20)
3819 >    //          << "\tmotherId = " << mcparticles->at(mcparticle - mcparticles->begin()).motherId
3820 >    //          << setw(20)
3821 >    //          << "\tstatus = " << mcparticles->at(mcparticle - mcparticles->begin()).status<< endl;
3822      if(currentDeltaR < bestMatchDeltaR && mcparticles->at(mcparticle - mcparticles->begin()).id != mcparticles->at(mcparticle - mcparticles->begin()).motherId){
3823        bestMatchIndex = mcparticle - mcparticles->begin();
3824        bestMatchDeltaR = currentDeltaR;
3825      }
3826  
3827    }
3828 <
3828 >  //   if(bestMatchDeltaR != 999)  cout << "bestMatch:  deltaR = " << bestMatchDeltaR << "   id = " << mcparticles->at(bestMatchIndex).id << "   motherId = " << mcparticles->at(bestMatchIndex).motherId << endl;
3829 >  //   else cout << "no match found..." << endl;
3830    return bestMatchIndex;
3831  
3832   }
# Line 2798 | Line 3885 | int OSUAnalysis::findTauMotherIndex(cons
3885   int OSUAnalysis::getPdgIdBinValue(int pdgId){
3886  
3887    int binValue = -999;
3888 <  int absPdgId = fabs(pdgId);  
3888 >  int absPdgId = fabs(pdgId);
3889    if(pdgId == -1) binValue = 0;
3890    else if(absPdgId <= 6 ) binValue = absPdgId;
3891    else if(absPdgId == 11 ) binValue = 7;
# Line 2824 | Line 3911 | int OSUAnalysis::getPdgIdBinValue(int pd
3911  
3912   }
3913  
3914 + const BNprimaryvertex *
3915 + OSUAnalysis::chosenVertex ()
3916 + {
3917 +  const BNprimaryvertex *chosenVertex = 0;
3918 +  if(find(objectsToCut.begin(), objectsToCut.end(), "primaryvertexs") != objectsToCut.end()) {
3919 +    vector<bool> vertexFlags;
3920 +    for (int i = cumulativeFlags.at("primaryvertexs").size() - 1; i >= 0; i--){
3921 +      if (cumulativeFlags.at("primaryvertexs").at(i).size()){
3922 +        vertexFlags = cumulativeFlags.at("primaryvertexs").at(i);
3923 +        break;
3924 +      }
3925 +    }
3926 +    for (uint vertexIndex = 0; vertexIndex != vertexFlags.size(); vertexIndex++){
3927 +      if(!vertexFlags.at(vertexIndex)) continue;
3928 +      chosenVertex = & primaryvertexs->at(vertexIndex);
3929 +      break;
3930 +    }
3931 +  }
3932 +  else {
3933 +    chosenVertex = &primaryvertexs->at(0);
3934 +  }
3935 +
3936 +  return chosenVertex;
3937 + }
3938  
3939 < DEFINE_FWK_MODULE(OSUAnalysis);
3939 > const BNmet *
3940 > OSUAnalysis::chosenMET ()
3941 > {
3942 >  const BNmet *chosenMET = 0;
3943 >  if(find(objectsToCut.begin(), objectsToCut.end(), "mets") != objectsToCut.end()) {
3944 >    vector<bool> metFlags;
3945 >    for (int i = cumulativeFlags.at("mets").size() - 1; i >= 0; i--){
3946 >      if (cumulativeFlags.at("mets").at(i).size()){
3947 >        metFlags = cumulativeFlags.at("mets").at(i);
3948 >        break;
3949 >      }
3950 >    }
3951 >    for (uint metIndex = 0; metIndex != metFlags.size(); metIndex++){
3952 >      if(!metFlags.at(metIndex)) continue;
3953 >      chosenMET = & mets->at(metIndex);
3954 >      break;
3955 >    }
3956 >  }
3957 >  else {
3958 >    chosenMET = &mets->at(0);
3959 >  }
3960  
3961 +  return chosenMET;
3962 + }
3963  
3964 + const BNelectron *
3965 + OSUAnalysis::chosenElectron ()
3966 + {
3967 +  const BNelectron *chosenElectron = 0;
3968 +  if(find(objectsToCut.begin(), objectsToCut.end(), "electrons") != objectsToCut.end()) {
3969 +    vector<bool> electronFlags;
3970 +    for (int i = cumulativeFlags.at("electrons").size() - 1; i >= 0; i--){
3971 +      if (cumulativeFlags.at("electrons").at(i).size()){
3972 +        electronFlags = cumulativeFlags.at("electrons").at(i);
3973 +        break;
3974 +      }
3975 +    }
3976 +    for (uint electronIndex = 0; electronIndex != electronFlags.size(); electronIndex++){
3977 +      if(!electronFlags.at(electronIndex)) continue;
3978 +      chosenElectron = & electrons->at(electronIndex);
3979 +      break;
3980 +    }
3981 +  }
3982 +  else {
3983 +    chosenElectron = &electrons->at(0);
3984 +  }
3985 +
3986 +  return chosenElectron;
3987 + }
3988 +
3989 + const BNmuon *
3990 + OSUAnalysis::chosenMuon ()
3991 + {
3992 +  const BNmuon *chosenMuon = 0;
3993 +  if(find(objectsToCut.begin(), objectsToCut.end(), "muons") != objectsToCut.end()) {
3994 +    vector<bool> muonFlags;
3995 +    for (int i = cumulativeFlags.at("muons").size() - 1; i >= 0; i--){
3996 +      if (cumulativeFlags.at("muons").at(i).size()){
3997 +        muonFlags = cumulativeFlags.at("muons").at(i);
3998 +        break;
3999 +      }
4000 +    }
4001 +    for (uint muonIndex = 0; muonIndex != muonFlags.size(); muonIndex++){
4002 +      if(!muonFlags.at(muonIndex)) continue;
4003 +      chosenMuon = & muons->at(muonIndex);
4004 +      break;
4005 +    }
4006 +  }
4007 +  else {
4008 +    chosenMuon = &muons->at(0);
4009 +  }
4010 +
4011 +  return chosenMuon;
4012 + }
4013 +
4014 + DEFINE_FWK_MODULE(OSUAnalysis);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines