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.49 by wulsin, Wed Apr 17 15:39:43 2013 UTC vs.
Revision 1.58 by ahart, Tue May 7 20:35:02 2013 UTC

# Line 17 | Line 17 | OSUAnalysis::OSUAnalysis (const edm::Par
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 <  muonSFFile_ (cfg.getParameter<std::string> ("muonSFFile")),
23 <  dataPU_ (cfg.getParameter<std::string> ("dataPU")),
24 <  electronSFID_ (cfg.getParameter<std::string> ("electronSFID")),
25 <  muonSF_ (cfg.getParameter<std::string> ("muonSF")),
26 <  dataset_ (cfg.getParameter<std::string> ("dataset")),
27 <  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")),
32    doPileupReweighting_ (cfg.getParameter<bool> ("doPileupReweighting")),
33 <  printEventInfo_ (cfg.getParameter<bool> ("printEventInfo")),
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  
# Line 40 | Line 42 | OSUAnalysis::OSUAnalysis (const edm::Par
42    //create pile-up reweighting object, if necessary
43    if(datasetType_ != "data") {
44      if(doPileupReweighting_) puWeight_ = new PUWeight (puFile_, dataPU_, dataset_);
45 <    //    muonSFWeight_ = new MuonSFWeight (muonSFFile_, muonSF_);
46 <    //    electronSFWeight_ = new ElectronSFWeight ("53X", electronSFID_);
45 >    if (applyLeptonSF_){
46 >      muonSFWeight_ = new MuonSFWeight (muonSFFile_, muonSF_);
47 >      electronSFWeight_ = new ElectronSFWeight ("53X", electronSFID_);
48 >    }
49    }
50 < #ifdef DISPLACED_SUSY
51 <  if (datasetType_ == "signalMC")
48 <    cTauWeight_ = new CTauWeight (stopCTau_.at (0), stopCTau_.at (1), stops_);
49 < #endif
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    objectsToGet.push_back("primaryvertexs");
# Line 71 | Line 73 | OSUAnalysis::OSUAnalysis (const edm::Par
73  
74      string tempInputCollection = histogramSets_.at(currentHistogramSet).getParameter<string> ("inputCollection");
75      if(tempInputCollection == "muon-electron pairs") tempInputCollection = "electron-muon pairs";
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.find("pairs")==std::string::npos){ //just a single object
81 <      if(tempInputCollection.find("secondary")!=std::string::npos){//secondary object
82 <        int spaceIndex = tempInputCollection.find(" ");
83 <        int secondWordLength = tempInputCollection.size() - spaceIndex;
84 <        objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
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);
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 the pair and the individual objects to the lists of things to Get/Plot/Cut
96 <      string obj1;
96 >      string obj1;
97        string obj2;
98        getTwoObjs(tempInputCollection, obj1, obj2);
99 <      string obj2ToGet = getObjToGet(obj2);  
99 >      string obj2ToGet = getObjToGet(obj2);
100        objectsToCut.push_back(tempInputCollection);
101        objectsToCut.push_back(obj1);
102 <      objectsToCut.push_back(obj2);  
102 >      objectsToCut.push_back(obj2);
103        objectsToPlot.push_back(tempInputCollection);
104        objectsToPlot.push_back(obj1);
105 <      objectsToPlot.push_back(obj2);  
105 >      objectsToPlot.push_back(obj2);
106        objectsToGet.push_back(tempInputCollection);
107        objectsToGet.push_back(obj1);
108        objectsToGet.push_back(obj2ToGet);
# Line 106 | Line 113 | OSUAnalysis::OSUAnalysis (const edm::Par
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  
128        histograms.push_back(tempHistogram);
# Line 127 | Line 139 | OSUAnalysis::OSUAnalysis (const edm::Par
139    for(uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
140  
141      string currentObject = objectsToPlot.at(currentObjectIndex);
142 <    if(currentObject != "muons" && currentObject != "secondary 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 171 | Line 189 | OSUAnalysis::OSUAnalysis (const edm::Par
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      histograms.push_back(tempIdVsMomIdHisto);
200 +    histograms.push_back(tempIdVsGmaIdHisto);
201    }
202  
203  
# Line 209 | Line 231 | OSUAnalysis::OSUAnalysis (const edm::Par
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  
# Line 221 | Line 243 | OSUAnalysis::OSUAnalysis (const edm::Par
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";
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";
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;
281 >      if(currentHistogram.name.find("GenMatch")==string::npos) continue;
282  
283        // bin      particle type
284        // ---      -------------
# Line 295 | Line 334 | OSUAnalysis::OSUAnalysis (const edm::Par
334        labelArray.push_back("other");
335  
336        for(int bin = 0; bin !=currentHistogram.bins.at(0); bin++){
337 <        if(currentHistogram.name.find("GenMatchIdVsMotherId")==std::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 <        }
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")!=std::string::npos) {
346 <        twoDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->CenterTitle();
347 <        twoDHists_.at(currentChannel)[currentHistogram.name]->GetYaxis()->CenterTitle();
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        }
349  
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().  
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;
# Line 321 | Line 360 | OSUAnalysis::OSUAnalysis (const edm::Par
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";      
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));  
379 >      currentObject.at(0) = toupper(currentObject.at(0));
380        string histoName = "num" + currentObject;
381  
382        if(histoName == "numPrimaryvertexs"){
# Line 355 | Line 401 | OSUAnalysis::OSUAnalysis (const edm::Par
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 <        if(tempInputCollection.find("secondary")!=std::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);
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);  
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);  
430 >        objectsToCut.push_back(obj2);
431          objectsToGet.push_back(tempInputCollection);
432          objectsToGet.push_back(obj1);
433          objectsToGet.push_back(obj2ToGet);
# Line 387 | Line 438 | OSUAnalysis::OSUAnalysis (const edm::Par
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";
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){
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          }
# Line 407 | Line 458 | OSUAnalysis::OSUAnalysis (const edm::Par
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 472 | 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())
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 (useTrackCaloRhoCorr_) {  
573 <    // Used only for pile-up correction of by-hand calculation of isolation energy.  
574 <    // This rho collection is not available in all BEANs.  
572 >  if (datasetType_ == "signalMC"){
573 >    if (find(objectsToGet.begin(), objectsToGet.end(), "stops") != objectsToGet.end())
574 >      event.getByLabel (stops_, stops);
575 >  }
576 >
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_);
581 >    // https://twiki.cern.ch/twiki/bin/view/CMS/JetAlgorithms#Algorithms
582 >    event.getByLabel ("kt6CaloJets","rho", rhokt6CaloJetsHandle_);
583    }
584  
585 +  double masterScaleFactor = 1.0;
586  
587    //get pile-up event weight
588 <  double scaleFactor = 1.00;
589 <  if(doPileupReweighting_ && datasetType_ != "data")
590 <    scaleFactor = puWeight_->at (events->at (0).numTruePV);
591 <
592 <  cTauScaleFactor_ = 1.0;
593 < #ifdef DISPLACED_SUSY
533 <  if (datasetType_ == "signalMC")
534 <    cTauScaleFactor_ = cTauWeight_->at (event);
535 < #endif
536 <  scaleFactor *= cTauScaleFactor_;
588 >  if(doPileupReweighting_ && datasetType_ != "data") masterScaleFactor *= puWeight_->at (events->at (0).numTruePV);
589 >
590 >  stopCTauScaleFactor_ = 1.0;
591 >  if (datasetType_ == "signalMC" && regex_match (dataset_, regex ("stop.*to.*_.*mm.*")))
592 >    stopCTauScaleFactor_ = stopCTauWeight_->at (event);
593 >  masterScaleFactor *= stopCTauScaleFactor_;
594  
595    //loop over all channels
596  
# Line 552 | Line 609 | OSUAnalysis::analyze (const edm::Event &
609  
610      //loop over all cuts
611  
555
556
612      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
613        cut currentCut = currentChannel.cuts.at(currentCutIndex);
614  
# Line 576 | Line 631 | OSUAnalysis::analyze (const edm::Event &
631          else if(currentObject == "muons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"muons");
632  
633          else if(currentObject == "secondary muons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"secondary muons");
634 +        else if(currentObject == "secondary electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"secondary electrons");
635          else if(currentObject == "electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"electrons");
636          else if(currentObject == "events") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,events.product(),"events");
637          else if(currentObject == "taus") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),"taus");
# Line 587 | Line 643 | OSUAnalysis::analyze (const edm::Event &
643          else if(currentObject == "bxlumis") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,bxlumis.product(),"bxlumis");
644          else if(currentObject == "photons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"photons");
645          else if(currentObject == "superclusters") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,superclusters.product(),"superclusters");
646 +        else if(currentObject == "trigobjs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,trigobjs.product(),"trigobjs");
647 +
648  
649  
650          else if(currentObject == "muon-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
# Line 599 | Line 657 | OSUAnalysis::analyze (const edm::Event &
657                                                                     cumulativeFlags.at("secondary muons").at(flagsForPairCutsIndex), \
658                                                                     "muon-secondary muon pairs");
659  
660 +        else if(currentObject == "electron-secondary electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
661 +                                                                   cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
662 +                                                                   cumulativeFlags.at("secondary electrons").at(flagsForPairCutsIndex), \
663 +                                                                   "electron-secondary electron pairs");
664 +
665          else if(currentObject == "electron-electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
666                                                                             cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
667                                                                             cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
# Line 607 | Line 670 | OSUAnalysis::analyze (const edm::Event &
670                                                                         cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
671                                                                         cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
672                                                                         "electron-muon pairs");
673 <        else if(currentObject == "track-event pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(),
674 <                                                                     cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
675 <                                                                     cumulativeFlags.at("events").at(flagsForPairCutsIndex),
676 <                                                                     "track-event pairs");
677 <        else if(currentObject == "electron-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),
678 <                                                                        cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
679 <                                                                        cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
680 <                                                                        "electron-track pairs");
681 <        else if(currentObject == "muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),
682 <                                                                    cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
683 <                                                                    cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
684 <                                                                    "muon-track pairs");
685 <        else if(currentObject == "muon-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),
686 <                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
687 <                                                                  cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
688 <                                                                  "muon-tau pairs");
689 <        else if(currentObject == "tau-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),
690 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
691 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
692 <                                                                 "tau-tau pairs");
693 <        else if(currentObject == "tau-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),
673 >        else if(currentObject == "jet-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), \
674 >                                                                           cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
675 >                                                                           cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
676 >                                                                           "jet-jet pairs");
677 >        else if(currentObject == "electron-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), \
678 >                                                                       cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
679 >                                                                       cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
680 >                                                                       "electron-jet pairs");
681 >        else if(currentObject == "muon-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), \
682 >                                                                       cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
683 >                                                                       cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
684 >                                                                       "muon-jet pairs");
685 >        else if(currentObject == "track-event pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(),
686 >                                                                     cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
687 >                                                                     cumulativeFlags.at("events").at(flagsForPairCutsIndex),
688 >                                                                     "track-event pairs");
689 >        else if(currentObject == "electron-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),
690 >                                                                        cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
691 >                                                                        cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
692 >                                                                        "electron-track pairs");
693 >        else if(currentObject == "muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),
694 >                                                                    cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
695 >                                                                    cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
696 >                                                                    "muon-track pairs");
697 >        else if(currentObject == "muon-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),
698 >                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
699 >                                                                  cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
700 >                                                                  "muon-tau pairs");
701 >        else if(currentObject == "tau-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),
702 >                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
703 >                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
704 >                                                                 "tau-tau pairs");
705 >        else if(currentObject == "tau-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),
706                                                                   cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
707                                                                   cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
708                                                                   "tau-track pairs");
709 <        
710 <        
709 >        else if(currentObject == "electron-trigobj pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),trigobjs.product(),
710 >                                                                          cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
711 >                                                                          cumulativeFlags.at("trigobjs").at(flagsForPairCutsIndex),
712 >                                                                          "electron-trigobj pairs");
713 >        else if(currentObject == "muon-trigobj pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),trigobjs.product(),
714 >                                                                      cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
715 >                                                                      cumulativeFlags.at("trigobjs").at(flagsForPairCutsIndex),
716 >                                                                      "muon-trigobj pairs");
717 >
718 >        if(currentObject == "stops" && datasetType_ == "signalMC") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,stops.product(),"stops");
719        }
720  
721  
# Line 655 | Line 738 | OSUAnalysis::analyze (const edm::Event &
738        int numberPassing = 0;
739  
740        for (uint object = 0; object != cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).size() ; object++){
741 <        if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object)) numberPassing++;
741 >        if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object)) numberPassing++;
742        }
743        bool cutDecision = evaluateComparison(numberPassing,currentCut.eventComparativeOperator,currentCut.numberRequired);
744        cutFlows_.at(currentChannelIndex)->at (currentCut.name) = cutDecision;
# Line 663 | Line 746 | OSUAnalysis::analyze (const edm::Event &
746  
747      }
748  
749 <    //     if(datasetType_ != "data") {
667 <    //       scaleFactor *= muonSFWeight_->at (chosenMuon ()->eta);
668 <    //       scaleFactor *= electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
669 <    //     }
670 <
671 <    cutFlows_.at(currentChannelIndex)->fillCutFlow(scaleFactor);
749 >    double scaleFactor = masterScaleFactor;
750  
751 +    if(applyLeptonSF_ && datasetType_ != "data"){
752 +      if (chosenMuon ()) scaleFactor *= muonSFWeight_->at (chosenMuon ()->eta);
753 +      if (chosenElectron ()) scaleFactor *= electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
754 +    }
755  
756 +    cutFlows_.at(currentChannelIndex)->fillCutFlow(scaleFactor);
757  
758      if(!eventPassedAllCuts)continue;
759  
760      if (printEventInfo_) {
761 <      // Write information about event to screen, for testing purposes.  
762 <      cout << "Event passed all cuts in channel " <<  currentChannel.name
763 <           << ": run="  << events->at(0).run
764 <           << "  lumi=" << events->at(0).lumi
765 <           << "  event=" << events->at(0).evt
766 <           << endl;  
761 >      // Write information about event to screen, for testing purposes.
762 >      cout << "Event passed all cuts in channel " <<  currentChannel.name
763 >           << ": run="  << events->at(0).run
764 >           << "  lumi=" << events->at(0).lumi
765 >           << "  event=" << events->at(0).evt
766 >           << endl;
767      }
768  
686
769      //filling histograms
770      for (uint histogramIndex = 0; histogramIndex != histograms.size(); histogramIndex++){
771        histogram currentHistogram = histograms.at(histogramIndex);
# Line 693 | Line 775 | OSUAnalysis::analyze (const edm::Event &
775          histo = oneDHists_.at(currentChannelIndex).at(currentHistogram.name);
776  
777          if(currentHistogram.inputCollection == "jets") fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").back(),scaleFactor);
778 <        else if(currentHistogram.inputCollection == "muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),scaleFactor);
779 <        else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").back(),scaleFactor);
778 >        else if(currentHistogram.inputCollection == "muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),scaleFactor);
779 >        else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").back(),scaleFactor);
780 >        else if(currentHistogram.inputCollection == "secondary electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").back(),scaleFactor);
781          else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
782                                                                                         cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
783                                                                                         cumulativeFlags.at("muon-muon pairs").back(),scaleFactor);
# Line 705 | Line 788 | OSUAnalysis::analyze (const edm::Event &
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(),scaleFactor);
791 +        else if(currentHistogram.inputCollection == "jet-jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),\
792 +                                                                                               cumulativeFlags.at("jets").back(),cumulativeFlags.at("jets").back(),\
793 +                                                                                               cumulativeFlags.at("jet-jet pairs").back(),scaleFactor);
794 +        else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
795 +                                                                                       cumulativeFlags.at("electrons").back(),cumulativeFlags.at("secondary electrons").back(), \
796 +                                                                                       cumulativeFlags.at("electron-secondary electron pairs").back(),scaleFactor);
797          else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(), \
798 <                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(),
799 <                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
800 <        else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),        
801 <                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),  
802 <                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);      
803 <        else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),        
804 <                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),  
805 <                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);      
806 <        else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),    
807 <                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),      
808 <                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);  
809 <        else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),      
810 <                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),        
811 <                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);    
812 <        else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
798 >                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(),
799 >                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
800 >        else if(currentHistogram.inputCollection == "electron-jet pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),jets.product(), \
801 >                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("jets").back(),
802 >                                                                                           cumulativeFlags.at("electron-jet pairs").back(),scaleFactor);
803 >        else if(currentHistogram.inputCollection == "muon-jet pairs") fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(), \
804 >                                                                                           cumulativeFlags.at("muons").back(),cumulativeFlags.at("jets").back(),
805 >                                                                                           cumulativeFlags.at("muon-jet pairs").back(),scaleFactor);
806 >        else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),
807 >                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),
808 >                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);
809 >        else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),
810 >                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),
811 >                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);
812 >        else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),
813 >                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),
814 >                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);
815 >        else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),
816 >                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),
817 >                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);
818 >        else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
819                                                                                       cumulativeFlags.at("taus").back(),cumulativeFlags.at("tracks").back(),
820                                                                                       cumulativeFlags.at("tau-track pairs").back(),scaleFactor);
821 +        else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),trigobjs.product(),
822 +                                                                                              cumulativeFlags.at("electrons").back(),cumulativeFlags.at("trigobjs").back(),
823 +                                                                                              cumulativeFlags.at("electron-trigobj pairs").back(),scaleFactor);
824 +        else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill1DHistogram(histo,currentHistogram, muons.product(),trigobjs.product(),
825 +                                                                                          cumulativeFlags.at("muons").back(),cumulativeFlags.at("trigobjs").back(),
826 +                                                                                          cumulativeFlags.at("muon-trigobj pairs").back(),scaleFactor);
827  
828          else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),scaleFactor);
829          else if(currentHistogram.inputCollection == "taus") fill1DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),scaleFactor);
# Line 734 | Line 835 | OSUAnalysis::analyze (const edm::Event &
835          else if(currentHistogram.inputCollection == "bxlumis") fill1DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),scaleFactor);
836          else if(currentHistogram.inputCollection == "photons") fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),scaleFactor);
837          else if(currentHistogram.inputCollection == "superclusters") fill1DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),scaleFactor);
838 +        else if(currentHistogram.inputCollection == "trigobjs") fill1DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").back(),scaleFactor);
839 +        else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill1DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").back(),scaleFactor);
840        }
841        else if(currentHistogram.inputVariables.size() == 2){
842          TH2D* histo;
# Line 745 | Line 848 | OSUAnalysis::analyze (const edm::Event &
848          else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
849                                                                                         cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
850                                                                                         cumulativeFlags.at("muon-muon pairs").back(),scaleFactor);
851 <        else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
851 >        else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
852                                                                                         cumulativeFlags.at("muons").back(),cumulativeFlags.at("secondary muons").back(), \
853                                                                                         cumulativeFlags.at("muon-secondary muon pairs").back(),scaleFactor);
854          else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").back(),scaleFactor);
855 +        else if(currentHistogram.inputCollection == "secondary electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").back(),scaleFactor);
856          else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
857                                                                                                 cumulativeFlags.at("electrons").back(),cumulativeFlags.at("electrons").back(), \
858                                                                                                 cumulativeFlags.at("electron-electron pairs").back(),scaleFactor);
859 +        else if(currentHistogram.inputCollection == "jet-jet pairs") fill2DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
860 +                                                                                               cumulativeFlags.at("jets").back(),cumulativeFlags.at("jets").back(), \
861 +                                                                                               cumulativeFlags.at("jet-jet pairs").back(),scaleFactor);
862 +        else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
863 +                                                                                       cumulativeFlags.at("electrons").back(),cumulativeFlags.at("secondary electrons").back(), \
864 +                                                                                       cumulativeFlags.at("electron-secondary electron pairs").back(),scaleFactor);
865          else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(), \
866 <                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(), \
867 <                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
868 <        else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),        
869 <                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),          
870 <                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);      
871 <        else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),        
872 <                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),          
873 <                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);      
874 <        else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),    
875 <                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),      
876 <                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);  
877 <        else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),      
878 <                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),        
879 <                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);    
880 <        else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
866 >                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(), \
867 >                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
868 >        else if(currentHistogram.inputCollection == "electron-jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
869 >                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("jets").back(), \
870 >                                                                                           cumulativeFlags.at("electron-jet pairs").back(),scaleFactor);
871 >        else if(currentHistogram.inputCollection == "muon-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
872 >                                                                                           cumulativeFlags.at("muons").back(),cumulativeFlags.at("jets").back(), \
873 >                                                                                           cumulativeFlags.at("muon-jet pairs").back(),scaleFactor);
874 >        else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),
875 >                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),
876 >                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);
877 >        else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),
878 >                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),
879 >                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);
880 >        else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),
881 >                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),
882 >                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);
883 >        else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),
884 >                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),
885 >                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);
886 >        else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
887                                                                                       cumulativeFlags.at("taus").back(),cumulativeFlags.at("tracks").back(),
888                                                                                       cumulativeFlags.at("tau-track pairs").back(),scaleFactor);
889 <        else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),scaleFactor);
889 >        else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),trigobjs.product(),
890 >                                                                                              cumulativeFlags.at("electrons").back(),cumulativeFlags.at("trigobjs").back(),
891 >                                                                                              cumulativeFlags.at("electron-trigobj pairs").back(),scaleFactor);
892 >        else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill2DHistogram(histo,currentHistogram,muons.product(),trigobjs.product(),
893 >                                                                                          cumulativeFlags.at("muons").back(),cumulativeFlags.at("trigobjs").back(),
894 >                                                                                          cumulativeFlags.at("muon-trigobj pairs").back(),scaleFactor);
895 >        else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),scaleFactor);
896          else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),scaleFactor);
897          else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").back(),scaleFactor);
898          else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").back(),scaleFactor);
899 <        else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
900 <                                                                                         cumulativeFlags.at("tracks").back(),cumulativeFlags.at("events").back(),
901 <                                                                                         cumulativeFlags.at("track-event pairs").back(),scaleFactor);  
899 >        else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
900 >                                                                                         cumulativeFlags.at("tracks").back(),cumulativeFlags.at("events").back(),
901 >                                                                                         cumulativeFlags.at("track-event pairs").back(),scaleFactor);
902          else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").back(),scaleFactor);
903          else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").back(),scaleFactor);
904          else if(currentHistogram.inputCollection == "primaryvertexs") fill2DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").back(),scaleFactor);
905          else if(currentHistogram.inputCollection == "bxlumis") fill2DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),scaleFactor);
906          else if(currentHistogram.inputCollection == "photons") fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),scaleFactor);
907          else if(currentHistogram.inputCollection == "superclusters") fill2DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),scaleFactor);
908 +        else if(currentHistogram.inputCollection == "trigobjs") fill2DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").back(),scaleFactor);
909 +        else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill2DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").back(),scaleFactor);
910        }
911      }
912  
# Line 793 | Line 917 | OSUAnalysis::analyze (const edm::Event &
917  
918        string currentObject = objectsToPlot.at(currentObjectIndex);
919  
920 <      string objectToPlot = "";  
920 >      string objectToPlot = "";
921  
922 <      // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().  
923 <      if(currentObject == "muon-muon pairs") objectToPlot = "dimuonPairs";
924 <      else if(currentObject == "electron-electron pairs") objectToPlot = "dielectronPairs";
925 <      else if(currentObject == "electron-muon pairs")     objectToPlot = "electronMuonPairs";
926 <      else if(currentObject == "electron-track pairs")    objectToPlot = "electronTrackPairs";
927 <      else if(currentObject == "muon-track pairs")        objectToPlot = "muonTrackPairs";      
928 <      else if(currentObject == "muon-tau pairs")          objectToPlot = "muonTauPairs";        
929 <      else if(currentObject == "tau-tau pairs")           objectToPlot = "ditauPairs";
930 <      else if(currentObject == "tau-track pairs")         objectToPlot = "tauTrackPairs";
931 <      else if(currentObject == "track-event pairs")       objectToPlot = "trackEventPairs";  
932 <      else if(currentObject == "muon-secondary muon pairs")       objectToPlot = "muonSecondaryMuonPairs";  
933 <      else if(currentObject == "secondary muons")         objectToPlot = "secondaryMuons";  
922 >      // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().
923 >      if(currentObject == "muon-muon pairs")                         objectToPlot = "dimuonPairs";
924 >      else if(currentObject == "electron-electron pairs")            objectToPlot = "dielectronPairs";
925 >      else if(currentObject == "electron-muon pairs")                objectToPlot = "electronMuonPairs";
926 >      else if(currentObject == "electron-jet pairs")                 objectToPlot = "electronJetPairs";
927 >      else if(currentObject == "muon-jet pairs")                     objectToPlot = "muonJetPairs";
928 >      else if(currentObject == "jet-jet pairs")            objectToPlot = "dijetPairs";
929 >      else if(currentObject == "electron-track pairs")               objectToPlot = "electronTrackPairs";
930 >      else if(currentObject == "muon-track pairs")                   objectToPlot = "muonTrackPairs";
931 >      else if(currentObject == "muon-tau pairs")                     objectToPlot = "muonTauPairs";
932 >      else if(currentObject == "tau-tau pairs")                      objectToPlot = "ditauPairs";
933 >      else if(currentObject == "tau-track pairs")                    objectToPlot = "tauTrackPairs";
934 >      else if(currentObject == "track-event pairs")                  objectToPlot = "trackEventPairs";
935 >      else if(currentObject == "muon-secondary muon pairs")          objectToPlot = "muonSecondaryMuonPairs";
936 >      else if(currentObject == "secondary muons")                    objectToPlot = "secondaryMuons";
937 >      else if(currentObject == "electron-secondary electron pairs")  objectToPlot = "electronSecondaryElectronPairs";
938 >      else if(currentObject == "secondary electrons")                objectToPlot = "secondaryElectrons";
939 >      else if(currentObject == "electron-trigobj pairs")             objectToPlot = "electronTrigobjPairs";
940 >      else if(currentObject == "muon-trigobj pairs")                 objectToPlot = "muonTrigobjPairs";
941        else objectToPlot = currentObject;
942  
943        string tempCurrentObject = objectToPlot;
944 <      tempCurrentObject.at(0) = toupper(tempCurrentObject.at(0));  
944 >      tempCurrentObject.at(0) = toupper(tempCurrentObject.at(0));
945        string histoName = "num" + tempCurrentObject;
946  
947        //set position of primary vertex in event, in order to calculate quantities relative to it
948 <      if(std::find(objectsToCut.begin(), objectsToCut.end(), currentObject) != objectsToCut.end()) {
948 >      if(find(objectsToCut.begin(), objectsToCut.end(), currentObject) != objectsToCut.end()) {
949          vector<bool> lastCutFlags = cumulativeFlags.at(currentObject).back();
950 <        int numToPlot = 0;
950 >        int numToPlot = 0;
951          for (uint currentFlag = 0; currentFlag != lastCutFlags.size(); currentFlag++){
952            if(lastCutFlags.at(currentFlag)) numToPlot++;
953          }
# Line 826 | Line 957 | OSUAnalysis::analyze (const edm::Event &
957          }
958          else {
959            oneDHists_.at(currentChannelIndex).at(histoName)->Fill(numToPlot,scaleFactor);
960 <        }
960 >        }
961        }
962        else if(objectToPlot == "jets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(jets->size(),scaleFactor);
963        else if(objectToPlot == "muons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size(),scaleFactor);
# Line 834 | Line 965 | OSUAnalysis::analyze (const edm::Event &
965        else if(objectToPlot == "dimuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*(muons->size()-1)/2,scaleFactor);
966        else if(objectToPlot == "muonSecondaryMuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*(muons->size()-1)/2,scaleFactor);
967        else if(objectToPlot == "electrons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size(),scaleFactor);
968 +      else if(objectToPlot == "secondaryElectrons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size(),scaleFactor);
969        else if(objectToPlot == "dielectronPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*(electrons->size()-1)/2,scaleFactor);
970 +      else if(objectToPlot == "electronSecondaryElectronPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*(electrons->size()-1)/2,scaleFactor);
971        else if(objectToPlot == "electronMuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*muons->size(),scaleFactor);
972 +      else if(objectToPlot == "electronJetPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*jets->size(),scaleFactor);
973 +      else if(objectToPlot == "muonJetPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*jets->size(),scaleFactor);
974        else if(objectToPlot == "electronTrackPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*tracks->size(),scaleFactor);
975 +      else if(objectToPlot == "electronTrigobjPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*trigobjs->size(),scaleFactor);
976 +      else if(objectToPlot == "muonTrigobjPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*trigobjs->size(),scaleFactor);
977        else if(objectToPlot == "events") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(events->size(),scaleFactor);
978        else if(objectToPlot == "taus") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(taus->size(),scaleFactor);
979        else if(objectToPlot == "mets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(mets->size(),scaleFactor);
# Line 846 | Line 983 | OSUAnalysis::analyze (const edm::Event &
983        else if(objectToPlot == "bxlumis") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(bxlumis->size(),scaleFactor);
984        else if(objectToPlot == "photons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(photons->size(),scaleFactor);
985        else if(objectToPlot == "superclusters") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(superclusters->size(),scaleFactor);
986 +      else if(objectToPlot == "trigobjs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(trigobjs->size(),scaleFactor);
987        else if(objectToPlot == "primaryvertexs"){
988          oneDHists_.at(currentChannelIndex).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
989          oneDHists_.at(currentChannelIndex).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
990 <      }
990 >      }
991 >      if(objectToPlot == "stops" && datasetType_ == "signalMC") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(stops->size(),scaleFactor);
992  
993 <    } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
993 >    } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++)
994  
995    } //end loop over channel
996  
997 <  masterCutFlow_->fillCutFlow(scaleFactor);
997 >  masterCutFlow_->fillCutFlow(masterScaleFactor);
998  
999   } // end void OSUAnalysis::analyze (const edm::Event &event, const edm::EventSetup &setup)
1000  
# Line 872 | Line 1011 | OSUAnalysis::evaluateComparison (double
1011    else if(comparison == "==") return testValue == cutValue;
1012    else if(comparison == "=") return testValue == cutValue;
1013    else if(comparison == "!=") return testValue != cutValue;
1014 <  else {std::cout << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1014 >  else {cout << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1015 >
1016 > }
1017 >
1018 > bool
1019 > OSUAnalysis::evaluateComparison (string testValue, string comparison, string cutValue){
1020 >
1021 >
1022 >  if(comparison == ">")       return testValue >  cutValue;
1023 >  else if(comparison == ">=") return testValue >= cutValue;
1024 >  else if(comparison == "<")  return testValue <  cutValue;
1025 >  else if(comparison == "<=") return testValue <= cutValue;
1026 >  else if(comparison == "==") return testValue == cutValue;
1027 >  else if(comparison == "=") return testValue == cutValue;
1028 >  else if(comparison == "!=") return testValue != cutValue;
1029 >  else {cout << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1030  
1031   }
1032  
# Line 886 | Line 1040 | OSUAnalysis::evaluateTriggers (vector<st
1040        if(trigger->pass != 1) continue;
1041        for(uint triggerName = 0; triggerName != triggersToTest.size(); triggerName++)
1042          {
1043 <          if(trigger->name.find(triggersToTest.at(triggerName))!=std::string::npos){
1043 >          if(trigger->name.find(triggersToTest.at(triggerName))!=string::npos){
1044              triggerDecision = true;
1045            }
1046          }
# Line 895 | Line 1049 | OSUAnalysis::evaluateTriggers (vector<st
1049  
1050   }
1051  
1052 < std::vector<std::string>
1052 > vector<string>
1053   OSUAnalysis::splitString (string inputString){
1054  
1055 <  std::stringstream stringStream(inputString);
1056 <  std::istream_iterator<std::string> begin(stringStream);
1057 <  std::istream_iterator<std::string> end;
1058 <  std::vector<std::string> stringVector(begin, end);
1055 >  stringstream stringStream(inputString);
1056 >  istream_iterator<string> begin(stringStream);
1057 >  istream_iterator<string> end;
1058 >  vector<string> stringVector(begin, end);
1059    return stringVector;
1060  
1061   }
1062  
1063  
1064   void OSUAnalysis::getTwoObjs(string tempInputCollection, string& obj1, string& obj2) {
1065 <  // Set two object strings from the tempInputCollection string,
1066 <  // For example, if tempInputCollection is "electron-muon pairs",
1067 <  // then obj1 = "electrons" and obj2 = "muons".  
1068 <  // Note that the objects have an "s" appended.  
1065 >  // Set two object strings from the tempInputCollection string,
1066 >  // For example, if tempInputCollection is "electron-muon pairs",
1067 >  // then obj1 = "electrons" and obj2 = "muons".
1068 >  // Note that the objects have an "s" appended.
1069  
1070    int dashIndex = tempInputCollection.find("-");
1071    int spaceIndex = tempInputCollection.find_last_of(" ");
1072    int secondWordLength = spaceIndex - dashIndex;
1073 <  obj1 = tempInputCollection.substr(0,dashIndex) + "s";  
1073 >  obj1 = tempInputCollection.substr(0,dashIndex) + "s";
1074    obj2 = tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s";
1075 <  
1076 < }
1075 >
1076 > }
1077  
1078  
1079   string OSUAnalysis::getObjToGet(string obj) {
1080    // Return the string corresponding to the object to get for the given obj string.
1081 <  // Right now this only handles the case in which obj contains "secondary",
1082 <  // e.g, "secondary muons".  
1083 <  // Note that "s" is NOT appended.  
930 <  
931 <  if (obj.find("secondary")==std::string::npos) return obj;  // "secondary" is not found  
932 <  int firstSpaceIndex = obj.find_first_of(" ");  
933 <  return obj.substr(firstSpaceIndex+1,obj.length()-1);
1081 >  // Right now this only handles the case in which obj contains "secondary",
1082 >  // e.g, "secondary muons".
1083 >  // Note that "s" is NOT appended.
1084  
1085 < }  
1085 >  if (obj.find("secondary")==string::npos) return obj;  // "secondary" is not found
1086 >  int firstSpaceIndex = obj.find_first_of(" ");
1087 >  return obj.substr(firstSpaceIndex+1,obj.length()-1);
1088  
1089 + }
1090  
1091  
1092 + //!jet valueLookup
1093   double
1094 < OSUAnalysis::valueLookup (const BNjet* object, string variable, string function){
1094 > OSUAnalysis::valueLookup (const BNjet* object, string variable, string function, string &stringValue){
1095  
1096    double value = 0.0;
1097    if(variable == "energy") value = object->energy;
# Line 1057 | Line 1211 | OSUAnalysis::valueLookup (const BNjet* o
1211    else if(variable == "puJetId_loose_cutbased") value = object->puJetId_loose_cutbased;
1212  
1213  
1214 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1214 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1215  
1216    value = applyFunction(function, value);
1217  
# Line 1065 | Line 1219 | OSUAnalysis::valueLookup (const BNjet* o
1219   }
1220  
1221  
1222 <
1222 > //!muon valueLookup
1223   double
1224 < OSUAnalysis::valueLookup (const BNmuon* object, string variable, string function){
1224 > OSUAnalysis::valueLookup (const BNmuon* object, string variable, string function, string &stringValue){
1225  
1226    double value = 0.0;
1227    if(variable == "energy") value = object->energy;
# Line 1232 | Line 1386 | OSUAnalysis::valueLookup (const BNmuon*
1386      if (met)
1387        {
1388          TLorentzVector p1 (object->px, object->py, object->pz, object->energy),
1389 <          p2 (met->px, met->py, 0.0, met->pt);
1389 >          p2 (met->px, met->py, 0.0, met->pt);
1390  
1391          value = (p1 + p2).Mt ();
1392        }
# Line 1352 | Line 1506 | OSUAnalysis::valueLookup (const BNmuon*
1506      value = object->isGlobalMuon > 0                \
1507        && object->isPFMuon > 0                        \
1508        && object->normalizedChi2 < 10                \
1509 <                                  && object->numberOfValidMuonHits > 0        \
1509 >                                  && object->numberOfValidMuonHits > 0        \
1510        && object->numberOfMatchedStations > 1        \
1511        && fabs(object->correctedD0Vertex) < 0.2        \
1512        && fabs(object->correctedDZ) < 0.5        \
# Line 1362 | Line 1516 | OSUAnalysis::valueLookup (const BNmuon*
1516    else if(variable == "tightIDdisplaced"){
1517      value = object->isGlobalMuon > 0                \
1518        && object->normalizedChi2 < 10                \
1519 <                                  && object->numberOfValidMuonHits > 0        \
1519 >                                  && object->numberOfValidMuonHits > 0        \
1520        && object->numberOfMatchedStations > 1        \
1521        && object->numberOfValidPixelHits > 0        \
1522        && object->numberOfLayersWithMeasurement > 5;
1523    }
1524  
1525 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
1525 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
1526  
1527    else if(variable == "genMatchedPdgId"){
1528      int index = getGenMatchedParticleIndex(object);
# Line 1389 | Line 1543 | OSUAnalysis::valueLookup (const BNmuon*
1543    else if(variable == "genMatchedMotherIdReverse"){
1544      int index = getGenMatchedParticleIndex(object);
1545      if(index == -1) value = 23;
1546 <    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
1546 >    else value = 23 - getPdgIdBinValue(mcparticles->at(index).motherId);
1547    }
1548    else if(variable == "genMatchedGrandmotherId"){
1549      int index = getGenMatchedParticleIndex(object);
# Line 1401 | Line 1555 | OSUAnalysis::valueLookup (const BNmuon*
1555      }
1556      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1557    }
1558 +  else if(variable == "genMatchedGrandmotherIdReverse"){
1559 +    int index = getGenMatchedParticleIndex(object);
1560 +    if(index == -1) value = 23;
1561 +    else if(fabs(mcparticles->at(index).motherId) == 15){
1562 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
1563 +      if(motherIndex == -1) value = 23;
1564 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
1565 +    }
1566 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1567 +  }
1568  
1569  
1570  
1571 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1571 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1572  
1573    value = applyFunction(function, value);
1574  
1575    return value;
1576   }
1577  
1578 <
1578 > //!electron valueLookup
1579   double
1580 < OSUAnalysis::valueLookup (const BNelectron* object, string variable, string function){
1580 > OSUAnalysis::valueLookup (const BNelectron* object, string variable, string function, string &stringValue){
1581  
1582    double value = 0.0;
1583    if(variable == "energy") value = object->energy;
# Line 1583 | Line 1747 | OSUAnalysis::valueLookup (const BNelectr
1747      if (met)
1748        {
1749          TLorentzVector p1 (object->px, object->py, object->pz, object->energy),
1750 <          p2 (met->px, met->py, 0.0, met->pt);
1750 >          p2 (met->px, met->py, 0.0, met->pt);
1751  
1752          value = (p1 + p2).Mt ();
1753        }
# Line 1750 | Line 1914 | OSUAnalysis::valueLookup (const BNelectr
1914    }
1915  
1916  
1917 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
1917 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
1918  
1919    else if(variable == "genMatchedPdgId"){
1920      int index = getGenMatchedParticleIndex(object);
# Line 1784 | Line 1948 | OSUAnalysis::valueLookup (const BNelectr
1948      }
1949      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1950    }
1951 +  else if(variable == "genMatchedGrandmotherIdReverse"){
1952 +    int index = getGenMatchedParticleIndex(object);
1953 +    if(index == -1) value = 23;
1954 +    else if(fabs(mcparticles->at(index).motherId) == 15){
1955 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
1956 +      if(motherIndex == -1) value = 23;
1957 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
1958 +    }
1959 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
1960 +  }
1961  
1962  
1963  
1964 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1964 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1965  
1966    value = applyFunction(function, value);
1967  
1968    return value;
1969   }
1970  
1971 <
1971 > //!event valueLookup
1972   double
1973 < OSUAnalysis::valueLookup (const BNevent* object, string variable, string function){
1973 > OSUAnalysis::valueLookup (const BNevent* object, string variable, string function, string &stringValue){
1974  
1975    double value = 0.0;
1976  
# Line 1871 | Line 2045 | OSUAnalysis::valueLookup (const BNevent*
2045        value = 1.0;
2046    }
2047    else if(variable == "muonScaleFactor"){
2048 <    if(datasetType_ != "data")
2049 <      //      value = muonSFWeight_->at (chosenMuon ()->eta);
1876 <      value = 1.0;
2048 >    if(datasetType_ != "data" && applyLeptonSF_)
2049 >      value = muonSFWeight_->at (chosenMuon ()->eta);
2050      else
2051        value = 1.0;
2052    }
2053    else if(variable == "electronScaleFactor"){
2054 <    if(datasetType_ != "data")
2055 <      //      value = electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
1883 <      value = 1.0;
2054 >    if(datasetType_ != "data" && applyLeptonSF_)
2055 >      value = electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
2056      else
2057        value = 1.0;
2058    }
2059 <  else if(variable == "cTauScaleFactor")
2060 <    value = cTauScaleFactor_;
2059 >  else if(variable == "stopCTauScaleFactor")
2060 >    value = stopCTauScaleFactor_;
2061  
2062 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2062 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2063  
2064    value = applyFunction(function, value);
2065  
2066    return value;
2067   }
2068  
2069 + //!tau valueLookup
2070   double
2071 < OSUAnalysis::valueLookup (const BNtau* object, string variable, string function){
2071 > OSUAnalysis::valueLookup (const BNtau* object, string variable, string function, string &stringValue){
2072  
2073    double value = 0.0;
2074  
# Line 1941 | Line 2114 | OSUAnalysis::valueLookup (const BNtau* o
2114  
2115  
2116  
2117 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2117 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2118  
2119    else if(variable == "genMatchedPdgId"){
2120      int index = getGenMatchedParticleIndex(object);
# Line 1974 | Line 2147 | OSUAnalysis::valueLookup (const BNtau* o
2147      }
2148      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2149    }
2150 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2151 +    int index = getGenMatchedParticleIndex(object);
2152 +    if(index == -1) value = 23;
2153 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2154 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2155 +      if(motherIndex == -1) value = 23;
2156 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2157 +    }
2158 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2159 +  }
2160  
2161  
2162 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2162 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2163  
2164    value = applyFunction(function, value);
2165  
2166    return value;
2167   }
2168  
2169 + //!met valueLookup
2170   double
2171 < OSUAnalysis::valueLookup (const BNmet* object, string variable, string function){
2171 > OSUAnalysis::valueLookup (const BNmet* object, string variable, string function, string &stringValue){
2172  
2173    double value = 0.0;
2174  
# Line 2048 | Line 2232 | OSUAnalysis::valueLookup (const BNmet* o
2232    else if(variable == "pfT1jet10pt") value = object->pfT1jet10pt;
2233    else if(variable == "pfT1jet10phi") value = object->pfT1jet10phi;
2234  
2235 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2235 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2236  
2237    value = applyFunction(function, value);
2238  
2239    return value;
2240   }
2241  
2242 + //!track valueLookup
2243   double
2244 < OSUAnalysis::valueLookup (const BNtrack* object, string variable, string function){
2244 > OSUAnalysis::valueLookup (const BNtrack* object, string variable, string function, string &stringValue){
2245  
2246    double value = 0.0;
2247    double pMag = sqrt(object->pt * object->pt +
2248 <                     object->pz * object->pz);
2249 <  
2248 >                     object->pz * object->pz);
2249 >
2250    if(variable == "pt") value = object->pt;
2251    else if(variable == "px") value = object->px;
2252    else if(variable == "py") value = object->py;
# Line 2082 | Line 2267 | OSUAnalysis::valueLookup (const BNtrack*
2267  
2268  
2269    //additional BNs info for disappTrks
2085  else if(variable == "isGoodPtResolution") value = object->isGoodPtResolution;
2270    else if(variable == "caloEMDeltaRp3") value = object->caloEMDeltaRp3;
2271    else if(variable == "caloHadDeltaRp3") value = object->caloHadDeltaRp3;
2272    else if(variable == "caloEMDeltaRp4") value = object->caloEMDeltaRp4;
# Line 2092 | Line 2276 | OSUAnalysis::valueLookup (const BNtrack*
2276    else if(variable == "nHitsMissingOuter") value = object->nHitsMissingOuter;
2277    else if(variable == "nHitsMissingInner") value = object->nHitsMissingInner;
2278    else if(variable == "nHitsMissingMiddle") value = object->nHitsMissingMiddle;
2279 <  
2279 >
2280  
2281    //user defined variables
2282    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;
2283    else if(variable == "dZwrtBS") value = object->dZ - events->at(0).BSz;
2284    else if(variable == "caloTotDeltaRp5")            value =  (object->caloHadDeltaRp5 + object->caloEMDeltaRp5);
2285    else if(variable == "caloTotDeltaRp5ByP")         value = ((object->caloHadDeltaRp5 + object->caloEMDeltaRp5)/pMag);
2286 <  else if(variable == "caloTotDeltaRp5RhoCorr")     value = getTrkCaloTotRhoCorr(object);  
2287 <  else if(variable == "caloTotDeltaRp5ByPRhoCorr")  value = getTrkCaloTotRhoCorr(object) / pMag;  
2286 >  else if(variable == "caloTotDeltaRp5RhoCorr")     value = getTrkCaloTotRhoCorr(object);
2287 >  else if(variable == "caloTotDeltaRp5ByPRhoCorr")  value = getTrkCaloTotRhoCorr(object) / pMag;
2288    else if(variable == "isIso")                      value = getTrkIsIso(object, tracks.product());
2289    else if(variable == "isMatchedDeadEcal")          value = getTrkIsMatchedDeadEcal(object);
2290    else if(variable == "ptErrorByPt")                value = (object->ptError/object->pt);
2291    else if(variable == "ptError")                    value = object->ptError;
2292    else if(variable == "ptRes")                      value = getTrkPtRes(object);
2293 <  else if (variable == "d0wrtPV"){      
2294 <    double vx = object->vx - chosenVertex ()->x,        
2295 <      vy = object->vy - chosenVertex ()->y,      
2296 <      px = object->px,  
2297 <      py = object->py,  
2298 <      pt = object->pt;  
2299 <    value = (-vx * py + vy * px) / pt;  
2300 <  }      
2301 <  else if (variable == "dZwrtPV"){      
2302 <    double vx = object->vx - chosenVertex ()->x,        
2303 <      vy = object->vy - chosenVertex ()->y,      
2304 <      vz = object->vz - chosenVertex ()->z,      
2305 <      px = object->px,  
2306 <      py = object->py,  
2307 <      pz = object->pz,  
2308 <      pt = object->pt;  
2309 <    value = vz - (vx * px + vy * py)/pt * (pz/pt);      
2310 <  }    
2311 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2293 >  else if (variable == "d0wrtPV"){
2294 >    double vx = object->vx - chosenVertex ()->x,
2295 >      vy = object->vy - chosenVertex ()->y,
2296 >      px = object->px,
2297 >      py = object->py,
2298 >      pt = object->pt;
2299 >    value = (-vx * py + vy * px) / pt;
2300 >  }
2301 >  else if (variable == "dZwrtPV"){
2302 >    double vx = object->vx - chosenVertex ()->x,
2303 >      vy = object->vy - chosenVertex ()->y,
2304 >      vz = object->vz - chosenVertex ()->z,
2305 >      px = object->px,
2306 >      py = object->py,
2307 >      pz = object->pz,
2308 >      pt = object->pt;
2309 >    value = vz - (vx * px + vy * py)/pt * (pz/pt);
2310 >  }
2311 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2312  
2313    else if(variable == "genMatchedPdgId"){
2314      int index = getGenMatchedParticleIndex(object);
# Line 2158 | Line 2342 | OSUAnalysis::valueLookup (const BNtrack*
2342      }
2343      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2344    }
2345 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2346 +    int index = getGenMatchedParticleIndex(object);
2347 +    if(index == -1) value = 23;
2348 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2349 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2350 +      if(motherIndex == -1) value = 23;
2351 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2352 +    }
2353 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2354 +  }
2355  
2356  
2357  
2358 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2358 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2359  
2360    value = applyFunction(function, value);
2361  
2362    return value;
2363   }
2364  
2365 + //!genjet valueLookup
2366   double
2367 < OSUAnalysis::valueLookup (const BNgenjet* object, string variable, string function){
2367 > OSUAnalysis::valueLookup (const BNgenjet* object, string variable, string function, string &stringValue){
2368  
2369    double value = 0.0;
2370  
# Line 2189 | Line 2384 | OSUAnalysis::valueLookup (const BNgenjet
2384    else if(variable == "charge") value = object->charge;
2385  
2386  
2387 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2387 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2388  
2389    value = applyFunction(function, value);
2390  
2391    return value;
2392   }
2393  
2394 + //!mcparticle valueLookup
2395   double
2396 < OSUAnalysis::valueLookup (const BNmcparticle* object, string variable, string function){
2396 > OSUAnalysis::valueLookup (const BNmcparticle* object, string variable, string function, string &stringValue){
2397  
2398    double value = 0.0;
2399  
# Line 2322 | Line 2518 | OSUAnalysis::valueLookup (const BNmcpart
2518    }
2519  
2520  
2521 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2521 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2522  
2523    value = applyFunction(function, value);
2524  
2525    return value;
2526   }
2527  
2528 + //!primaryvertex valueLookup
2529   double
2530 < OSUAnalysis::valueLookup (const BNprimaryvertex* object, string variable, string function){
2530 > OSUAnalysis::valueLookup (const BNprimaryvertex* object, string variable, string function, string &stringValue){
2531  
2532    double value = 0.0;
2533  
# Line 2349 | Line 2546 | OSUAnalysis::valueLookup (const BNprimar
2546    else if(variable == "isGood") value = object->isGood;
2547  
2548  
2549 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2549 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2550  
2551    value = applyFunction(function, value);
2552  
2553    return value;
2554   }
2555  
2556 + //!bxlumi valueLookup
2557   double
2558 < OSUAnalysis::valueLookup (const BNbxlumi* object, string variable, string function){
2558 > OSUAnalysis::valueLookup (const BNbxlumi* object, string variable, string function, string &stringValue){
2559  
2560    double value = 0.0;
2561  
# Line 2366 | Line 2564 | OSUAnalysis::valueLookup (const BNbxlumi
2564    else if(variable == "bx_LUMI_now") value = object->bx_LUMI_now;
2565  
2566  
2567 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2567 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2568  
2569    value = applyFunction(function, value);
2570  
2571    return value;
2572   }
2573  
2574 + //!photon valueLookup
2575   double
2576 < OSUAnalysis::valueLookup (const BNphoton* object, string variable, string function){
2576 > OSUAnalysis::valueLookup (const BNphoton* object, string variable, string function, string &stringValue){
2577  
2578    double value = 0.0;
2579  
# Line 2449 | Line 2648 | OSUAnalysis::valueLookup (const BNphoton
2648    else if(variable == "seedRecoFlag") value = object->seedRecoFlag;
2649  
2650  
2452
2651  
2652 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2652 >
2653 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2654  
2655    else if(variable == "genMatchedPdgId"){
2656      int index = getGenMatchedParticleIndex(object);
# Line 2486 | Line 2685 | OSUAnalysis::valueLookup (const BNphoton
2685      }
2686      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2687    }
2688 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2689 +    int index = getGenMatchedParticleIndex(object);
2690 +    if(index == -1) value = 23;
2691 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2692 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2693 +      if(motherIndex == -1) value = 23;
2694 +      else value = 23 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2695 +    }
2696 +    else value = 23 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2697 +  }
2698  
2699  
2700 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2700 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2701  
2702    value = applyFunction(function, value);
2703  
2704    return value;
2705   }
2706  
2707 + //!supercluster valueLookup
2708   double
2709 < OSUAnalysis::valueLookup (const BNsupercluster* object, string variable, string function){
2709 > OSUAnalysis::valueLookup (const BNsupercluster* object, string variable, string function, string &stringValue){
2710  
2711    double value = 0.0;
2712  
# Line 2510 | Line 2720 | OSUAnalysis::valueLookup (const BNsuperc
2720    else if(variable == "theta") value = object->theta;
2721  
2722  
2723 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2723 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2724  
2725    value = applyFunction(function, value);
2726  
2727    return value;
2728   }
2729  
2730 + //!trigobj valueLookup
2731 + double
2732 + OSUAnalysis::valueLookup (const BNtrigobj* object, string variable, string function, string &stringValue){
2733 +
2734 +  double value = 0.0;
2735 +
2736 +  if(variable == "pt") value = object->pt;
2737 +  else if(variable == "eta") value = object->eta;
2738 +  else if(variable == "phi") value = object->phi;
2739 +  else if(variable == "px") value = object->px;
2740 +  else if(variable == "py") value = object->py;
2741 +  else if(variable == "pz") value = object->pz;
2742 +  else if(variable == "et") value = object->et;
2743 +  else if(variable == "energy") value = object->energy;
2744 +  else if(variable == "etTotal") value = object->etTotal;
2745 +  else if(variable == "id") value = object->id;
2746 +  else if(variable == "charge") value = object->charge;
2747 +  else if(variable == "isIsolated") value = object->isIsolated;
2748 +  else if(variable == "isMip") value = object->isMip;
2749 +  else if(variable == "isForward") value = object->isForward;
2750 +  else if(variable == "isRPC") value = object->isRPC;
2751 +  else if(variable == "bx") value = object->bx;
2752 +  else if(variable == "filter") {
2753 +    if ((stringValue = object->filter) == "")
2754 +      stringValue = "none";  // stringValue should only be empty if value is filled
2755 +  }
2756 +
2757 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2758 +
2759 +  value = applyFunction(function, value);
2760  
2761 +  return value;
2762 + }
2763 +
2764 + //!muon-muon pair valueLookup
2765   double
2766 < OSUAnalysis::valueLookup (const BNmuon* object1, const BNmuon* object2, string variable, string function){
2766 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNmuon* object2, string variable, string function, string &stringValue){
2767  
2768    double value = 0.0;
2769  
# Line 2581 | Line 2825 | OSUAnalysis::valueLookup (const BNmuon*
2825        value = object2->correctedD0;
2826      }
2827  
2828 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2828 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2829  
2830    value = applyFunction(function, value);
2831  
2832    return value;
2833   }
2834  
2835 + //!electron-electron pair valueLookup
2836   double
2837 < OSUAnalysis::valueLookup (const BNelectron* object1, const BNelectron* object2, string variable, string function){
2837 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNelectron* object2, string variable, string function, string &stringValue){
2838  
2839    double value = 0.0;
2840  
# Line 2636 | Line 2881 | OSUAnalysis::valueLookup (const BNelectr
2881      value = object2->correctedD0;
2882    }
2883  
2884 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2884 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2885  
2886    value = applyFunction(function, value);
2887  
2888    return value;
2889   }
2890 <
2890 > //!electron-muon pair valueLookup
2891   double
2892 < OSUAnalysis::valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function){
2892 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function, string &stringValue){
2893  
2894    double value = 0.0;
2895  
# Line 2703 | Line 2948 | OSUAnalysis::valueLookup (const BNelectr
2948      value = (object2->pfIsoR04SumChargedHadronPt + max(0.0, object2->pfIsoR04SumNeutralHadronEt + object2->pfIsoR04SumPhotonEt - 0.5*object2->pfIsoR04SumPUPt)) / object2->pt;
2949    }
2950  
2951 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2951 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2952 >
2953 >  value = applyFunction(function, value);
2954 >
2955 >  return value;
2956 > }
2957 >
2958 > //!electron-jet pair valueLookup
2959 > double
2960 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNjet* object2, string variable, string function, string &stringValue){
2961 >
2962 >  double value = 0.0;
2963 >
2964 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
2965 >  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
2966 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
2967 >  else if(variable == "invMass"){
2968 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2969 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2970 >    value = (fourVector1 + fourVector2).M();
2971 >  }
2972 >  else if(variable == "pt"){
2973 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
2974 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
2975 >    value = (fourVector1 + fourVector2).Pt();
2976 >  }
2977 >  else if(variable == "threeDAngle")
2978 >    {
2979 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
2980 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
2981 >      value = (threeVector1.Angle(threeVector2));
2982 >    }
2983 >  else if(variable == "chargeProduct"){
2984 >    value = object1->charge*object2->charge;
2985 >  }
2986 >
2987 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2988 >
2989 >  value = applyFunction(function, value);
2990 >
2991 >  return value;
2992 > }
2993 >
2994 > //!muon-jet pair valueLookup
2995 > double
2996 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNjet* object2, string variable, string function, string &stringValue){
2997 >
2998 >  double value = 0.0;
2999 >
3000 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3001 >  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3002 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3003 >  else if(variable == "invMass"){
3004 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3005 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3006 >    value = (fourVector1 + fourVector2).M();
3007 >  }
3008 >  else if(variable == "pt"){
3009 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3010 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3011 >    value = (fourVector1 + fourVector2).Pt();
3012 >  }
3013 >  else if(variable == "threeDAngle")
3014 >    {
3015 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3016 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3017 >      value = (threeVector1.Angle(threeVector2));
3018 >    }
3019 >  else if(variable == "chargeProduct"){
3020 >    value = object1->charge*object2->charge;
3021 >  }
3022 >
3023 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3024  
3025    value = applyFunction(function, value);
3026  
3027    return value;
3028   }
3029  
3030 + //!jet-jet pair valueLookup
3031 + double
3032 + OSUAnalysis::valueLookup (const BNjet* object1, const BNjet* object2, string variable, string function, string &stringValue){
3033 +
3034 +  double value = 0.0;
3035  
3036 < double  
2715 < OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrack* object2, string variable, string function){  
2716 <  double electronMass = 0.000511;        
2717 <  double value = 0.0;    
2718 <  TLorentzVector fourVector1(0, 0, 0, 0);        
2719 <  TLorentzVector fourVector2(0, 0, 0, 0);        
2720 <  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));  
3036 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3037    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3038 <  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);    
3039 <  else if(variable == "invMass"){        
3040 <    fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, electronMass);    
3041 <    fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, electronMass );    
3042 <        
3043 <    value = (fourVector1 + fourVector2).M();    
3038 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3039 >  else if(variable == "invMass"){
3040 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3041 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3042 >    value = (fourVector1 + fourVector2).M();
3043 >  }
3044 >  else if(variable == "pt"){
3045 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3046 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3047 >    value = (fourVector1 + fourVector2).Pt();
3048 >  }
3049 >  else if(variable == "threeDAngle")
3050 >    {
3051 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3052 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3053 >      value = (threeVector1.Angle(threeVector2));
3054 >    }
3055 >  else if(variable == "chargeProduct"){
3056 >    value = object1->charge*object2->charge;
3057    }
3058 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}  
3059 <  value = applyFunction(function, value);        
3060 <  return value;  
3058 >
3059 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3060 >
3061 >  value = applyFunction(function, value);
3062 >
3063 >  return value;
3064   }
3065 + //!electron-track pair valueLookup
3066 + double
3067 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrack* object2, string variable, string function, string &stringValue){
3068 +  double electronMass = 0.000511;
3069 +  double value = 0.0;
3070 +  TLorentzVector fourVector1(0, 0, 0, 0);
3071 +  TLorentzVector fourVector2(0, 0, 0, 0);
3072 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3073 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3074 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3075 +  else if(variable == "invMass"){
3076 +    fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, electronMass);
3077 +    fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, electronMass );
3078  
3079 +    value = (fourVector1 + fourVector2).M();
3080 +  }
3081 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3082 +  value = applyFunction(function, value);
3083 +  return value;
3084 + }
3085  
3086  
3087 + //!muon-track pair valueLookup
3088   double
3089 < OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrack* object2, string variable, string function){
3089 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrack* object2, string variable, string function, string &stringValue){
3090    double pionMass = 0.140;
3091    double muonMass = 0.106;
3092    double value = 0.0;
# Line 2750 | Line 3102 | OSUAnalysis::valueLookup (const BNmuon*
3102      value = (fourVector1 + fourVector2).M();
3103    }
3104  
3105 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3105 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3106    value = applyFunction(function, value);
3107    return value;
3108   }
3109  
3110 <
3110 > //!tau-tau pair valueLookup
3111   double
3112 < OSUAnalysis::valueLookup (const BNtau* object1, const BNtau* object2, string variable, string function){
3112 > OSUAnalysis::valueLookup (const BNtau* object1, const BNtau* object2, string variable, string function, string &stringValue){
3113    double value = 0.0;
3114    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3115    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
# Line 2768 | Line 3120 | OSUAnalysis::valueLookup (const BNtau* o
3120      value = (fourVector1 + fourVector2).M();
3121    }
3122  
3123 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3123 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3124    value = applyFunction(function, value);
3125    return value;
3126   }
3127  
3128 <
3128 > //!muon-tau pair valueLookup
3129   double
3130 < OSUAnalysis::valueLookup (const BNmuon* object1, const BNtau* object2, string variable, string function){
3130 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNtau* object2, string variable, string function, string &stringValue){
3131    double value = 0.0;
3132    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3133    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
# Line 2786 | Line 3138 | OSUAnalysis::valueLookup (const BNmuon*
3138      value = (fourVector1 + fourVector2).M();
3139    }
3140  
3141 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3141 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3142    value = applyFunction(function, value);
3143    return value;
3144   }
3145  
3146 + //!tau-track pair valueLookup
3147   double
3148 < OSUAnalysis::valueLookup (const BNtau* object1, const BNtrack* object2, string variable, string function){
3148 > OSUAnalysis::valueLookup (const BNtau* object1, const BNtrack* object2, string variable, string function, string &stringValue){
3149    double value = 0.0;
3150    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3151    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3152  
3153 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3153 >  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3154    value = applyFunction(function, value);
3155    return value;
3156   }
3157  
3158  
3159 <
3159 > //!track-event pair valueLookup
3160   double
3161 < OSUAnalysis::valueLookup (const BNtrack* object1, const BNevent* object2, string variable, string function){
3161 > OSUAnalysis::valueLookup (const BNtrack* object1, const BNevent* object2, string variable, string function, string &stringValue){
3162  
3163    double value = 0.0;
3164    double pMag = sqrt(object1->pt * object1->pt +
3165 <                     object1->pz * object1->pz);  
3165 >                     object1->pz * object1->pz);
3166  
3167    if      (variable == "numPV")                      value = object2->numPV;
3168    else if (variable == "caloTotDeltaRp5")            value =  (object1->caloHadDeltaRp5 + object1->caloEMDeltaRp5);
3169    else if (variable == "caloTotDeltaRp5ByP")         value = ((object1->caloHadDeltaRp5 + object1->caloEMDeltaRp5)/pMag);
3170 <  else if (variable == "caloTotDeltaRp5_RhoCorr")    value = getTrkCaloTotRhoCorr(object1);  
3171 <  else if (variable == "caloTotDeltaRp5ByP_RhoCorr") value = getTrkCaloTotRhoCorr(object1) / pMag;  
3170 >  else if (variable == "caloTotDeltaRp5_RhoCorr")    value = getTrkCaloTotRhoCorr(object1);
3171 >  else if (variable == "caloTotDeltaRp5ByP_RhoCorr") value = getTrkCaloTotRhoCorr(object1) / pMag;
3172  
3173 <  else { std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3173 >  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3174  
3175    value = applyFunction(function, value);
3176  
3177    return value;
3178  
3179 < }  
3179 > }
3180 >
3181 > //!electron-trigobj pair valueLookup
3182 > double
3183 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrigobj* object2, string variable, string function, string &stringValue){
3184 >
3185 >  double value = 0.0;
3186 >
3187 >  if (variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3188 >
3189 >  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3190 >
3191 >  value = applyFunction(function, value);
3192 >
3193 >  return value;
3194 >
3195 > }
3196 >
3197 > //!muon-trigobj pair valueLookup
3198 > double
3199 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrigobj* object2, string variable, string function, string &stringValue){
3200 >
3201 >  double value = 0.0;
3202 >
3203 >  if (variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3204 >
3205 >  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3206 >
3207 >  value = applyFunction(function, value);
3208 >
3209 >  return value;
3210 >
3211 > }
3212 >
3213 > //!stop valueLookup
3214 > double
3215 > OSUAnalysis::valueLookup (const BNstop* object, string variable, string function, string &stringValue){
3216 >
3217 >
3218 >  double value = 0.0;
3219 >
3220 >  if(variable == "ctau") value = object->ctau;
3221 >
3222 >  else if (variable == "d0"){
3223 >    double vx = object->vx - chosenVertex ()->x,
3224 >      vy = object->vy - chosenVertex ()->y,
3225 >      px = object->px,
3226 >      py = object->py,
3227 >      pt = object->pt;
3228 >    value = (-vx * py + vy * px) / pt;
3229 >  }
3230 >
3231 >  else if (variable == "dz"){
3232 >    double vx = object->vx - chosenVertex ()->x,
3233 >      vy = object->vy - chosenVertex ()->y,
3234 >      vz = object->vz - chosenVertex ()->z,
3235 >      px = object->px,
3236 >      py = object->py,
3237 >      pz = object->pz,
3238 >      pt = object->pt;
3239 >    value = vz - (vx * px + vy * py)/pt * (pz/pt);
3240 >  }
3241 >
3242 >  else if (variable == "minD0"){
3243 >    double minD0=999;
3244 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3245 >      double vx = object->vx - vertex->x,
3246 >        vy = object->vy - vertex->y,
3247 >        px = object->px,
3248 >        py = object->py,
3249 >        pt = object->pt;
3250 >      value = (-vx * py + vy * px) / pt;
3251 >      if(abs(value) < abs(minD0)) minD0 = value;
3252 >    }
3253 >    value = minD0;
3254 >  }
3255 >  else if (variable == "minDz"){
3256 >    double minDz=999;
3257 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3258 >      double vx = object->vx - vertex->x,
3259 >        vy = object->vy - vertex->y,
3260 >        vz = object->vz - vertex->z,
3261 >        px = object->px,
3262 >        py = object->py,
3263 >        pz = object->pz,
3264 >        pt = object->pt;
3265 >      value = vz - (vx * px + vy * py)/pt * (pz/pt);
3266 >      if(abs(value) < abs(minDz)) minDz = value;
3267 >    }
3268 >    value = minDz;
3269 >  }
3270 >  else if(variable == "distToVertex"){
3271 >    value = sqrt((object->vx-chosenVertex()->x)*(object->vx-chosenVertex()->x) + \
3272 >                 (object->vy-chosenVertex()->y)*(object->vy-chosenVertex()->y) + \
3273 >                 (object->vz-chosenVertex()->z)*(object->vz-chosenVertex()->z));
3274 >  }
3275 >  else if (variable == "minDistToVertex"){
3276 >    double minDistToVertex=999;
3277 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3278 >      value = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
3279 >                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
3280 >                   (object->vz-vertex->z)*(object->vz-vertex->z));
3281 >
3282 >      if(abs(value) < abs(minDistToVertex)) minDistToVertex = value;
3283 >    }
3284 >    value = minDistToVertex;
3285 >  }
3286 >  else if (variable == "distToVertexDifference"){
3287 >    double minDistToVertex=999;
3288 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3289 >      value = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
3290 >                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
3291 >                   (object->vz-vertex->z)*(object->vz-vertex->z));
3292 >
3293 >      if(abs(value) < abs(minDistToVertex)) minDistToVertex = value;
3294 >    }
3295 >    double distToChosenVertex = sqrt((object->vx-chosenVertex()->x)*(object->vx-chosenVertex()->x) + \
3296 >                                     (object->vy-chosenVertex()->y)*(object->vy-chosenVertex()->y) + \
3297 >                                     (object->vz-chosenVertex()->z)*(object->vz-chosenVertex()->z));
3298 >
3299 >    value = distToChosenVertex - minDistToVertex;
3300 >  }
3301 >
3302 >  else if (variable == "closestVertexRank"){
3303 >    double minDistToVertex=999;
3304 >    int vertex_rank = 0;
3305 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3306 >      vertex_rank++;
3307 >      int dist = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
3308 >                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
3309 >                   (object->vz-vertex->z)*(object->vz-vertex->z));
3310 >
3311 >      if(abs(dist) < abs(minDistToVertex)){
3312 >        value = vertex_rank;
3313 >        minDistToVertex = dist;
3314 >      }
3315 >    }
3316 >  }
3317 >
3318 >
3319 >
3320 >
3321 >  else { cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
3322 >
3323 >  value = applyFunction(function, value);
3324 >
3325 >  return value;
3326 >
3327 > }
3328 >
3329 >
3330 >
3331  
3332   // Calculate the number of tracks in cone of DeltaR<0.5 around track1.
3333   // Return true iff no other tracks are found in this cone.
# Line 2872 | Line 3376 | OSUAnalysis::getTrkPtTrue (const BNtrack
3376  
3377   double
3378   OSUAnalysis::getTrkCaloTotRhoCorr(const BNtrack* track) {
3379 <  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.  
3380 <  if (!useTrackCaloRhoCorr_) return -99;  
3381 <  // if (!rhokt6CaloJetsHandle_) {
3382 <  //   cout << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;  
3383 <  //   return -99;  
3379 >  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.
3380 >  if (!useTrackCaloRhoCorr_) return -99;
3381 >  // if (!rhokt6CaloJetsHandle_) {
3382 >  //   cout << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;
3383 >  //   return -99;
3384    // }
3385 <  double radDeltaRCone = 0.5;  
3386 <  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  // Define effective area as pi*r^2, where r is radius of DeltaR cone.  
3387 <  double rawCaloTot = track->caloHadDeltaRp5 + track->caloEMDeltaRp5;  
3388 <  double caloTotRhoCorrCalo = TMath::Max(0., rawCaloTot - rhoCorr_kt6CaloJets);  
3389 <  return caloTotRhoCorrCalo;  
3390 <
3385 >  double radDeltaRCone = 0.5;
3386 >  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  // Define effective area as pi*r^2, where r is radius of DeltaR cone.
3387 >  double rawCaloTot = track->caloHadDeltaRp5 + track->caloEMDeltaRp5;
3388 >  double caloTotRhoCorrCalo = TMath::Max(0., rawCaloTot - rhoCorr_kt6CaloJets);
3389 >  return caloTotRhoCorrCalo;
3390 >
3391   }
3392  
3393  
# Line 2921 | Line 3425 | OSUAnalysis::getTrkIsMatchedDeadEcal (co
3425    double deltaRLowest = 999;
3426    int value = 0;
3427    if (DeadEcalVec.size() == 0) WriteDeadEcal();
3428 <  for(std::vector<DeadEcal>::const_iterator ecal = DeadEcalVec.begin(); ecal != DeadEcalVec.end(); ++ecal){
3428 >  for(vector<DeadEcal>::const_iterator ecal = DeadEcalVec.begin(); ecal != DeadEcalVec.end(); ++ecal){
3429      double eta = ecal->etaEcal;
3430      double phi = ecal->phiEcal;
3431      double deltaRtemp = deltaR(eta, track1->eta, phi, track1->phi);
# Line 2932 | Line 3436 | OSUAnalysis::getTrkIsMatchedDeadEcal (co
3436    return value;
3437   }
3438  
3439 < // Returns the smallest DeltaR between the object and any generated true particle in the event.  
3439 > // Returns the smallest DeltaR between the object and any generated true particle in the event.
3440   template <class InputObject>
3441   double OSUAnalysis::getGenDeltaRLowest(InputObject object){
3442    double genDeltaRLowest = 999.;
# Line 2952 | Line 3456 | OSUAnalysis::applyFunction(string functi
3456    else if(function == "log") value = log10(value);
3457  
3458    else if(function == "") value = value;
3459 <  else{std::cout << "WARNING: invalid function '" << function << "'\n";}
3459 >  else{cout << "WARNING: invalid function '" << function << "'\n";}
3460  
3461    return value;
3462  
# Line 2961 | Line 3465 | OSUAnalysis::applyFunction(string functi
3465  
3466   template <class InputCollection>
3467   void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, InputCollection inputCollection, string inputType){
3468 <
3469 <  if (currentCut.inputCollection.find("pair")!=std::string::npos)  {
3470 <    string obj1, obj2;
3468 >
3469 >  if (currentCut.inputCollection.find("pair")!=string::npos)  {
3470 >    string obj1, obj2;
3471      getTwoObjs(currentCut.inputCollection, obj1, obj2);
3472      if (inputType==obj1 ||
3473 <        inputType==obj2) {
3473 >          inputType==obj2) {
3474        // Do not add a cut to individualFlags or cumulativeFlags, if the cut is on a paired collection,
3475 <      // and the inputType is a member of the pair.  
3476 <      // The cut will instead be applied when the setObjectFlags() is called for the paired collection.  
3477 <      // For example, if currentCut.inputCollection==electron-muon pairs,
3478 <      // then the flags should not be set here when inputType==muons or inputType==electrons.  
3479 <      return;
3480 <    }  
3481 <  }    
3475 >      // and the inputType is a member of the pair.
3476 >      // The cut will instead be applied when the setObjectFlags() is called for the paired collection.
3477 >      // For example, if currentCut.inputCollection==electron-muon pairs,
3478 >      // then the flags should not be set here when inputType==muons or inputType==electrons.
3479 >      return;
3480 >    }
3481 >  }
3482  
3483    for (uint object = 0; object != inputCollection->size(); object++){
3484  
# Line 2984 | Line 3488 | void OSUAnalysis::setObjectFlags(cut &cu
3488  
3489        vector<bool> subcutDecisions;
3490        for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
3491 <        double value = valueLookup(&inputCollection->at(object), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex));
3492 <        subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3491 >        string stringValue = "";
3492 >        double value = valueLookup(&inputCollection->at(object), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex), stringValue);
3493 >        if (stringValue == "") subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3494 >        else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
3495  
3496        }
3497        if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
# Line 3024 | Line 3530 | void OSUAnalysis::setObjectFlags(cut &cu
3530    bool sameObjects = false;
3531    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
3532  
3533 <  // Get the strings for the two objects that make up the pair.  
3534 <  string obj1Type, obj2Type;
3533 >  // Get the strings for the two objects that make up the pair.
3534 >  string obj1Type, obj2Type;
3535    getTwoObjs(inputType, obj1Type, obj2Type);
3536    bool isTwoTypesOfObject = true;
3537 <  if (obj1Type==obj2Type) isTwoTypesOfObject = false;  
3537 >  if (obj1Type==obj2Type) isTwoTypesOfObject = false;
3538  
3539 <  // Initialize the flags for individual objects to all be false, if the cut is on the pair.  
3540 <  // Set them to true later, if any paired object passes (in which case both of its constituents should pass).  
3541 <  if (currentCut.inputCollection == inputType) {    
3539 >  // Initialize the flags for individual objects to all be false, if the cut is on the pair.
3540 >  // Set them to true later, if any paired object passes (in which case both of its constituents should pass).
3541 >  if (currentCut.inputCollection == inputType) {
3542      for (uint object1 = 0; object1 != inputCollection1->size(); object1++) {
3543 <      individualFlags.at(obj1Type).at(currentCutIndex).push_back(false);
3543 >      individualFlags.at(obj1Type).at(currentCutIndex).push_back(false);
3544        cumulativeFlags.at(obj1Type).at(currentCutIndex).push_back(false);
3545      }
3546 <    if (isTwoTypesOfObject) { // Only initialize the second object if it is different from the first.  
3546 >    if (isTwoTypesOfObject) { // Only initialize the second object if it is different from the first.
3547        for (uint object2 = 0; object2 != inputCollection2->size(); object2++)  {
3548 <        individualFlags.at(obj2Type).at(currentCutIndex).push_back(false);
3549 <        cumulativeFlags.at(obj2Type).at(currentCutIndex).push_back(false);
3548 >        individualFlags.at(obj2Type).at(currentCutIndex).push_back(false);
3549 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).push_back(false);
3550        }
3551      }
3552    }
3553 <  
3553 >
3554    int counter = 0;
3555  
3556    for (uint object1 = 0; object1 != inputCollection1->size(); object1++){
# Line 3059 | Line 3565 | void OSUAnalysis::setObjectFlags(cut &cu
3565  
3566          vector<bool> subcutDecisions;
3567          for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
3568 <          double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex));
3569 <          subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3568 >          string stringValue = "";
3569 >          double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex), stringValue);
3570 >          if (stringValue == "") subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
3571 >          else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
3572          }
3573  
3574          if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
# Line 3075 | Line 3583 | void OSUAnalysis::setObjectFlags(cut &cu
3583            decision = tempDecision;
3584          }
3585        }
3586 <      // if (decision) isPassObj1.at(object1) = true;
3587 <      // if (decision) isPassObj2.at(object2) = true;
3588 <      individualFlags.at(inputType).at(currentCutIndex).push_back(decision);  
3589 <      if (decision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on  
3590 <        individualFlags.at(obj1Type).at(currentCutIndex).at(object1) = true;  
3591 <        individualFlags.at(obj2Type).at(currentCutIndex).at(object2) = true;  
3592 <      }  
3586 >      // if (decision) isPassObj1.at(object1) = true;
3587 >      // if (decision) isPassObj2.at(object2) = true;
3588 >      individualFlags.at(inputType).at(currentCutIndex).push_back(decision);
3589 >      if (decision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
3590 >        individualFlags.at(obj1Type).at(currentCutIndex).at(object1) = true;
3591 >        individualFlags.at(obj2Type).at(currentCutIndex).at(object2) = true;
3592 >      }
3593  
3594        //set flags for objects that pass each cut AND all the previous cuts
3595        bool previousCumulativeFlag = true;
# Line 3096 | Line 3604 | void OSUAnalysis::setObjectFlags(cut &cu
3604        else if(flags2.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1);
3605        else currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1) && flags2.at(object2);
3606        cumulativeFlags.at(inputType).at(currentCutIndex).push_back(currentCumulativeFlag);
3607 <      if (currentCumulativeFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on  
3608 <        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1);  
3609 <        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2);  
3607 >      if (currentCumulativeFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
3608 >        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1);
3609 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2);
3610        }
3611        counter++;
3612  
3613 <    } // end   for (uint object2 = 0; object2 != inputCollection2->size(); object2++){
3614 <  }  // end   for (uint object1 = 0; object1 != inputCollection1->size(); object1++){
3613 >    } // end   for (uint object2 = 0; object2 != inputCollection2->size(); object2++)
3614 >  }  // end   for (uint object1 = 0; object1 != inputCollection1->size(); object1++)
3615  
3616   }
3617  
3618  
3619   bool OSUAnalysis::getPreviousCumulativeFlags(uint currentCutIndex, flagMap &individualFlags, string obj1Type, uint object1) {
3620 <  // Return true iff for the collection obj1Type, the element with index object1 has individal flags set to true for
3621 <  // all cuts up to currentCutIndex  
3622 <  bool previousCumulativeFlag = true;  
3623 <  for (uint previousCutIndex = 0; previousCutIndex < currentCutIndex; previousCutIndex++) {  
3620 >  // Return true iff for the collection obj1Type, the element with index object1 has individal flags set to true for
3621 >  // all cuts up to currentCutIndex
3622 >  bool previousCumulativeFlag = true;
3623 >  for (uint previousCutIndex = 0; previousCutIndex < currentCutIndex; previousCutIndex++) {
3624      if (previousCumulativeFlag && individualFlags.at(obj1Type).at(previousCutIndex).at(object1)) previousCumulativeFlag = true;
3625 <    else {  
3626 <      previousCumulativeFlag = false; break;  
3625 >    else {
3626 >      previousCumulativeFlag = false; break;
3627      }
3628    }
3629 <  return previousCumulativeFlag;  
3630 < }  
3629 >  return previousCumulativeFlag;
3630 > }
3631  
3632  
3633   template <class InputCollection>
# Line 3132 | Line 3640 | void OSUAnalysis::fill1DHistogram(TH1* h
3640      string currentString = parameters.inputVariables.at(0);
3641      string inputVariable = "";
3642      string function = "";
3643 <    if(currentString.find("(")==std::string::npos){
3643 >    if(currentString.find("(")==string::npos){
3644        inputVariable = currentString;// variable to cut on
3645      }
3646      else{
# Line 3141 | Line 3649 | void OSUAnalysis::fill1DHistogram(TH1* h
3649        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3650      }
3651  
3652 <    double value = valueLookup(&inputCollection->at(object), inputVariable, function);
3652 >    string stringValue = "";
3653 >    double value = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
3654      histo->Fill(value,scaleFactor);
3655  
3656      if (printEventInfo_) {
3657 <      // Write information about event to screen, for testing purposes.  
3658 <      cout << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << endl;  
3657 >      // Write information about event to screen, for testing purposes.
3658 >      cout << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << endl;
3659      }
3660 <    
3660 >
3661    }
3662   }
3663  
# Line 3173 | Line 3682 | void OSUAnalysis::fill1DHistogram(TH1* h
3682        string currentString = parameters.inputVariables.at(0);
3683        string inputVariable = "";
3684        string function = "";
3685 <      if(currentString.find("(")==std::string::npos){
3685 >      if(currentString.find("(")==string::npos){
3686          inputVariable = currentString;// variable to cut on
3687        }
3688        else{
# Line 3182 | Line 3691 | void OSUAnalysis::fill1DHistogram(TH1* h
3691          inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3692        }
3693  
3694 <      double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
3694 >      string stringValue = "";
3695 >      double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
3696        histo->Fill(value,scaleFactor);
3697  
3698      }
# Line 3198 | Line 3708 | void OSUAnalysis::fill2DHistogram(TH2* h
3708  
3709      if(!plotAllObjectsInPassingEvents_ && !flags.at(object)) continue;
3710  
3711 +    string stringValue = "";
3712      string currentString = parameters.inputVariables.at(0);
3713      string inputVariable = "";
3714      string function = "";
3715 <    if(currentString.find("(")==std::string::npos){
3715 >    if(currentString.find("(")==string::npos){
3716        inputVariable = currentString;// variable to cut on
3717      }
3718      else{
# Line 3209 | Line 3720 | void OSUAnalysis::fill2DHistogram(TH2* h
3720        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3721        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3722      }
3723 <    double valueX = valueLookup(&inputCollection->at(object), inputVariable, function);
3723 >    double valueX = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
3724  
3725      currentString = parameters.inputVariables.at(1);
3726      inputVariable = "";
3727      function = "";
3728 <    if(currentString.find("(")==std::string::npos){
3728 >    if(currentString.find("(")==string::npos){
3729        inputVariable = currentString;// variable to cut on
3730      }
3731      else{
# Line 3223 | Line 3734 | void OSUAnalysis::fill2DHistogram(TH2* h
3734        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3735      }
3736  
3737 <    double valueY = valueLookup(&inputCollection->at(object), inputVariable, function);
3737 >    double valueY = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
3738  
3739      histo->Fill(valueX,valueY,scaleFactor);
3740  
# Line 3250 | Line 3761 | void OSUAnalysis::fill2DHistogram(TH2* h
3761        if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2)) continue;
3762        if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter)) continue;
3763  
3764 +      string stringValue = "";
3765        string currentString = parameters.inputVariables.at(0);
3766        string inputVariable = "";
3767        string function = "";
3768 <      if(currentString.find("(")==std::string::npos){
3768 >      if(currentString.find("(")==string::npos){
3769          inputVariable = currentString;// variable to cut on
3770        }
3771        else{
# Line 3261 | Line 3773 | void OSUAnalysis::fill2DHistogram(TH2* h
3773          inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3774          inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3775        }
3776 <      double valueX = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
3776 >      double valueX = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
3777  
3778        currentString = parameters.inputVariables.at(1);
3779        inputVariable = "";
3780        function = "";
3781 <      if(currentString.find("(")==std::string::npos){
3781 >      if(currentString.find("(")==string::npos){
3782          inputVariable = currentString;// variable to cut on
3783        }
3784        else{
# Line 3274 | Line 3786 | void OSUAnalysis::fill2DHistogram(TH2* h
3786          inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
3787          inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
3788        }
3789 <      double valueY = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
3789 >      double valueY = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
3790  
3791  
3792        histo->Fill(valueX,valueY,scaleFactor);
# Line 3295 | Line 3807 | int OSUAnalysis::getGenMatchedParticleIn
3807  
3808      double currentDeltaR = deltaR(object->eta,object->phi,mcparticle->eta,mcparticle->phi);
3809      if(currentDeltaR > 0.05) continue;
3810 <    //     cout << std::setprecision(3) << std::setw(20)
3810 >    //     cout << setprecision(3) << setw(20)
3811      //          << "\tcurrentParticle:  eta = " << mcparticles->at(mcparticle - mcparticles->begin()).eta
3812 <    //          << std::setw(20)
3812 >    //          << setw(20)
3813      //          << "\tphi = " << mcparticles->at(mcparticle - mcparticles->begin()).phi
3814 <    //          << std::setw(20)
3814 >    //          << setw(20)
3815      //          << "\tdeltaR = " << currentDeltaR
3816 <    //          << std::setprecision(1)
3817 <    //          << std::setw(20)
3816 >    //          << setprecision(1)
3817 >    //          << setw(20)
3818      //          << "\tid = " << mcparticles->at(mcparticle - mcparticles->begin()).id
3819 <    //          << std::setw(20)
3819 >    //          << setw(20)
3820      //          << "\tmotherId = " << mcparticles->at(mcparticle - mcparticles->begin()).motherId
3821 <    //          << std::setw(20)
3821 >    //          << setw(20)
3822      //          << "\tstatus = " << mcparticles->at(mcparticle - mcparticles->begin()).status<< endl;
3823      if(currentDeltaR < bestMatchDeltaR && mcparticles->at(mcparticle - mcparticles->begin()).id != mcparticles->at(mcparticle - mcparticles->begin()).motherId){
3824        bestMatchIndex = mcparticle - mcparticles->begin();
# Line 3404 | Line 3916 | const BNprimaryvertex *
3916   OSUAnalysis::chosenVertex ()
3917   {
3918    const BNprimaryvertex *chosenVertex = 0;
3919 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "primaryvertexs") != objectsToCut.end()) {
3920 <    vector<bool> vertexFlags = cumulativeFlags.at("primaryvertexs").back().size() ? cumulativeFlags.at("primaryvertexs").back() :
3921 <      cumulativeFlags.at("primaryvertexs").at(cumulativeFlags.at("primaryvertexs").size() - 2);
3919 >  if(find(objectsToCut.begin(), objectsToCut.end(), "primaryvertexs") != objectsToCut.end()) {
3920 >    vector<bool> vertexFlags;
3921 >    for (int i = cumulativeFlags.at("primaryvertexs").size() - 1; i >= 0; i--){
3922 >      if (cumulativeFlags.at("primaryvertexs").at(i).size()){
3923 >        vertexFlags = cumulativeFlags.at("primaryvertexs").at(i);
3924 >        break;
3925 >      }
3926 >    }
3927      for (uint vertexIndex = 0; vertexIndex != vertexFlags.size(); vertexIndex++){
3928        if(!vertexFlags.at(vertexIndex)) continue;
3929        chosenVertex = & primaryvertexs->at(vertexIndex);
# Line 3424 | Line 3941 | const BNmet *
3941   OSUAnalysis::chosenMET ()
3942   {
3943    const BNmet *chosenMET = 0;
3944 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "mets") != objectsToCut.end()) {
3945 <    vector<bool> metFlags = cumulativeFlags.at("mets").back().size() ? cumulativeFlags.at("mets").back() :
3946 <      cumulativeFlags.at("mets").at(cumulativeFlags.at("mets").size() - 2);
3944 >  if(find(objectsToCut.begin(), objectsToCut.end(), "mets") != objectsToCut.end()) {
3945 >    vector<bool> metFlags;
3946 >    for (int i = cumulativeFlags.at("mets").size() - 1; i >= 0; i--){
3947 >      if (cumulativeFlags.at("mets").at(i).size()){
3948 >        metFlags = cumulativeFlags.at("mets").at(i);
3949 >        break;
3950 >      }
3951 >    }
3952      for (uint metIndex = 0; metIndex != metFlags.size(); metIndex++){
3953        if(!metFlags.at(metIndex)) continue;
3954        chosenMET = & mets->at(metIndex);
# Line 3444 | Line 3966 | const BNelectron *
3966   OSUAnalysis::chosenElectron ()
3967   {
3968    const BNelectron *chosenElectron = 0;
3969 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "electrons") != objectsToCut.end()) {
3970 <    vector<bool> electronFlags = cumulativeFlags.at("electrons").back().size() ? cumulativeFlags.at("electrons").back() :
3971 <      cumulativeFlags.at("electrons").at(cumulativeFlags.at("electrons").size() - 2);
3969 >  if(find(objectsToCut.begin(), objectsToCut.end(), "electrons") != objectsToCut.end()) {
3970 >    vector<bool> electronFlags;
3971 >    for (int i = cumulativeFlags.at("electrons").size() - 1; i >= 0; i--){
3972 >      if (cumulativeFlags.at("electrons").at(i).size()){
3973 >        electronFlags = cumulativeFlags.at("electrons").at(i);
3974 >        break;
3975 >      }
3976 >    }
3977      for (uint electronIndex = 0; electronIndex != electronFlags.size(); electronIndex++){
3978        if(!electronFlags.at(electronIndex)) continue;
3979        chosenElectron = & electrons->at(electronIndex);
# Line 3464 | Line 3991 | const BNmuon *
3991   OSUAnalysis::chosenMuon ()
3992   {
3993    const BNmuon *chosenMuon = 0;
3994 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "muons") != objectsToCut.end()) {
3995 <    vector<bool> muonFlags = cumulativeFlags.at("muons").back().size() ? cumulativeFlags.at("muons").back() :
3996 <      cumulativeFlags.at("muons").at(cumulativeFlags.at("muons").size() - 2);
3994 >  if(find(objectsToCut.begin(), objectsToCut.end(), "muons") != objectsToCut.end()) {
3995 >    vector<bool> muonFlags;
3996 >    for (int i = cumulativeFlags.at("muons").size() - 1; i >= 0; i--){
3997 >      if (cumulativeFlags.at("muons").at(i).size()){
3998 >        muonFlags = cumulativeFlags.at("muons").at(i);
3999 >        break;
4000 >      }
4001 >    }
4002      for (uint muonIndex = 0; muonIndex != muonFlags.size(); muonIndex++){
4003        if(!muonFlags.at(muonIndex)) continue;
4004        chosenMuon = & muons->at(muonIndex);
# Line 3480 | Line 4012 | OSUAnalysis::chosenMuon ()
4012    return chosenMuon;
4013   }
4014  
3483
4015   DEFINE_FWK_MODULE(OSUAnalysis);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines