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.120 by jbrinson, Tue Aug 6 17:16:17 2013 UTC

# Line 1 | Line 1
1   #include "OSUT3Analysis/AnaTools/plugins/OSUAnalysis.h"
2
2   OSUAnalysis::OSUAnalysis (const edm::ParameterSet &cfg) :
3    // Retrieve parameters from the configuration file.
4    jets_ (cfg.getParameter<edm::InputTag> ("jets")),
5    muons_ (cfg.getParameter<edm::InputTag> ("muons")),
6 +  secMuons_ (cfg.getParameter<edm::InputTag> ("secMuons")),
7    electrons_ (cfg.getParameter<edm::InputTag> ("electrons")),
8    events_ (cfg.getParameter<edm::InputTag> ("events")),
9    taus_ (cfg.getParameter<edm::InputTag> ("taus")),
# 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 +  useEDMFormat_   (cfg.getParameter<bool>("useEDMFormat")),
32 +  treeBranchSets_   (cfg.getParameter<vector<edm::ParameterSet> >("treeBranchSets")),
33    plotAllObjectsInPassingEvents_ (cfg.getParameter<bool> ("plotAllObjectsInPassingEvents")),
34    doPileupReweighting_ (cfg.getParameter<bool> ("doPileupReweighting")),
35 <  printEventInfo_ (cfg.getParameter<bool> ("printEventInfo")),
35 >  applyLeptonSF_ (cfg.getParameter<bool> ("applyLeptonSF")),
36 >  applyBtagSF_ (cfg.getParameter<bool> ("applyBtagSF")),
37 >  minBtag_ (cfg.getParameter<int> ("minBtag")),
38 >  printEventInfo_      (cfg.getParameter<bool> ("printEventInfo")),
39 >  printAllTriggers_    (cfg.getParameter<bool> ("printAllTriggers")),
40    useTrackCaloRhoCorr_ (cfg.getParameter<bool> ("useTrackCaloRhoCorr")),
41 <  stopCTau_ (cfg.getParameter<vector<double> > ("stopCTau"))
41 >  stopCTau_ (cfg.getParameter<vector<double> > ("stopCTau")),
42 >  GetPlotsAfterEachCut_ (cfg.getParameter<bool> ("GetPlotsAfterEachCut")),
43 >  verbose_ (cfg.getParameter<int> ("verbose"))
44 > {
45  
46 < {
46 >  if (verbose_) printEventInfo_ = true;  
47 >  if (verbose_) clog << "Beginning OSUAnalysis::OSUAnalysis constructor." << endl;  
48  
49 <  TH1::SetDefaultSumw2 ();
49 >  TH1::SetDefaultSumw2();
50  
51    //create pile-up reweighting object, if necessary
52    if(datasetType_ != "data") {
53      if(doPileupReweighting_) puWeight_ = new PUWeight (puFile_, dataPU_, dataset_);
54 <    //    muonSFWeight_ = new MuonSFWeight (muonSFFile_, muonSF_);
55 <    //    electronSFWeight_ = new ElectronSFWeight ("53X", electronSFID_);
54 >    if (applyLeptonSF_){
55 >      muonSFWeight_ = new MuonSFWeight (muonSFFile_, muonSF_);
56 >      electronSFWeight_ = new ElectronSFWeight ("53X", electronSFID_);
57 >    }
58 >    if (applyBtagSF_){
59 >      bTagSFWeight_ = new BtagSFWeight;
60 >    }
61    }
62 < #ifdef DISPLACED_SUSY
63 <  if (datasetType_ == "signalMC")
48 <    cTauWeight_ = new CTauWeight (stopCTau_.at (0), stopCTau_.at (1), stops_);
49 < #endif
62 >  if (datasetType_ == "signalMC" && regex_match (dataset_, regex ("stop.*to.*_.*mm.*")))
63 >    stopCTauWeight_ = new StopCTauWeight (stopCTau_.at(0), stopCTau_.at(1), stops_);
64  
65  
66    // Construct Cutflow Objects. These store the results of cut decisions and
67    // handle filling cut flow histograms.
68    masterCutFlow_ = new CutFlow (fs_);
55  std::vector<TFileDirectory> directories;
69  
70    //always get vertex collection so we can assign the primary vertex in the event
71    objectsToGet.push_back("primaryvertexs");
59
60  //always make the plot of number of primary vertices (to check pile-up reweighting)
72    objectsToPlot.push_back("primaryvertexs");
73 +  objectsToFlag.push_back("primaryvertexs");
74 +
75  
76    //always get the MC particles to do GEN-matching
77    objectsToGet.push_back("mcparticles");
# Line 66 | Line 79 | OSUAnalysis::OSUAnalysis (const edm::Par
79    //always get the event collection to do pile-up reweighting
80    objectsToGet.push_back("events");
81  
82 +
83 +  // Parse the tree variable definitions.
84 +  for (uint iBranchSet = 0; !useEDMFormat_ && iBranchSet<treeBranchSets_.size(); iBranchSet++) {
85 +    string tempInputCollection = treeBranchSets_.at(iBranchSet).getParameter<string> ("inputCollection");
86 +    if(tempInputCollection.find("pairs")!=string::npos) { clog << "Warning:  tree filling is not configured for pairs of objects, so will not work for collection: " << tempInputCollection << endl; }
87 +    objectsToGet.push_back(tempInputCollection);
88 +    objectsToFlag.push_back(tempInputCollection);
89 +
90 +    vector<string> branchList(treeBranchSets_.at(iBranchSet).getParameter<vector<string> >("branches"));
91 +
92 +    for (uint iBranch = 0; iBranch<branchList.size(); iBranch++) {
93 +      BranchSpecs br;
94 +      br.inputCollection = tempInputCollection;
95 +      br.inputVariable = branchList.at(iBranch);
96 +      TString newName = TString(br.inputCollection) + "_" + TString(br.inputVariable);
97 +      br.name = string(newName.Data());
98 +      treeBranches_.push_back(br);
99 +      if (verbose_>3) clog << "   Adding branch to BNTree: " << br.name << endl;  
100 +    }
101 +
102 +  } // end   for (uint iBranchSet = 0; iBranchSet<treeBranchSets_.size(); iBranchSet++)
103 +
104 +
105    //parse the histogram definitions
106    for(uint currentHistogramSet = 0; currentHistogramSet != histogramSets_.size(); currentHistogramSet++){
107  
108      string tempInputCollection = histogramSets_.at(currentHistogramSet).getParameter<string> ("inputCollection");
109      if(tempInputCollection == "muon-electron pairs") tempInputCollection = "electron-muon pairs";
110 +    if(tempInputCollection == "photon-muon pairs") tempInputCollection = "muon-photon pairs";
111 +    if(tempInputCollection == "photon-electron pairs") tempInputCollection = "electron-photon pairs";
112 +    if(tempInputCollection == "jet-electron pairs") tempInputCollection = "electron-jet pairs";
113 +    if(tempInputCollection == "jet-photon pairs") tempInputCollection = "photon-jet pairs";
114 +    if(tempInputCollection == "jet-muon pairs") tempInputCollection = "muon-jet pairs";
115 +    if(tempInputCollection == "event-muon pairs") tempInputCollection = "muon-event pairs";
116 +    if(tempInputCollection == "jet-met pairs")  tempInputCollection = "met-jet pairs";
117 +    if(tempInputCollection == "track-jet pairs")  tempInputCollection = "track-jet pairs";
118      if(tempInputCollection == "event-track pairs")   tempInputCollection = "track-event pairs";
119      if(tempInputCollection == "secondary muon-muon pairs")   tempInputCollection = "muon-secondary muon pairs";
120 <    if(tempInputCollection.find("pairs")==std::string::npos){ //just a single object
121 <      if(tempInputCollection.find("secondary")!=std::string::npos){//secondary object
122 <        int spaceIndex = tempInputCollection.find(" ");
123 <        int secondWordLength = tempInputCollection.size() - spaceIndex;
124 <        objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
125 <      }
126 <      else{
127 <        objectsToGet.push_back(tempInputCollection);
120 >    if(tempInputCollection == "secondary jet-muon pairs")   tempInputCollection = "muon-secondary jet pairs";
121 >    if(tempInputCollection == "secondary photon-muon pairs")   tempInputCollection = "muon-secondary photon pairs";
122 >    if(tempInputCollection == "secondary jet-electron pairs")   tempInputCollection = "electron-secondary jet pairs";
123 >    if(tempInputCollection == "secondary jet-photon pairs")   tempInputCollection = "photon-secondary jet pairs";
124 >    if(tempInputCollection == "secondary jet-jet pairs")   tempInputCollection = "jet-secondary jet pairs";
125 >    if(tempInputCollection == "secondary electron-electron pairs")   tempInputCollection = "electron-secondary electron pairs";
126 >    if(tempInputCollection == "trigobj-electron pairs")   tempInputCollection = "electron-trigobj pairs";
127 >    if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
128 >    if(tempInputCollection.find("pairs")==string::npos){ //just a single object
129 >      if(tempInputCollection.find("secondary")!=string::npos){//secondary object
130 >        if(tempInputCollection.find("secondary muons")!=string::npos){//treat secondary muons differently; allow for a different input collection
131 >          objectsToGet.push_back("secondary muons");  
132 >        } else {
133 >          int spaceIndex = tempInputCollection.find(" ");
134 >          int secondWordLength = tempInputCollection.size() - spaceIndex;
135 >          objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
136 >        }
137 >      } else{
138 >        objectsToGet.push_back(tempInputCollection);
139        }
140        objectsToPlot.push_back(tempInputCollection);
141 <      objectsToCut.push_back(tempInputCollection);
142 <    }
143 <    else{//pair of objects, need to add the pair and the individual objects to the lists of things to Get/Plot/Cut
89 <      string obj1;
141 >      objectsToFlag.push_back(tempInputCollection);
142 >    } else { //pair of objects, need to add the pair and the individual objects to the lists of things to Get/Plot/Cut
143 >      string obj1;
144        string obj2;
145        getTwoObjs(tempInputCollection, obj1, obj2);
146 <      string obj2ToGet = getObjToGet(obj2);  
147 <      objectsToCut.push_back(tempInputCollection);
148 <      objectsToCut.push_back(obj1);
149 <      objectsToCut.push_back(obj2);  
146 >      string obj2ToGet = getObjToGet(obj2);
147 >      objectsToFlag.push_back(tempInputCollection);
148 >      objectsToFlag.push_back(obj1);
149 >      objectsToFlag.push_back(obj2);
150        objectsToPlot.push_back(tempInputCollection);
151        objectsToPlot.push_back(obj1);
152 <      objectsToPlot.push_back(obj2);  
152 >      objectsToPlot.push_back(obj2);
153        objectsToGet.push_back(tempInputCollection);
154        objectsToGet.push_back(obj1);
155        objectsToGet.push_back(obj2ToGet);
156 <
157 <    }
158 <
156 >    } // end else
157 >    if (find(objectsToPlot.begin(), objectsToPlot.end(), "events") != objectsToPlot.end())
158 >      objectsToGet.push_back("jets");
159 >    
160 >    
161      vector<edm::ParameterSet> histogramList_  (histogramSets_.at(currentHistogramSet).getParameter<vector<edm::ParameterSet> >("histograms"));
162  
163      for(uint currentHistogram = 0; currentHistogram != histogramList_.size(); currentHistogram++){
164  
165 +      vector<double> defaultValue;
166 +      defaultValue.push_back (-1.0);
167 +
168        histogram tempHistogram;
169        tempHistogram.inputCollection = tempInputCollection;
170        tempHistogram.name = histogramList_.at(currentHistogram).getParameter<string>("name");
171        tempHistogram.title = histogramList_.at(currentHistogram).getParameter<string>("title");
172 <      tempHistogram.bins = histogramList_.at(currentHistogram).getParameter<vector<double> >("bins");
172 >      tempHistogram.bins = histogramList_.at(currentHistogram).getUntrackedParameter<vector<double> >("bins", defaultValue);
173 >      tempHistogram.variableBinsX = histogramList_.at(currentHistogram).getUntrackedParameter<vector<double> >("variableBinsX", defaultValue);
174 >      tempHistogram.variableBinsY = histogramList_.at(currentHistogram).getUntrackedParameter<vector<double> >("variableBinsY", defaultValue);
175        tempHistogram.inputVariables = histogramList_.at(currentHistogram).getParameter<vector<string> >("inputVariables");
176  
177        histograms.push_back(tempHistogram);
178  
179      }
180 <  }
180 >  } //   for(uint currentHistogramSet = 0; currentHistogramSet != histogramSets_.size(); currentHistogramSet++)
181 >
182    //make unique vector of objects we need to plot (so we can book a histogram with the number of each object)
183    sort( objectsToPlot.begin(), objectsToPlot.end() );
184    objectsToPlot.erase( unique( objectsToPlot.begin(), objectsToPlot.end() ), objectsToPlot.end() );
# Line 127 | Line 189 | OSUAnalysis::OSUAnalysis (const edm::Par
189    for(uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
190  
191      string currentObject = objectsToPlot.at(currentObjectIndex);
192 <    if(currentObject != "muons" && currentObject != "secondary muons" && currentObject != "electrons" && currentObject != "taus" && currentObject != "tracks" && currentObject != "photons" && currentObject != "superclusters") continue;
192 >    if(currentObject != "muons" &&
193 >       currentObject != "secondary muons" &&
194 >       currentObject != "secondary electrons" &&
195 >       currentObject != "electrons" &&
196 >       currentObject != "taus" &&
197 >       currentObject != "tracks" &&
198 >       currentObject != "photons" &&
199 >       currentObject != "secondary photons"&&
200 >       currentObject != "superclusters")
201 >      continue;
202  
203      histogram tempIdHisto;
204      histogram tempMomIdHisto;
205      histogram tempGmaIdHisto;
206      histogram tempIdVsMomIdHisto;
207 +    histogram tempIdVsGmaIdHisto;
208  
209      tempIdHisto.inputCollection = currentObject;
210      tempMomIdHisto.inputCollection = currentObject;
211      tempGmaIdHisto.inputCollection = currentObject;
212      tempIdVsMomIdHisto.inputCollection = currentObject;
213 +    tempIdVsGmaIdHisto.inputCollection = currentObject;
214  
215      if(currentObject == "secondary muons") currentObject = "secondaryMuons";
216 +    if(currentObject == "secondary photons") currentObject = "secondaryPhotons";
217 +    if(currentObject == "secondary electrons") currentObject = "secondaryElectrons";
218  
219      currentObject = currentObject.substr(0, currentObject.size()-1);
220      tempIdHisto.name = currentObject+"GenMatchId";
221      tempMomIdHisto.name = currentObject+"GenMatchMotherId";
222      tempGmaIdHisto.name = currentObject+"GenMatchGrandmotherId";
223      tempIdVsMomIdHisto.name = currentObject+"GenMatchIdVsMotherId";
224 +    tempIdVsGmaIdHisto.name = currentObject+"GenMatchIdVsGrandmotherId";
225  
226      currentObject.at(0) = toupper(currentObject.at(0));
227      tempIdHisto.title = currentObject+" Gen-matched Particle";
228      tempMomIdHisto.title = currentObject+" Gen-matched Particle's Mother";
229      tempGmaIdHisto.title = currentObject+" Gen-matched Particle's Grandmother";
230      tempIdVsMomIdHisto.title = currentObject+" Gen-matched Particle's Mother vs. Particle;Particle;Mother";
231 +    tempIdVsGmaIdHisto.title = currentObject+" Gen-matched Particle's Grandmother vs. Particle;Particle;Grandmother";
232 +
233  
234 <    int maxNum = 24;
234 >    int maxNum = 25;
235      vector<double> binVector;
236      binVector.push_back(maxNum);
237      binVector.push_back(0);
# Line 171 | Line 249 | OSUAnalysis::OSUAnalysis (const edm::Par
249      tempIdVsMomIdHisto.bins = binVector;
250      tempIdVsMomIdHisto.inputVariables.push_back("genMatchedId");
251      tempIdVsMomIdHisto.inputVariables.push_back("genMatchedMotherIdReverse");
252 +    tempIdVsGmaIdHisto.bins = binVector;
253 +    tempIdVsGmaIdHisto.inputVariables.push_back("genMatchedId");
254 +    tempIdVsGmaIdHisto.inputVariables.push_back("genMatchedGrandmotherIdReverse");
255  
256      histograms.push_back(tempIdHisto);
257      histograms.push_back(tempMomIdHisto);
258      histograms.push_back(tempGmaIdHisto);
259      histograms.push_back(tempIdVsMomIdHisto);
260 +    histograms.push_back(tempIdVsGmaIdHisto);
261    }
262  
263  
# Line 187 | Line 269 | OSUAnalysis::OSUAnalysis (const edm::Par
269      string channelName  (channels_.at(currentChannel).getParameter<string>("name"));
270      tempChannel.name = channelName;
271      TString channelLabel = channelName;
272 +    if (verbose_) clog << "Processing channel:  " << channelName << endl;  
273  
274      //set triggers for this channel
275      vector<string> triggerNames;
276      triggerNames.clear();
277 +    vector<string> triggerToVetoNames;
278 +    triggerToVetoNames.clear();
279 +
280      tempChannel.triggers.clear();
281 +    tempChannel.triggersToVeto.clear();
282      if(channels_.at(currentChannel).exists("triggers")){
283        triggerNames   = channels_.at(currentChannel).getParameter<vector<string> >("triggers");
284        for(uint trigger = 0; trigger!= triggerNames.size(); trigger++)
285          tempChannel.triggers.push_back(triggerNames.at(trigger));
286        objectsToGet.push_back("triggers");
287      }
288 <
288 >    if(channels_.at(currentChannel).exists("triggersToVeto")){
289 >      triggerToVetoNames = channels_.at(currentChannel).getParameter<vector<string> >("triggersToVeto");
290 >      for(uint trigger = 0; trigger!= triggerToVetoNames.size(); trigger++)
291 >        tempChannel.triggersToVeto.push_back(triggerToVetoNames.at(trigger));
292 >      objectsToGet.push_back("triggers");
293 >    }
294  
295  
296  
297      //create cutFlow for this channel
298      cutFlows_.push_back (new CutFlow (fs_, channelName));
299 <
300 <    //book a directory in the output file with the name of the channel
301 <    TFileDirectory subDir = fs_->mkdir( channelName );
210 <    directories.push_back(subDir);
211 <
212 <    std::map<std::string, TH1D*> oneDhistoMap;
213 <    oneDHists_.push_back(oneDhistoMap);
214 <    std::map<std::string, TH2D*> twoDhistoMap;
215 <    twoDHists_.push_back(twoDhistoMap);
216 <
217 <
218 <
219 <    //book all histograms included in the configuration
220 <    for(uint currentHistogramIndex = 0; currentHistogramIndex != histograms.size(); currentHistogramIndex++){
221 <      histogram currentHistogram = histograms.at(currentHistogramIndex);
222 <      int numBinsElements = currentHistogram.bins.size();
223 <      int numInputVariables = currentHistogram.inputVariables.size();
224 <
225 <      if(numBinsElements != 3 && numBinsElements !=6) {
226 <        std::cout << "Error: Didn't find correct number of bin specifications for histogram named '" << currentHistogram.name << "'\n";
227 <        exit(0);
228 <      }
229 <      else if((numBinsElements == 3 && numInputVariables !=1) || (numBinsElements == 6 && numInputVariables!=2)){
230 <        std::cout << "Error: Didn't find correct number of input variables for histogram named '" << currentHistogram.name << "'\n";
231 <        exit(0);
232 <      }
233 <      else if(numBinsElements == 3){
234 <        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));
235 <      }
236 <      else if(numBinsElements == 6){
237 <        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));
238 <
239 <      }
240 <
241 <
242 <      if(currentHistogram.name.find("GenMatch")==std::string::npos) continue;
243 <
244 <      // bin      particle type
245 <      // ---      -------------
246 <      //  0        unmatched
247 <      //  1        u
248 <      //  2        d
249 <      //  3        s
250 <      //  4        c
251 <      //  5        b
252 <      //  6        t
253 <      //  7        e
254 <      //  8        mu
255 <      //  9        tau
256 <      // 10        nu
257 <      // 11        g
258 <      // 12        gamma
259 <      // 13        Z
260 <      // 14        W
261 <      // 15        light meson
262 <      // 16        K meson
263 <      // 17        D meson
264 <      // 18        B meson
265 <      // 19        light baryon
266 <      // 20        strange baryon
267 <      // 21        charm baryon
268 <      // 22        bottom baryon
269 <      // 23        other
270 <
271 <      vector<TString> labelArray;
272 <      labelArray.push_back("unmatched");
273 <      labelArray.push_back("u");
274 <      labelArray.push_back("d");
275 <      labelArray.push_back("s");
276 <      labelArray.push_back("c");
277 <      labelArray.push_back("b");
278 <      labelArray.push_back("t");
279 <      labelArray.push_back("e");
280 <      labelArray.push_back("#mu");
281 <      labelArray.push_back("#tau");
282 <      labelArray.push_back("#nu");
283 <      labelArray.push_back("g");
284 <      labelArray.push_back("#gamma");
285 <      labelArray.push_back("Z");
286 <      labelArray.push_back("W");
287 <      labelArray.push_back("light meson");
288 <      labelArray.push_back("K meson");
289 <      labelArray.push_back("D meson");
290 <      labelArray.push_back("B meson");
291 <      labelArray.push_back("light baryon");
292 <      labelArray.push_back("strange baryon");
293 <      labelArray.push_back("charm baryon");
294 <      labelArray.push_back("bottom baryon");
295 <      labelArray.push_back("other");
296 <
297 <      for(int bin = 0; bin !=currentHistogram.bins.at(0); bin++){
298 <        if(currentHistogram.name.find("GenMatchIdVsMotherId")==std::string::npos) {
299 <          oneDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
300 <        }
301 <        else {
302 <          twoDHists_.at(currentChannel)[currentHistogram.name]->GetYaxis()->SetBinLabel(bin+1,labelArray.at(currentHistogram.bins.at(0)-bin-1));
303 <          twoDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
304 <        }
305 <      }
306 <      if(currentHistogram.name.find("GenMatchIdVsMotherId")!=std::string::npos) {
307 <        twoDHists_.at(currentChannel)[currentHistogram.name]->GetXaxis()->CenterTitle();
308 <        twoDHists_.at(currentChannel)[currentHistogram.name]->GetYaxis()->CenterTitle();
309 <      }
310 <
311 <    }
312 <
313 <    // Book a histogram for the number of each object type to be plotted.  
314 <    // Name of objectToPlot here must match the name specified in OSUAnalysis::analyze().  
315 <    for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
316 <      string currentObject = objectsToPlot.at(currentObjectIndex);
317 <      int maxNum = 10;
318 <      if(currentObject == "mcparticles") maxNum = 50;
319 <      else if(currentObject == "primaryvertexs") maxNum = 50;
320 <
321 <      if(currentObject == "muon-muon pairs")                currentObject = "dimuonPairs";
322 <      else if(currentObject == "electron-electron pairs")   currentObject = "dielectronPairs";
323 <      else if(currentObject == "electron-muon pairs")       currentObject = "electronMuonPairs";
324 <      else if(currentObject == "track-event pairs")         currentObject = "trackEventPairs";
325 <      else if(currentObject == "electron-track pairs")      currentObject = "electronTrackPairs";        
326 <      else if(currentObject == "muon-track pairs")          currentObject = "muonTrackPairs";    
327 <      else if(currentObject == "muon-tau pairs")            currentObject = "muonTauPairs";      
328 <      else if(currentObject == "tau-tau pairs")             currentObject = "ditauPairs";
329 <      else if(currentObject == "tau-track pairs")           currentObject = "tauTrackPairs";
330 <      else if(currentObject == "muon-secondary muon pairs") currentObject = "muonSecondaryMuonPairs";
331 <      else if(currentObject == "secondary muons")           currentObject = "secondaryMuons";
332 <
333 <      currentObject.at(0) = toupper(currentObject.at(0));  
334 <      string histoName = "num" + currentObject;
335 <
336 <      if(histoName == "numPrimaryvertexs"){
337 <        string newHistoName = histoName + "BeforePileupCorrection";
338 <        oneDHists_.at(currentChannel)[newHistoName] = directories.at(currentChannel).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+" Before Pileup Correction; # "+currentObject, maxNum, 0, maxNum);
339 <        newHistoName = histoName + "AfterPileupCorrection";
340 <        oneDHists_.at(currentChannel)[newHistoName] = directories.at(currentChannel).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+ " After Pileup Correction; # "+currentObject, maxNum, 0, maxNum);
341 <      }
342 <      else
343 <        oneDHists_.at(currentChannel)[histoName] = directories.at(currentChannel).make<TH1D> (TString(histoName),channelLabel+" channel: Number of Selected "+currentObject+"; # "+currentObject, maxNum, 0, maxNum);
344 <    }
345 <
346 <
347 <
348 <
299 >    vector<TFileDirectory> directories; //vector of directories in the output file.
300 >    vector<TFileDirectory> treeDirectories; //vector of directories for trees in the output file.
301 >    vector<string> subSubDirNames;//subdirectories in each channel.
302      //get list of cuts for this channel
303      vector<edm::ParameterSet> cuts_  (channels_.at(currentChannel).getParameter<vector<edm::ParameterSet> >("cuts"));
304  
305 +
306      //loop over and parse all cuts
307      for(uint currentCut = 0; currentCut != cuts_.size(); currentCut++){
308        cut tempCut;
309        //store input collection for cut
310        string tempInputCollection = cuts_.at(currentCut).getParameter<string> ("inputCollection");
311        if(tempInputCollection == "muon-electron pairs") tempInputCollection = "electron-muon pairs";
312 +      if(tempInputCollection == "photon-electron pairs") tempInputCollection = "electron-photon pairs";
313 +      if(tempInputCollection == "photon-muon pairs") tempInputCollection = "muon-photon pairs";
314 +      if(tempInputCollection == "jet-electron pairs") tempInputCollection = "electron-jet pairs";
315 +      if(tempInputCollection == "jet-muon pairs") tempInputCollection = "muon-jet pairs";
316 +      if(tempInputCollection == "event-muon pairs") tempInputCollection = "muon-event pairs";
317 +      if(tempInputCollection == "jet-met pairs")  tempInputCollection = "met-jet pairs";
318 +      if(tempInputCollection == "track-jet pairs")  tempInputCollection = "track-jet pairs";
319 +      if(tempInputCollection == "jet-photon pairs") tempInputCollection = "photon-jet pairs";
320        if(tempInputCollection == "event-track pairs")   tempInputCollection = "track-event pairs";
321        if(tempInputCollection == "secondary muon-muon pairs")   tempInputCollection = "muon-secondary muon pairs";
322 +      if(tempInputCollection == "secondary jet-jet pairs")   tempInputCollection = "jet-secondary jet pairs";
323 +      if(tempInputCollection == "secondary jet-muon pairs")   tempInputCollection = "muon-secondary jet pairs";
324 +      if(tempInputCollection == "secondary photon-muon pairs")   tempInputCollection = "muon-secondary photon pairs";
325 +      if(tempInputCollection == "secondary jet-photon pairs")   tempInputCollection = "photon-secondary jet pairs";
326 +      if(tempInputCollection == "secondary jet-electron pairs")   tempInputCollection = "electron-secondary jet pairs";
327 +      if(tempInputCollection == "secondary electron-electron pairs")   tempInputCollection = "electron-secondary electron pairs";
328 +      if(tempInputCollection == "trigobj-electron pairs")   tempInputCollection = "electron-trigobj pairs";
329 +      if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
330        tempCut.inputCollection = tempInputCollection;
331 <      if(tempInputCollection.find("pairs")==std::string::npos){ //just a single object
332 <        if(tempInputCollection.find("secondary")!=std::string::npos){//secondary object
333 <          int spaceIndex = tempInputCollection.find(" ");
334 <          int secondWordLength = tempInputCollection.size() - spaceIndex;
335 <          objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
336 <        }
337 <        else{
338 <          objectsToGet.push_back(tempInputCollection);
339 <        }
340 <        objectsToCut.push_back(tempInputCollection);
331 >      if(tempInputCollection.find("pairs")==string::npos){ //just a single object
332 >        if(tempInputCollection.find("secondary")!=string::npos){//secondary object
333 >          if(tempInputCollection.find("secondary muons")!=string::npos){//treat secondary muons differently; allow for a different input collection
334 >            objectsToGet.push_back("secondary muons");  
335 >          } else {
336 >            int spaceIndex = tempInputCollection.find(" ");
337 >            int secondWordLength = tempInputCollection.size() - spaceIndex;
338 >            objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
339 >          }
340 >        }
341 >        else{
342 >          objectsToGet.push_back(tempInputCollection);
343 >        }
344 >        objectsToCut.push_back(tempInputCollection);
345 >        objectsToFlag.push_back(tempInputCollection);
346        }
347        else{//pair of objects, need to add them both to objectsToGet
348 <        string obj1;
349 <        string obj2;
350 <        getTwoObjs(tempInputCollection, obj1, obj2);
351 <        string obj2ToGet = getObjToGet(obj2);  
348 >        string obj1;
349 >        string obj2;
350 >        getTwoObjs(tempInputCollection, obj1, obj2);
351 >        string obj2ToGet = getObjToGet(obj2);
352          objectsToCut.push_back(tempInputCollection);
353          objectsToCut.push_back(obj1);
354 <        objectsToCut.push_back(obj2);  
354 >        objectsToCut.push_back(obj2);
355 >        objectsToFlag.push_back(tempInputCollection);
356 >        objectsToFlag.push_back(obj1);
357 >        objectsToFlag.push_back(obj2);
358          objectsToGet.push_back(tempInputCollection);
359          objectsToGet.push_back(obj1);
360          objectsToGet.push_back(obj2ToGet);
# Line 387 | Line 365 | OSUAnalysis::OSUAnalysis (const edm::Par
365  
366        //split cut string into parts and store them
367        string cutString = cuts_.at(currentCut).getParameter<string> ("cutString");
368 <      std::vector<string> cutStringVector = splitString(cutString);
368 >      vector<string> cutStringVector = splitString(cutString);
369        if(cutStringVector.size()!=3 && cutStringVector.size() % 4 !=3){
370 <        std::cout << "Error: Didn't find the expected number elements in the following cut string: '" << cutString << "'\n";
370 >        clog << "Error: Didn't find the expected number elements in the following cut string: '" << cutString << "'\n";
371          exit(0);
372        }
373        tempCut.numSubcuts = (cutStringVector.size()+1)/4;
374        for(int subcutIndex = 0; subcutIndex != tempCut.numSubcuts; subcutIndex++){//loop over all the pieces of the cut combined using &,|
375          int indexOffset = 4 * subcutIndex;
376          string currentVariableString = cutStringVector.at(indexOffset);
377 <        if(currentVariableString.find("(")==std::string::npos){
377 >        if(currentVariableString.find("(")==string::npos){
378            tempCut.functions.push_back("");//no function was specified
379            tempCut.variables.push_back(currentVariableString);// variable to cut on
380          }
# Line 407 | Line 385 | OSUAnalysis::OSUAnalysis (const edm::Par
385          }
386          tempCut.comparativeOperators.push_back(cutStringVector.at(indexOffset+1));// comparison to make
387          tempCut.cutValues.push_back(atof(cutStringVector.at(indexOffset+2).c_str()));// threshold value to pass cut
388 +        tempCut.cutStringValues.push_back(cutStringVector.at(indexOffset+2));// string value to pass cut
389          if(subcutIndex != 0) tempCut.logicalOperators.push_back(cutStringVector.at(indexOffset-1)); // logical comparison (and, or)
390        }
391  
392        //get number of objects required to pass cut for event to pass
393        string numberRequiredString = cuts_.at(currentCut).getParameter<string> ("numberRequired");
394 <      std::vector<string> numberRequiredVector = splitString(numberRequiredString);
394 >      vector<string> numberRequiredVector = splitString(numberRequiredString);
395        if(numberRequiredVector.size()!=2){
396 <        std::cout << "Error: Didn't find two elements in the following number requirement string: '" << numberRequiredString << "'\n";
396 >        clog << "Error: Didn't find two elements in the following number requirement string: '" << numberRequiredString << "'\n";
397          exit(0);
398        }
399  
# Line 422 | Line 401 | OSUAnalysis::OSUAnalysis (const edm::Par
401        tempCut.numberRequired = numberRequiredInt;// number of objects required to pass the cut
402        tempCut.eventComparativeOperator = numberRequiredVector.at(0);// comparison to make
403  
404 <
404 >      //Set up vectors to store the directories and subDirectories for each channel.
405 >      string subSubDirName;
406        string tempCutName;
407        if(cuts_.at(currentCut).exists("alias")){
408          tempCutName = cuts_.at(currentCut).getParameter<string> ("alias");
409 +        subSubDirName = "After " + tempCutName + " Cut Applied";
410        }
411        else{
412          //construct string for cutflow table
# Line 433 | Line 414 | OSUAnalysis::OSUAnalysis (const edm::Par
414          string collectionString = plural ? tempInputCollection : tempInputCollection.substr(0, tempInputCollection.size()-1);
415          string cutName =  numberRequiredString + " " + collectionString + " with " + cutString;
416          tempCutName = cutName;
417 +        subSubDirName = "After " + numberRequiredString + " " + collectionString + " with " + cutString + " Cut Applied";
418        }
419 +
420 +      tempCut.isVeto = false;
421 +      if(cuts_.at(currentCut).exists("isVeto")){
422 +        bool isVeto = cuts_.at(currentCut).getParameter<bool> ("isVeto");
423 +        if (isVeto == true) tempCut.isVeto = true;
424 +      }
425 +      subSubDirNames.push_back(subSubDirName);
426        tempCut.name = tempCutName;
427 +      if (verbose_) clog << "Setting up cut, index: " << currentCut << ", input collection: " << tempInputCollection<< ", name: " << tempCut.name << endl;  
428  
429        tempChannel.cuts.push_back(tempCut);
430  
431  
432      }//end loop over cuts
433  
434 +    vector<map<string, TH1D*>> oneDHistsTmp;
435 +    vector<map<string, TH2D*>> twoDHistsTmp;
436 +    //book a directory in the output file with the name of the channel
437 +    TFileDirectory subDir = fs_->mkdir( channelName );
438 +    //loop over the cuts to set up subdirectory for each cut if GetPlotsAfterEachCut_ is true.
439 +    if(GetPlotsAfterEachCut_){
440 +      for( uint currentDir=0; currentDir != subSubDirNames.size(); currentDir++){
441 +        TFileDirectory subSubDir = subDir.mkdir( subSubDirNames[currentDir] );
442 +        directories.push_back(subSubDir);
443 +        map<string, TH1D*> oneDhistoMap;
444 +        oneDHistsTmp.push_back(oneDhistoMap);
445 +        map<string, TH2D*> twoDhistoMap;
446 +        twoDHistsTmp.push_back(twoDhistoMap);
447 +      }
448 +      treeDirectories.push_back(subDir);
449 +      oneDHists_.push_back(oneDHistsTmp);
450 +      twoDHists_.push_back(twoDHistsTmp);
451 +    }
452 +    //only set up directories with names of the channels if GetPlotsAfterEachCut_ is false.
453 +    else{
454 +      map<string, TH1D*> oneDhistoMap;
455 +      oneDHistsTmp.push_back(oneDhistoMap);
456 +      map<string, TH2D*> twoDhistoMap;
457 +      twoDHistsTmp.push_back(twoDhistoMap);
458 +      oneDHists_.push_back(oneDHistsTmp);
459 +      twoDHists_.push_back(twoDHistsTmp);
460 +      directories.push_back(subDir);
461 +      treeDirectories.push_back(subDir);
462 +
463 +    }
464 +
465 +    for(uint currentDir = 0; !useEDMFormat_ && currentDir != treeDirectories.size(); currentDir++){
466 +      TTree* newTree = treeDirectories.at(currentDir).make<TTree> (TString("BNTree_"+channelLabel), TString("BNTree_"+channelLabel));
467 +      BNTrees_.push_back(newTree);
468 +      BNTrees_.back()->Branch("event_runInt",  &BNTreeBranchVals_runInt_,  "event_runInt/I");      
469 +      BNTrees_.back()->Branch("event_lumiInt", &BNTreeBranchVals_lumiInt_, "event_lumiInt/I");      
470 +      BNTrees_.back()->Branch("event_evtLong", &BNTreeBranchVals_evtLong_, "event_evtLong/L");      
471 +      for (uint iBranch = 0; iBranch < treeBranches_.size(); iBranch++){
472 +        BranchSpecs currentVar = treeBranches_.at(iBranch);
473 +        vector<float> newVec;
474 +        BNTreeBranchVals_[currentVar.name] = newVec;
475 +        BNTrees_.back()->Branch(TString(currentVar.name), &BNTreeBranchVals_.at(currentVar.name));
476 +      } // end for (uint iBranch = 0; iBranch < treeBranches_.size(); iBranch++)
477 +    }
478 +
479 +    //book all histograms included in the configuration
480 +    for(uint currentDir = 0; currentDir != directories.size(); currentDir++){//loop over all the directories.
481 +
482 +      for(uint currentHistogramIndex = 0; currentHistogramIndex != histograms.size(); currentHistogramIndex++){
483 +
484 +        histogram currentHistogram = histograms.at(currentHistogramIndex);
485 +        int numBinsElements = currentHistogram.bins.size();
486 +        int numInputVariables = currentHistogram.inputVariables.size();
487 +        int numBinEdgesX = currentHistogram.variableBinsX.size();
488 +        int numBinEdgesY = currentHistogram.variableBinsY.size();
489 +
490 +        if(numBinsElements == 1){
491 +          if(numBinEdgesX > 1){
492 +            if(numBinEdgesY > 1)
493 +              numBinsElements = 6;
494 +            else
495 +              numBinsElements = 3;
496 +          }
497 +        }
498 +        if(numBinsElements != 3 && numBinsElements !=6){
499 +          clog << "Error: Didn't find correct number of bin specifications for histogram named '" << currentHistogram.name << "'\n";
500 +          exit(0);
501 +        }
502 +        else if((numBinsElements == 3 && numInputVariables !=1) || (numBinsElements == 6 && numInputVariables!=2)){
503 +          clog << "Error: Didn't find correct number of input variables for histogram named '" << currentHistogram.name << "'\n";
504 +          exit(0);
505 +        }
506 +        else if(numBinsElements == 3){
507 +          if (currentHistogram.bins.size () == 3)
508 +            oneDHists_.at(currentChannel).at(currentDir)[currentHistogram.name] = directories.at(currentDir).make<TH1D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, currentHistogram.bins.at(0), currentHistogram.bins.at(1), currentHistogram.bins.at(2));
509 +          else
510 +            {
511 +              oneDHists_.at(currentChannel).at(currentDir)[currentHistogram.name] = directories.at(currentDir).make<TH1D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, numBinEdgesX - 1, currentHistogram.variableBinsX.data ());
512 +            }
513 +        }
514 +        else if(numBinsElements == 6){
515 +          if (currentHistogram.bins.size () == 6)
516 +            twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name] = directories.at(currentDir).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));
517 +          else
518 +            twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name] = directories.at(currentDir).make<TH2D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, numBinEdgesX - 1, currentHistogram.variableBinsX.data (), numBinEdgesY - 1, currentHistogram.variableBinsY.data ());
519 +        }
520 +
521 +
522 +        if(currentHistogram.name.find("GenMatch")==string::npos) continue;
523 +
524 +        // bin      particle type
525 +        // ---      -------------
526 +        //  0        unmatched
527 +        //  1        u
528 +        //  2        d
529 +        //  3        s
530 +        //  4        c
531 +        //  5        b
532 +        //  6        t
533 +        //  7        e
534 +        //  8        mu
535 +        //  9        tau
536 +        // 10        nu
537 +        // 11        g
538 +        // 12        gamma
539 +        // 13        Z
540 +        // 14        W
541 +        // 15        light meson
542 +        // 16        K meson
543 +        // 17        D meson
544 +        // 18        B meson
545 +        // 19        light baryon
546 +        // 20        strange baryon
547 +        // 21        charm baryon
548 +        // 22        bottom baryon
549 +        // 23        QCD string
550 +        // 24        other
551 +
552 +        vector<TString> labelArray;
553 +        labelArray.push_back("unmatched");
554 +        labelArray.push_back("u");
555 +        labelArray.push_back("d");
556 +        labelArray.push_back("s");
557 +        labelArray.push_back("c");
558 +        labelArray.push_back("b");
559 +        labelArray.push_back("t");
560 +        labelArray.push_back("e");
561 +        labelArray.push_back("#mu");
562 +        labelArray.push_back("#tau");
563 +        labelArray.push_back("#nu");
564 +        labelArray.push_back("g");
565 +        labelArray.push_back("#gamma");
566 +        labelArray.push_back("Z");
567 +        labelArray.push_back("W");
568 +        labelArray.push_back("light meson");
569 +        labelArray.push_back("K meson");
570 +        labelArray.push_back("D meson");
571 +        labelArray.push_back("B meson");
572 +        labelArray.push_back("light baryon");
573 +        labelArray.push_back("strange baryon");
574 +        labelArray.push_back("charm baryon");
575 +        labelArray.push_back("bottom baryon");
576 +        labelArray.push_back("QCD string");
577 +        labelArray.push_back("other");
578 +
579 +        for(int bin = 0; bin !=currentHistogram.bins.at(0); bin++){
580 +          if(currentHistogram.name.find("GenMatchIdVsMotherId")==string::npos && currentHistogram.name.find("GenMatchIdVsGrandmotherId")==string::npos) {
581 +            oneDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
582 +          }
583 +          else {
584 +            twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetYaxis()->SetBinLabel(bin+1,labelArray.at(currentHistogram.bins.at(0)-bin-1));
585 +            twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
586 +          }
587 +        }
588 +        if(currentHistogram.name.find("GenMatchIdVsMotherId")!=string::npos || currentHistogram.name.find("GenMatchIdVsGrandmotherId")!=string::npos) {
589 +          twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->CenterTitle();
590 +          twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetYaxis()->CenterTitle();
591 +        }
592 +
593 +      }  // end      for(uint currentHistogramIndex = 0; currentHistogramIndex != histograms.size(); currentHistogramIndex++)
594 +
595 +
596 +      // Book a histogram for the number of each object type to be plotted.
597 +      // Name of objectToPlot here must match the name specified in OSUAnalysis::analyze().
598 +      for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
599 +        string currentObject = objectsToPlot.at(currentObjectIndex);
600 +        int maxNum = 10;
601 +        if(currentObject == "mcparticles") maxNum = 50;
602 +        else if(currentObject == "primaryvertexs") maxNum = 50;
603 +
604 +        if(currentObject == "muon-muon pairs")                currentObject = "dimuonPairs";
605 +        else if(currentObject == "electron-electron pairs")   currentObject = "dielectronPairs";
606 +        else if(currentObject == "electron-muon pairs")       currentObject = "electronMuonPairs";
607 +        else if(currentObject == "electron-photon pairs")     currentObject = "electronPhotonPairs";
608 +        else if(currentObject == "muon-photon pairs")         currentObject = "muonPhotonPairs";
609 +        else if(currentObject == "secondary jets")            currentObject = "secondaryJets";
610 +        else if(currentObject == "secondary photons")            currentObject = "secondaryPhotons";
611 +        else if(currentObject == "jet-jet pairs")             currentObject = "dijetPairs";
612 +        else if(currentObject == "jet-secondary jet pairs")   currentObject = "jetSecondaryJetPairs";
613 +        else if(currentObject == "electron-jet pairs")        currentObject = "electronJetPairs";
614 +        else if(currentObject == "muon-jet pairs")            currentObject = "muonJetPairs";
615 +        else if(currentObject == "muon-event pairs")            currentObject = "muonEventPairs";
616 +        else if(currentObject == "photon-jet pairs")            currentObject = "photonJetPairs";
617 +        else if(currentObject == "met-jet pairs")             currentObject = "metJetPairs";
618 +        else if(currentObject == "track-jet pairs")           currentObject = "trackJetPairs";
619 +        else if(currentObject == "muon-secondary jet pairs")  currentObject = "muonSecondaryJetPairs";
620 +        else if(currentObject == "muon-secondary photon pairs")  currentObject = "muonSecondaryPhotonPairs";
621 +        else if(currentObject == "photon-secondary jet pairs")  currentObject = "photonSecondaryJetPairs";
622 +        else if(currentObject == "electron-secondary jet pairs")  currentObject = "electronSecondaryJetPairs";
623 +        else if(currentObject == "track-event pairs")         currentObject = "trackEventPairs";
624 +        else if(currentObject == "electron-track pairs")      currentObject = "electronTrackPairs";
625 +        else if(currentObject == "muon-track pairs")          currentObject = "muonTrackPairs";
626 +        else if(currentObject == "secondary muon-track pairs") currentObject = "secondaryMuonTrackPairs";
627 +        else if(currentObject == "muon-tau pairs")            currentObject = "muonTauPairs";
628 +        else if(currentObject == "tau-tau pairs")             currentObject = "ditauPairs";
629 +        else if(currentObject == "tau-track pairs")           currentObject = "tauTrackPairs";
630 +        else if(currentObject == "muon-secondary muon pairs") currentObject = "muonSecondaryMuonPairs";
631 +        else if(currentObject == "secondary muons")           currentObject = "secondaryMuons";
632 +        else if(currentObject == "electron-secondary electron pairs") currentObject = "electronSecondaryElectronPairs";
633 +        else if(currentObject == "secondary electrons")       currentObject = "secondaryElectrons";
634 +        else if(currentObject == "electron-trigobj pairs")    currentObject = "electronTrigobjPairs";
635 +        else if(currentObject == "muon-trigobj pairs")        currentObject = "muonTrigobjPairs";
636 +        else if(currentObject == "electron-mcparticle pairs")   currentObject = "electronMCparticlePairs";
637 +
638 +
639 +        currentObject.at(0) = toupper(currentObject.at(0));
640 +        string histoName = "num" + currentObject;
641 +
642 +        if(histoName == "numPrimaryvertexs"){
643 +          string newHistoName = histoName + "BeforePileupCorrection";
644 +          oneDHists_.at(currentChannel).at(currentDir)[newHistoName] = directories.at(currentDir).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+" Before Pileup Correction; # "+currentObject, maxNum, 0, maxNum);
645 +          newHistoName = histoName + "AfterPileupCorrection";
646 +          oneDHists_.at(currentChannel).at(currentDir)[newHistoName] = directories.at(currentDir).make<TH1D> (TString(newHistoName),channelLabel+" channel: Number of Selected "+currentObject+ " After Pileup Correction; # "+currentObject, maxNum, 0, maxNum);
647 +        }
648 +        else
649 +          oneDHists_.at(currentChannel).at(currentDir)[histoName] = directories.at(currentDir).make<TH1D> (TString(histoName),channelLabel+" channel: Number of Selected "+currentObject+"; # "+currentObject, maxNum, 0, maxNum);
650 +      }
651 +
652 +      if (verbose_) {
653 +        clog << "List of 1D histograms booked for channel " << channelName << " and directory " << currentDir << ":" << endl;
654 +        for(map<string, TH1D*>::iterator
655 +              iter = oneDHists_.at(currentChannel).at(currentDir).begin();
656 +            iter  != oneDHists_.at(currentChannel).at(currentDir).end();
657 +            iter++) {
658 +          clog << " " << iter->first
659 +               << ":  name=" << iter->second->GetName()
660 +               << ", title=" << iter->second->GetTitle()
661 +               << ", bins=(" << iter->second->GetNbinsX()
662 +               << "," << iter->second->GetXaxis()->GetXmin()
663 +               << "," << iter->second->GetXaxis()->GetXmax()
664 +               << ")" << endl;
665 +        }  
666 +        clog << "List of 2D histograms booked for channel " << channelName << " and directory " << currentDir << ":" << endl;
667 +        for(map<string, TH2D*>::iterator
668 +              iter = twoDHists_.at(currentChannel).at(currentDir).begin();
669 +            iter  != twoDHists_.at(currentChannel).at(currentDir).end();
670 +            iter++) {
671 +          clog << " " << iter->first
672 +               << ":  name=" << iter->second->GetName()
673 +               << ", title=" << iter->second->GetTitle()
674 +               << ", binsX=(" << iter->second->GetNbinsX()
675 +               << "," << iter->second->GetXaxis()->GetXmin()
676 +               << "," << iter->second->GetXaxis()->GetXmax()
677 +               << ")"
678 +               << ", binsY=(" << iter->second->GetNbinsY()
679 +               << "," << iter->second->GetYaxis()->GetXmin()
680 +               << "," << iter->second->GetYaxis()->GetXmax()
681 +               << ")"
682 +               << endl;
683 +        }  
684 +      }
685 +
686 +    }//end of loop over directories
687      channels.push_back(tempChannel);
688      tempChannel.cuts.clear();
446
689    }//end loop over channels
690  
691  
692 +  // Create the cutflow histogram and fill with 0 weight, in case no events are found in the input file.  
693 +  for(uint currentChannelIndex = 0; currentChannelIndex != channels.size(); currentChannelIndex++){
694 +    channel currentChannel = channels.at(currentChannelIndex);
695 +    if(currentChannel.triggers.size() != 0 || currentChannel.triggersToVeto.size() != 0){  //triggers specified
696 +      cutFlows_.at(currentChannelIndex)->at("trigger") = true;  
697 +    }
698 +    for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
699 +      cut currentCut = currentChannel.cuts.at(currentCutIndex);
700 +      cutFlows_.at(currentChannelIndex)->at (currentCut.name) = true;
701 +    }
702 +    cutFlows_.at(currentChannelIndex)->fillCutFlow(0);  // fill cutflow with 0 weight, just to create the cutflow histograms  
703 +  }
704 +
705    //make unique vector of objects we need to get from the event
706    sort( objectsToGet.begin(), objectsToGet.end() );
707    objectsToGet.erase( unique( objectsToGet.begin(), objectsToGet.end() ), objectsToGet.end() );
708    //make unique vector of objects we need to cut on
709    sort( objectsToCut.begin(), objectsToCut.end() );
710    objectsToCut.erase( unique( objectsToCut.begin(), objectsToCut.end() ), objectsToCut.end() );
711 +  //make unique vector of objects we need to set flags for
712 +  sort( objectsToFlag.begin(), objectsToFlag.end() );
713 +  objectsToFlag.erase( unique( objectsToFlag.begin(), objectsToFlag.end() ), objectsToFlag.end() );
714  
715 +  // Move all paired objects to the end of the list, so that the flags for single objects are always set before those of paired objects.  
716 +  for (uint i=0; i<objectsToFlag.size(); i++) {
717 +    if (objectsToFlag.at(i).find("pairs")!=string::npos) { // if it contains "pairs"
718 +      objectsToFlag.push_back(objectsToFlag.at(i));  
719 +      objectsToFlag.erase(objectsToFlag.begin()+i);  
720 +    }
721 +  }
722 +
723 +  if (verbose_) {
724 +    clog << "List of channels:" << endl;
725 +    for (uint i=0; i<channels.size(); i++) {
726 +      clog << " " << channels.at(i).name << endl;
727 +    }
728 +    clog << "List of objects to get:" << endl;
729 +    for (uint i=0; i<objectsToGet.size(); i++) {
730 +      clog << " " << objectsToGet.at(i) << endl;
731 +    }
732 +    clog << "List of objects to plot:" << endl;
733 +    for (uint i=0; i<objectsToPlot.size(); i++) {
734 +      clog << " " << objectsToPlot.at(i) << endl;
735 +    }
736 +    clog << "List of objects to cut:" << endl;
737 +    for (uint i=0; i<objectsToCut.size(); i++) {
738 +      clog << " " << objectsToCut.at(i) << endl;
739 +    }
740 +    clog << "List of objects to flag:" << endl;
741 +    for (uint i=0; i<objectsToFlag.size(); i++) {
742 +      clog << " " << objectsToFlag.at(i) << endl;
743 +    }
744 +  }
745 +
746 +  produces<map<string, bool> > ("channelDecisions");
747 +
748 +  if (printEventInfo_) {
749 +    findEventsLog = new ofstream();  
750 +    findEventsLog->open("findEvents.txt");  
751 +    clog << "Listing run:lumi:event in file findEvents.txt for events that pass full selection (of any channel)." << endl;  
752 +  } else {
753 +    findEventsLog = 0;
754 +  }  
755 +
756 +  isFirstEvent_ = true;  
757 +
758 +  if (verbose_) clog << "Finished OSUAnalysis::OSUAnalysis constructor." << endl;  
759 +
760 +
761 +  } // end constructor OSUAnalysis::OSUAnalysis()
762  
458 }
763  
764   OSUAnalysis::~OSUAnalysis ()
765   {
766 +
767 +  if (verbose_) clog << "Beginning OSUAnalysis::OSUAnalysis destructor." << endl;  
768 +
769    // Destroying the CutFlow objects causes the cut flow numbers and time
770    // information to be printed to standard output.
771    for(uint currentChannel = 0; currentChannel != channels_.size(); currentChannel++){
772      delete cutFlows_.at(currentChannel);
773    }
774 +
775 +  if (printEventInfo_ && findEventsLog) findEventsLog->close();  
776 +
777 +  clog << "=============================================" << endl;  
778 +  clog << "Successfully completed OSUAnalysis." << endl;  
779 +  clog << "=============================================" << endl;  
780 +
781 +  if (verbose_) clog << "Finished OSUAnalysis::OSUAnalysis destructor." << endl;  
782 +
783   }
784  
785   void
786 < OSUAnalysis::analyze (const edm::Event &event, const edm::EventSetup &setup)
786 > OSUAnalysis::produce (edm::Event &event, const edm::EventSetup &setup)
787   {
472
788    // Retrieve necessary collections from the event.
789  
790 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "triggers") != objectsToGet.end())
790 >  if (verbose_) clog << "Beginning OSUAnalysis::produce." << endl;  
791 >
792 >  if (find(objectsToGet.begin(), objectsToGet.end(), "triggers") != objectsToGet.end()) {
793      event.getByLabel (triggers_, triggers);
794 +    if (!triggers.product()) cout << "ERROR:  could not get triggers input collection" << endl;  
795 +  }
796 +
797 +  if (find(objectsToGet.begin(), objectsToGet.end(), "trigobjs") != objectsToGet.end()) {
798 +    event.getByLabel (trigobjs_, trigobjs);
799 +    if (!trigobjs.product()) cout << "ERROR:  could not get trigobjs input collection" << endl;  
800 +  }
801  
802 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "jets") != objectsToGet.end())
802 >  if (find(objectsToGet.begin(), objectsToGet.end(), "jets") != objectsToGet.end()) {
803      event.getByLabel (jets_, jets);
804 +    if (!jets.product()) cout << "ERROR:  could not get jets input collection" << endl;  
805 +  }
806  
807 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "muons") != objectsToGet.end())
807 >  if (find(objectsToGet.begin(), objectsToGet.end(), "muons") != objectsToGet.end()) {
808      event.getByLabel (muons_, muons);
809 +    if (!muons.product()) cout << "ERROR:  could not get muons input collection" << endl;  
810 +  }
811 +
812 +  if (find(objectsToGet.begin(), objectsToGet.end(), "secondary muons") != objectsToGet.end()) {
813 +    event.getByLabel (secMuons_, secMuons);
814 +    if (!secMuons.product()) cout << "ERROR:  could not get secMuons input collection" << endl;  
815 +  }
816  
817 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "electrons") != objectsToGet.end())
817 >  if (find(objectsToGet.begin(), objectsToGet.end(), "electrons") != objectsToGet.end()) {
818      event.getByLabel (electrons_, electrons);
819 +    if (!electrons.product()) cout << "ERROR:  could not get electrons input collection" << endl;  
820 +  }
821  
822 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "events") != objectsToGet.end())
822 >  if (find(objectsToGet.begin(), objectsToGet.end(), "events") != objectsToGet.end()) {
823      event.getByLabel (events_, events);
824 +    if (!events.product()) cout << "ERROR:  could not get events input collection" << endl;  
825 +  }
826  
827 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "taus") != objectsToGet.end())
827 >  if (find(objectsToGet.begin(), objectsToGet.end(), "taus") != objectsToGet.end()) {
828      event.getByLabel (taus_, taus);
829 +    if (!taus.product()) cout << "ERROR:  could not get taus input collection" << endl;  
830 +  }
831  
832 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "mets") != objectsToGet.end())
832 >  if (find(objectsToGet.begin(), objectsToGet.end(), "mets") != objectsToGet.end()) {
833      event.getByLabel (mets_, mets);
834 +    if (!mets.product()) cout << "ERROR:  could not get mets input collection" << endl;  
835 +  }
836  
837 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "tracks") != objectsToGet.end())
837 >  if (find(objectsToGet.begin(), objectsToGet.end(), "tracks") != objectsToGet.end()) {
838      event.getByLabel (tracks_, tracks);
839 +    if (!tracks.product()) cout << "ERROR:  could not get tracks input collection" << endl;  
840 +  }
841  
842 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "genjets") != objectsToGet.end())
842 >  if (find(objectsToGet.begin(), objectsToGet.end(), "genjets") != objectsToGet.end()) {
843      event.getByLabel (genjets_, genjets);
844 +    if (!genjets.product()) cout << "ERROR:  could not get genjets input collection" << endl;  
845 +  }
846  
847 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "mcparticles") != objectsToGet.end())
847 >  if (find(objectsToGet.begin(), objectsToGet.end(), "mcparticles") != objectsToGet.end()) {
848      event.getByLabel (mcparticles_, mcparticles);
849 +    if (!mcparticles.product()) cout << "ERROR:  could not get mcparticles input collection" << endl;  
850 +  }
851  
852 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "primaryvertexs") != objectsToGet.end())
852 >  if (find(objectsToGet.begin(), objectsToGet.end(), "primaryvertexs") != objectsToGet.end()) {
853      event.getByLabel (primaryvertexs_, primaryvertexs);
854 +    if (!primaryvertexs.product()) cout << "ERROR:  could not get primaryvertexs input collection" << endl;  
855 +  }
856  
857 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "bxlumis") != objectsToGet.end())
857 >  if (find(objectsToGet.begin(), objectsToGet.end(), "bxlumis") != objectsToGet.end()) {
858      event.getByLabel (bxlumis_, bxlumis);
859 +    if (!bxlumis.product()) cout << "ERROR:  could not get bxlumis input collection" << endl;  
860 +  }
861  
862 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "photons") != objectsToGet.end())
862 >  if (find(objectsToGet.begin(), objectsToGet.end(), "photons") != objectsToGet.end()) {
863      event.getByLabel (photons_, photons);
864 +    if (!photons.product()) cout << "ERROR:  could not get photons input collection" << endl;  
865 +  }
866  
867 <  if (std::find(objectsToGet.begin(), objectsToGet.end(), "superclusters") != objectsToGet.end())
867 >  if (find(objectsToGet.begin(), objectsToGet.end(), "superclusters") != objectsToGet.end()) {
868      event.getByLabel (superclusters_, superclusters);
869 +    if (!superclusters.product()) cout << "ERROR:  could not get superclusters input collection" << endl;  
870 +  }
871 +
872 +  if (datasetType_ == "signalMC"){
873 +    if (find(objectsToGet.begin(), objectsToGet.end(), "stops") != objectsToGet.end()) {
874 +      event.getByLabel (stops_, stops);
875 +      if (!stops.product()) cout << "ERROR:  could not get stops input collection" << endl;  
876 +    }
877 +  }
878  
879 <  if (useTrackCaloRhoCorr_) {  
880 <    // Used only for pile-up correction of by-hand calculation of isolation energy.  
881 <    // This rho collection is not available in all BEANs.  
879 >  if (useTrackCaloRhoCorr_) {
880 >    // Used only for pile-up correction of by-hand calculation of isolation energy.
881 >    // This rho collection is not available in all BEANs.
882      // For description of rho values for different jet reconstruction algorithms, see
883 <    // https://twiki.cern.ch/twiki/bin/view/CMS/JetAlgorithms#Algorithms  
884 <    event.getByLabel ("kt6CaloJets","rho", rhokt6CaloJetsHandle_);
883 >    // https://twiki.cern.ch/twiki/bin/view/CMS/JetAlgorithms#Algorithms
884 >    event.getByLabel ("kt6CaloJets","rho", rhokt6CaloJetsHandle_);
885 >    if (!rhokt6CaloJetsHandle_.product()) cout << "ERROR:  could not get kt6CaloJets input collection" << endl;  
886    }
887  
888 +  double masterScaleFactor = 1.0;
889  
890    //get pile-up event weight
891 <  double scaleFactor = 1.00;
892 <  if(doPileupReweighting_ && datasetType_ != "data")
893 <    scaleFactor = puWeight_->at (events->at (0).numTruePV);
894 <
895 <  cTauScaleFactor_ = 1.0;
896 < #ifdef DISPLACED_SUSY
897 <  if (datasetType_ == "signalMC")
898 <    cTauScaleFactor_ = cTauWeight_->at (event);
899 < #endif
900 <  scaleFactor *= cTauScaleFactor_;
891 >  if (doPileupReweighting_ && datasetType_ != "data") {
892 >    //for "data" datasets, the numTruePV is always set to -1
893 >    if (events->at(0).numTruePV < 0 && isFirstEvent_) clog << "WARNING[OSUAnalysis::analyze]: Event has numTruePV<0.  Turning off pile-up reweighting." << endl;
894 >    else masterScaleFactor *= puWeight_->at (events->at (0).numTruePV);
895 >  }
896 >
897 >  stopCTauScaleFactor_ = 1.0;
898 >  if (datasetType_ == "signalMC" && regex_match (dataset_, regex ("stop.*to.*_.*mm.*")))
899 >    stopCTauScaleFactor_ = stopCTauWeight_->at (event);
900 >  masterScaleFactor *= stopCTauScaleFactor_;
901  
902    //loop over all channels
903  
904 +  auto_ptr<map<string, bool> > channelDecisions (new map<string, bool>);
905    for(uint currentChannelIndex = 0; currentChannelIndex != channels.size(); currentChannelIndex++){
906      channel currentChannel = channels.at(currentChannelIndex);
907 +    if (verbose_>1) clog << " Processing channel " << currentChannel.name << endl;
908  
909      flagMap individualFlags;
910      counterMap passingCounter;
911      cumulativeFlags.clear ();
912  
913 +    for (map<string, vector<float>>::iterator iter = BNTreeBranchVals_.begin();
914 +         iter != BNTreeBranchVals_.end(); iter++) {
915 +      iter->second.clear();  // clear array
916 +    }
917 +
918      bool triggerDecision = true;
919 <    if(currentChannel.triggers.size() != 0){  //triggers specified
920 <      triggerDecision = evaluateTriggers(currentChannel.triggers,triggers.product());
919 >    if(currentChannel.triggers.size() != 0 || currentChannel.triggersToVeto.size() != 0){  //triggers specified
920 >      triggerDecision = evaluateTriggers(currentChannel.triggers, currentChannel.triggersToVeto, triggers.product());
921        cutFlows_.at(currentChannelIndex)->at ("trigger") = triggerDecision;
922      }
923  
924      //loop over all cuts
554
555
556
925      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
926        cut currentCut = currentChannel.cuts.at(currentCutIndex);
927 +      if (verbose_>2) clog << "  Processing cut, index: " << currentCutIndex << ", input collection: " << currentCut.inputCollection << ", name: " << currentCut.name << endl;  
928  
929 <      for(uint currentObjectIndex = 0; currentObjectIndex != objectsToCut.size(); currentObjectIndex++){
930 <        string currentObject = objectsToCut.at(currentObjectIndex);
929 >      for(uint currentObjectIndex = 0; currentObjectIndex != objectsToFlag.size(); currentObjectIndex++){
930 >        string currentObject = objectsToFlag.at(currentObjectIndex);
931  
932          //initialize maps to get ready to set cuts
933 <        individualFlags[currentObject].push_back (vector<bool> ());
934 <        cumulativeFlags[currentObject].push_back (vector<bool> ());
933 >        individualFlags[currentObject].push_back (vector<pair<bool,bool> > ());
934 >        cumulativeFlags[currentObject].push_back (vector<pair<bool,bool> > ());
935  
936        }
568      for(uint currentObjectIndex = 0; currentObjectIndex != objectsToCut.size(); currentObjectIndex++){
569        string currentObject = objectsToCut.at(currentObjectIndex);
937  
938 <        int flagsForPairCutsIndex = max(int(currentCutIndex-1),0);
938 >      //set flags for all relevant objects
939 >      for(int currentObjectIndex = -1; currentObjectIndex != int(objectsToFlag.size()); currentObjectIndex++){
940 >        string currentObject;  
941 >        if (currentObjectIndex < 0) currentObject = currentCut.inputCollection;  // In the first loop, set the flags for the collection that the cut is acting on.  That way other paired collections can access the correct flag for the current cut.  
942 >        else currentObject = objectsToFlag.at(currentObjectIndex);
943 >        if (currentObjectIndex >= 0 && currentObject == currentCut.inputCollection) continue;  // Flags have already been set for the inputCollection object, so should not be set again.  
944 >
945 >        // single object collections
946 >        if     (currentObject == "jets")                setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"jets");
947 >        else if(currentObject == "secondary jets")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"secondary jets");
948 >        else if(currentObject == "secondary photons")   setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"secondary photons");
949 >        else if(currentObject == "muons")               setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"muons");
950 >        else if(currentObject == "secondary muons")     setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,secMuons.product(),"secondary muons");
951 >        else if(currentObject == "secondary electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"secondary electrons");
952 >        else if(currentObject == "electrons")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"electrons");
953 >        else if(currentObject == "events")              setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,events.product(),"events");
954 >        else if(currentObject == "taus")                setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),"taus");
955 >        else if(currentObject == "mets")                setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mets.product(),"mets");
956 >        else if(currentObject == "tracks")              setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),"tracks");
957 >        else if(currentObject == "genjets")             setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,genjets.product(),"genjets");
958 >        else if(currentObject == "mcparticles")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mcparticles.product(),"mcparticles");
959 >        else if(currentObject == "primaryvertexs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,primaryvertexs.product(),"primaryvertexs");
960 >        else if(currentObject == "bxlumis")             setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,bxlumis.product(),"bxlumis");
961 >        else if(currentObject == "photons")             setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"photons");
962 >        else if(currentObject == "superclusters")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,superclusters.product(),"superclusters");
963 >        else if(currentObject == "trigobjs")            setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,trigobjs.product(),"trigobjs");
964 >
965 >
966 >        // paired object collections  
967 >        else if(currentObject == "muon-muon pairs")                   setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), "muon-muon pairs");
968 >        else if(currentObject == "muon-secondary muon pairs")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),secMuons.product(), "muon-secondary muon pairs");
969 >
970 >        else if(currentObject == "muon-secondary photon pairs")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),photons.product(), "muon-secondary photon pairs");
971 >        else if(currentObject == "muon-secondary jet pairs")          setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), "muon-secondary jet pairs");
972 >        else if(currentObject == "photon-secondary jet pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), "photon-secondary jet pairs");
973 >        else if(currentObject == "electron-secondary jet pairs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), "electron-secondary jet pairs");
974 >        else if(currentObject == "electron-secondary electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), "electron-secondary electron pairs");
975 >
976 >        else if(currentObject == "electron-electron pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), "electron-electron pairs");
977 >        else if(currentObject == "electron-muon pairs")     setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),muons.product(), "electron-muon pairs");
978 >        else if(currentObject == "jet-jet pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), "jet-jet pairs");
979 >        else if(currentObject == "jet-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), "jet-secondary jet pairs");
980 >        else if(currentObject == "electron-jet pairs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), "electron-jet pairs");
981 >        else if(currentObject == "electron-photon pairs")   setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),photons.product(), "electron-photon pairs");
982 >        else if(currentObject == "photon-jet pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), "photon-jet pairs");
983 >        else if(currentObject == "muon-jet pairs")          setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), "muon-jet pairs");
984 >        else if(currentObject == "muon-event pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),events.product(), "muon-event pairs");
985 >        else if(currentObject == "met-jet pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mets.product(),jets.product(), "met-jet pairs");
986 >        else if(currentObject == "track-jet pairs")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),jets.product(), "track-jet pairs");
987 >        else if(currentObject == "muon-photon pairs")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),photons.product(), "muon-photon pairs");
988 >        else if(currentObject == "track-event pairs")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(), "track-event pairs");
989 >        else if(currentObject == "electron-track pairs")    setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),"electron-track pairs");
990 >        else if(currentObject == "muon-track pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),"muon-track pairs");
991 >        else if(currentObject == "secondary muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,secMuons.product(),tracks.product(),"secondary muon-track pairs");
992 >        else if(currentObject == "muon-tau pairs")          setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),"muon-tau pairs");
993 >        else if(currentObject == "tau-tau pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),"tau-tau pairs");
994 >        else if(currentObject == "tau-track pairs")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),"tau-track pairs");
995 >        else if(currentObject == "electron-trigobj pairs")  setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),trigobjs.product(),"electron-trigobj pairs");
996 >        else if(currentObject == "muon-trigobj pairs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),trigobjs.product(),"muon-trigobj pairs");
997 >        else if(currentObject == "electron-mcparticle pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),mcparticles.product(),"electron-mcparticle pairs");
998  
999 <
574 <        if(currentObject == "jets") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"jets");
575 <
576 <        else if(currentObject == "muons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"muons");
577 <
578 <        else if(currentObject == "secondary muons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"secondary muons");
579 <        else if(currentObject == "electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"electrons");
580 <        else if(currentObject == "events") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,events.product(),"events");
581 <        else if(currentObject == "taus") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),"taus");
582 <        else if(currentObject == "mets") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mets.product(),"mets");
583 <        else if(currentObject == "tracks") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),"tracks");
584 <        else if(currentObject == "genjets") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,genjets.product(),"genjets");
585 <        else if(currentObject == "mcparticles") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mcparticles.product(),"mcparticles");
586 <        else if(currentObject == "primaryvertexs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,primaryvertexs.product(),"primaryvertexs");
587 <        else if(currentObject == "bxlumis") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,bxlumis.product(),"bxlumis");
588 <        else if(currentObject == "photons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"photons");
589 <        else if(currentObject == "superclusters") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,superclusters.product(),"superclusters");
590 <
591 <
592 <        else if(currentObject == "muon-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
593 <                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
594 <                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
595 <                                                                   "muon-muon pairs");
596 <
597 <        else if(currentObject == "muon-secondary muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
598 <                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
599 <                                                                   cumulativeFlags.at("secondary muons").at(flagsForPairCutsIndex), \
600 <                                                                   "muon-secondary muon pairs");
601 <
602 <        else if(currentObject == "electron-electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
603 <                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
604 <                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
605 <                                                                           "electron-electron pairs");
606 <        else if(currentObject == "electron-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),muons.product(), \
607 <                                                                       cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
608 <                                                                       cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
609 <                                                                       "electron-muon pairs");
610 <        else if(currentObject == "track-event pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(),
611 <                                                                     cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
612 <                                                                     cumulativeFlags.at("events").at(flagsForPairCutsIndex),
613 <                                                                     "track-event pairs");
614 <        else if(currentObject == "electron-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),
615 <                                                                        cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
616 <                                                                        cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
617 <                                                                        "electron-track pairs");
618 <        else if(currentObject == "muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),
619 <                                                                    cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
620 <                                                                    cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
621 <                                                                    "muon-track pairs");
622 <        else if(currentObject == "muon-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),
623 <                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
624 <                                                                  cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
625 <                                                                  "muon-tau pairs");
626 <        else if(currentObject == "tau-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),
627 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
628 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
629 <                                                                 "tau-tau pairs");
630 <        else if(currentObject == "tau-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),
631 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
632 <                                                                 cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
633 <                                                                 "tau-track pairs");
634 <        
635 <        
999 >        if(currentObject == "stops" && datasetType_ == "signalMC") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,stops.product(),"stops");
1000        }
1001  
638
639
1002      }//end loop over all cuts
1003  
1004  
643    //use cumulative flags to apply cuts at event level
1005  
1006 +    //use cumulative flags to apply cuts at event level
1007 +    vector<bool> eventPassedPreviousCuts;    //a vector to store cumulative cut descisions after each cut.
1008      bool eventPassedAllCuts = true;
1009 <
647 <    //apply trigger (true if none were specified)
648 <    eventPassedAllCuts = eventPassedAllCuts && triggerDecision;
649 <
1009 >    eventPassedAllCuts = eventPassedAllCuts && triggerDecision;    //apply trigger (true if none were specified)
1010  
1011      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
1012  
1013        //loop over all objects and count how many passed the cumulative selection up to this point
1014        cut currentCut = currentChannel.cuts.at(currentCutIndex);
1015        int numberPassing = 0;
1016 +      int numberPassingPrev = 0;  // number of objects that pass cuts up to the previous one
1017  
1018        for (uint object = 0; object != cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).size() ; object++){
1019 <        if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object)) numberPassing++;
1019 >        if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object).first) numberPassing++;
1020        }
1021 <      bool cutDecision = evaluateComparison(numberPassing,currentCut.eventComparativeOperator,currentCut.numberRequired);
1021 >      bool cutDecision;
1022 >      if (!currentCut.isVeto) {
1023 >        cutDecision = evaluateComparison(numberPassing,currentCut.eventComparativeOperator,currentCut.numberRequired);
1024 >      } else {
1025 >        int prevCutIndex = currentCutIndex - 1;
1026 >        if (prevCutIndex<0) {
1027 >          numberPassingPrev = cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).size();  // count all objects in collection if cut is the first
1028 >        } else {
1029 >          for (uint object = 0; object != cumulativeFlags.at(currentCut.inputCollection).at(prevCutIndex).size() ; object++){
1030 >            if (cumulativeFlags.at(currentCut.inputCollection).at(prevCutIndex).at(object).first) {
1031 >              numberPassingPrev++;
1032 >              if (verbose_>1) clog << " object passed previous cut" << endl;  
1033 >            }
1034 >          }  
1035 >        }  
1036 >        int numberFailCut = numberPassingPrev - numberPassing;
1037 >        cutDecision = evaluateComparison(numberFailCut,currentCut.eventComparativeOperator,currentCut.numberRequired);  
1038 >      }
1039 >
1040        cutFlows_.at(currentChannelIndex)->at (currentCut.name) = cutDecision;
1041        eventPassedAllCuts = eventPassedAllCuts && cutDecision;
1042 +      eventPassedPreviousCuts.push_back(eventPassedAllCuts);
1043 +      if (verbose_>1) clog << " Event passed cuts up to cut index " << currentCutIndex << endl;  
1044  
1045      }
1046 <
1047 <    //     if(datasetType_ != "data") {
1048 <    //       scaleFactor *= muonSFWeight_->at (chosenMuon ()->eta);
1049 <    //       scaleFactor *= electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
1050 <    //     }
1051 <
1046 >    //applying all appropriate scale factors
1047 >    double scaleFactor = masterScaleFactor;
1048 >    muonScaleFactor_ = electronScaleFactor_ = bTagScaleFactor_ = 1.0;
1049 >
1050 >    if(applyLeptonSF_ && datasetType_ != "data"){
1051 >      //only apply SFs if we've cut on this object
1052 >      if(find(objectsToCut.begin(),objectsToCut.end(),"muons") != objectsToCut.end ()){
1053 >        flagPair muonFlags;
1054 >        //get the last valid flags in the flag map
1055 >        for (int i = cumulativeFlags.at("muons").size() - 1; i >= 0; i--){
1056 >          if (cumulativeFlags.at("muons").at(i).size()){
1057 >            muonFlags = cumulativeFlags.at("muons").at(i);
1058 >            break;
1059 >          }
1060 >        }
1061 >        //apply the weight for each of those objects
1062 >        for (uint muonIndex = 0; muonIndex != muonFlags.size(); muonIndex++){
1063 >          if(!muonFlags.at(muonIndex).second) continue;
1064 >          muonScaleFactor_ *= muonSFWeight_->at (muons->at(muonIndex).eta);
1065 >        }
1066 >      }
1067 >      //only apply SFs if we've cut on this object
1068 >      if(find(objectsToCut.begin(),objectsToCut.end(),"electrons") != objectsToCut.end ()){
1069 >        flagPair electronFlags;
1070 >        //get the last valid flags in the flag map
1071 >        for (int i = cumulativeFlags.at("electrons").size() - 1; i >= 0; i--){
1072 >          if (cumulativeFlags.at("electrons").at(i).size()){
1073 >            electronFlags = cumulativeFlags.at("electrons").at(i);
1074 >            break;
1075 >          }
1076 >        }
1077 >        //apply the weight for each of those objects
1078 >        for (uint electronIndex = 0; electronIndex != electronFlags.size(); electronIndex++){
1079 >          if(!electronFlags.at(electronIndex).second) continue;
1080 >          electronScaleFactor_ *= electronSFWeight_->at (electrons->at(electronIndex).eta, electrons->at(electronIndex).pt);
1081 >        }
1082 >      }
1083 >    }
1084 >    if(applyBtagSF_ && datasetType_ != "data"){
1085 >      //only apply SFs if we've cut on this object
1086 >      if(find(objectsToCut.begin(),objectsToCut.end(),"jets") != objectsToCut.end ()){
1087 >        flagPair jetFlags;
1088 >        vector<double> jetSFs;
1089 >        //get the last valid flags in the flag map
1090 >        for (int i = cumulativeFlags.at("jets").size() - 1; i >= 0; i--){
1091 >          if (cumulativeFlags.at("jets").at(i).size()){
1092 >            jetFlags = cumulativeFlags.at("jets").at(i);
1093 >            break;
1094 >          }
1095 >        }
1096 >        //apply the weight for each of those objects
1097 >        for (uint jetIndex = 0; jetIndex != jetFlags.size(); jetIndex++){
1098 >          if(!jetFlags.at(jetIndex).second) continue;
1099 >          double jetSFTmp = bTagSFWeight_->sflookup(jets->at(jetIndex).btagCombinedSecVertex, jets->at(jetIndex).pt, jets->at(jetIndex).flavour, jets->at(jetIndex).eta);
1100 >          jetSFs.push_back(jetSFTmp);
1101 >        }
1102 >        bTagScaleFactor_ *= bTagSFWeight_->weight( jetSFs, minBtag_);
1103 >      }
1104 >    }
1105 >    scaleFactor *= muonScaleFactor_;
1106 >    scaleFactor *= electronScaleFactor_;
1107 >    scaleFactor *= bTagScaleFactor_;
1108      cutFlows_.at(currentChannelIndex)->fillCutFlow(scaleFactor);
1109 +    if (verbose_>1) clog << " Scale factors applied:  "
1110 +                         << " muonScaleFactor_ = " << muonScaleFactor_
1111 +                         << ", electronScaleFactor_ = " << electronScaleFactor_
1112 +                         << ", bTagScaleFactor_ = " << bTagScaleFactor_
1113 +                         << ", total scale factor = " << scaleFactor
1114 +                         << endl;  
1115 +
1116 +
1117 +    if (printEventInfo_ && eventPassedAllCuts) {
1118 +      // Write information about event to screen, for testing purposes.
1119 +      clog << "Event passed all cuts in channel " <<  currentChannel.name
1120 +           << ":  run:lumi:evt=  "  << events->at(0).run
1121 +           << ":" << events->at(0).lumi
1122 +           << ":" << events->at(0).evt
1123 +           << endl;
1124 +      if (findEventsLog) {
1125 +        (*findEventsLog) << events->at(0).run
1126 +                         << ":" << events->at(0).lumi
1127 +                         << ":" << events->at(0).evt << endl;
1128 +      }
1129  
673
674
675    if(!eventPassedAllCuts)continue;
676
677    if (printEventInfo_) {
678      // Write information about event to screen, for testing purposes.  
679      cout << "Event passed all cuts in channel " <<  currentChannel.name
680           << ": run="  << events->at(0).run
681           << "  lumi=" << events->at(0).lumi
682           << "  event=" << events->at(0).evt
683           << endl;  
1130      }
1131  
1132  
1133      //filling histograms
1134 <    for (uint histogramIndex = 0; histogramIndex != histograms.size(); histogramIndex++){
689 <      histogram currentHistogram = histograms.at(histogramIndex);
1134 >    for(uint currentCut = 0; currentCut != oneDHists_.at(currentChannelIndex).size(); currentCut++){//loop over all the cuts in each channel; if GetPlotsAfterEachCut_ is false, only the last cut will be used.
1135  
1136 <      if(currentHistogram.inputVariables.size() == 1){
1137 <        TH1D* histo;
1138 <        histo = oneDHists_.at(currentChannelIndex).at(currentHistogram.name);
1139 <
1140 <        if(currentHistogram.inputCollection == "jets") fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").back(),scaleFactor);
1141 <        else if(currentHistogram.inputCollection == "muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),scaleFactor);
697 <        else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").back(),scaleFactor);
698 <        else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
699 <                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
700 <                                                                                       cumulativeFlags.at("muon-muon pairs").back(),scaleFactor);
701 <        else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
702 <                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("secondary muons").back(), \
703 <                                                                                       cumulativeFlags.at("muon-secondary muon pairs").back(),scaleFactor);
704 <        else if(currentHistogram.inputCollection == "electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").back(),scaleFactor);
705 <        else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),\
706 <                                                                                               cumulativeFlags.at("electrons").back(),cumulativeFlags.at("electrons").back(),\
707 <                                                                                               cumulativeFlags.at("electron-electron pairs").back(),scaleFactor);
708 <        else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(), \
709 <                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(),
710 <                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
711 <        else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),        
712 <                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),  
713 <                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);      
714 <        else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),        
715 <                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),  
716 <                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);      
717 <        else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),    
718 <                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),      
719 <                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);  
720 <        else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),      
721 <                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),        
722 <                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);    
723 <        else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
724 <                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("tracks").back(),
725 <                                                                                     cumulativeFlags.at("tau-track pairs").back(),scaleFactor);
726 <
727 <        else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),scaleFactor);
728 <        else if(currentHistogram.inputCollection == "taus") fill1DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),scaleFactor);
729 <        else if(currentHistogram.inputCollection == "mets") fill1DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").back(),scaleFactor);
730 <        else if(currentHistogram.inputCollection == "tracks") fill1DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").back(),scaleFactor);
731 <        else if(currentHistogram.inputCollection == "genjets") fill1DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").back(),scaleFactor);
732 <        else if(currentHistogram.inputCollection == "mcparticles") fill1DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").back(),scaleFactor);
733 <        else if(currentHistogram.inputCollection == "primaryvertexs") fill1DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").back(),scaleFactor);
734 <        else if(currentHistogram.inputCollection == "bxlumis") fill1DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),scaleFactor);
735 <        else if(currentHistogram.inputCollection == "photons") fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),scaleFactor);
736 <        else if(currentHistogram.inputCollection == "superclusters") fill1DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),scaleFactor);
737 <      }
738 <      else if(currentHistogram.inputVariables.size() == 2){
739 <        TH2D* histo;
740 <        histo = twoDHists_.at(currentChannelIndex).at(currentHistogram.name);
741 <
742 <        if(currentHistogram.inputCollection == "jets") fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").back(),scaleFactor);
743 <        else if(currentHistogram.inputCollection == "muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").back(),scaleFactor);
744 <        else if(currentHistogram.inputCollection == "secondary muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").back(),scaleFactor);
745 <        else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
746 <                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("muons").back(), \
747 <                                                                                       cumulativeFlags.at("muon-muon pairs").back(),scaleFactor);
748 <        else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
749 <                                                                                       cumulativeFlags.at("muons").back(),cumulativeFlags.at("secondary muons").back(), \
750 <                                                                                       cumulativeFlags.at("muon-secondary muon pairs").back(),scaleFactor);
751 <        else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").back(),scaleFactor);
752 <        else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
753 <                                                                                               cumulativeFlags.at("electrons").back(),cumulativeFlags.at("electrons").back(), \
754 <                                                                                               cumulativeFlags.at("electron-electron pairs").back(),scaleFactor);
755 <        else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(), \
756 <                                                                                           cumulativeFlags.at("electrons").back(),cumulativeFlags.at("muons").back(), \
757 <                                                                                           cumulativeFlags.at("electron-muon pairs").back(),scaleFactor);
758 <        else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),        
759 <                                                                                            cumulativeFlags.at("electrons").back(),cumulativeFlags.at("tracks").back(),          
760 <                                                                                            cumulativeFlags.at("electron-track pairs").back(),scaleFactor);      
761 <        else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),        
762 <                                                                                        cumulativeFlags.at("muons").back(),cumulativeFlags.at("tracks").back(),          
763 <                                                                                        cumulativeFlags.at("muon-track pairs").back(),scaleFactor);      
764 <        else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),    
765 <                                                                                      cumulativeFlags.at("muons").back(),cumulativeFlags.at("taus").back(),      
766 <                                                                                      cumulativeFlags.at("muon-tau pairs").back(),scaleFactor);  
767 <        else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),      
768 <                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("taus").back(),        
769 <                                                                                     cumulativeFlags.at("tau-tau pairs").back(),scaleFactor);    
770 <        else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
771 <                                                                                     cumulativeFlags.at("taus").back(),cumulativeFlags.at("tracks").back(),
772 <                                                                                     cumulativeFlags.at("tau-track pairs").back(),scaleFactor);
773 <        else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").back(),scaleFactor);
774 <        else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").back(),scaleFactor);
775 <        else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").back(),scaleFactor);
776 <        else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").back(),scaleFactor);
777 <        else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
778 <                                                                                         cumulativeFlags.at("tracks").back(),cumulativeFlags.at("events").back(),
779 <                                                                                         cumulativeFlags.at("track-event pairs").back(),scaleFactor);  
780 <        else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").back(),scaleFactor);
781 <        else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").back(),scaleFactor);
782 <        else if(currentHistogram.inputCollection == "primaryvertexs") fill2DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").back(),scaleFactor);
783 <        else if(currentHistogram.inputCollection == "bxlumis") fill2DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").back(),scaleFactor);
784 <        else if(currentHistogram.inputCollection == "photons") fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").back(),scaleFactor);
785 <        else if(currentHistogram.inputCollection == "superclusters") fill2DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").back(),scaleFactor);
1136 >      if (verbose_>2) clog << "  Filling histograms for currentcut = " << currentCut << endl;  
1137 >
1138 >      uint currentDir;
1139 >      if (!GetPlotsAfterEachCut_) { currentDir =  currentChannel.cuts.size() - oneDHists_.at(currentChannelIndex).size(); } //if GetPlotsAfterEachCut_ is false, set currentDir point to the last cut.
1140 >      else{
1141 >        currentDir = currentCut;
1142        }
787    }
1143  
1144  
1145 +      if(eventPassedPreviousCuts.at(currentDir)){
1146 +
1147 +        for (uint histogramIndex = 0; histogramIndex != histograms.size(); histogramIndex++){
1148 +          histogram currentHistogram = histograms.at(histogramIndex);
1149 +
1150 +          if (cumulativeFlags.count(currentHistogram.inputCollection) == 0) clog << "Error: no flags found for collection:  " << currentHistogram.inputCollection << ", will cause a seg fault" << endl;
1151 +
1152 +          if (verbose_>1) clog << " Filling histogram " << currentHistogram.name << " for collection " << currentHistogram.inputCollection << endl;  
1153 +
1154 +          if(currentHistogram.inputVariables.size() == 1){
1155 +            TH1D* histo;
1156 +            histo = oneDHists_.at(currentChannelIndex).at(currentCut).at(currentHistogram.name);
1157 +            if     (currentHistogram.inputCollection == "jets")            fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
1158 +            else if(currentHistogram.inputCollection == "secondary jets")  fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
1159 +            else if(currentHistogram.inputCollection == "secondary photons")  fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("secondary photons").at(currentDir),scaleFactor);
1160 +            else if(currentHistogram.inputCollection == "muons")           fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
1161 +            else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,secMuons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1162 +            else if(currentHistogram.inputCollection == "secondary electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
1163 +            else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(),
1164 +                                                                                           cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
1165 +            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),secMuons.product(),
1166 +                                                                                                     cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
1167 +             else if(currentHistogram.inputCollection == "muon-secondary photon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),photons.product(),
1168 +                                                                                                     cumulativeFlags.at("muon-secondary photon pairs").at(currentDir),scaleFactor);
1169 +             else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,muons.product(),jets.product(),
1170 +                                                                                                     cumulativeFlags.at("muon-secondary jet pairs").at(currentDir),scaleFactor);
1171 +             else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,photons.product(),jets.product(),
1172 +                                                                                                     cumulativeFlags.at("photon-secondary jet pairs").at(currentDir),scaleFactor);
1173 +             else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),jets.product(),
1174 +                                                                                                     cumulativeFlags.at("electron-secondary jet pairs").at(currentDir),scaleFactor);
1175 +
1176 +            else if(currentHistogram.inputCollection == "electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
1177 +            else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1178 +                                                                                                   cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
1179 +            else if(currentHistogram.inputCollection == "jet-jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),
1180 +                                                                                         cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1181 +             else if(currentHistogram.inputCollection == "jet-secondary jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),
1182 +                                                                                                     cumulativeFlags.at("jet-secondary jet pairs").at(currentDir),scaleFactor);
1183 +
1184 +            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1185 +                                                                                                             cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1186 +            else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(),
1187 +                                                                                               cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1188 +            else if(currentHistogram.inputCollection == "electron-jet pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),jets.product(),
1189 +                                                                                              cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1190 +            else if(currentHistogram.inputCollection == "photon-jet pairs") fill1DHistogram(histo,currentHistogram, photons.product(),jets.product(),
1191 +                                                                                              cumulativeFlags.at("photon-jet pairs").at(currentDir),scaleFactor);
1192 +            else if(currentHistogram.inputCollection == "muon-jet pairs") fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(),
1193 +                                                                                          cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1194 +            else if(currentHistogram.inputCollection == "muon-event pairs") fill1DHistogram(histo,currentHistogram, muons.product(),events.product(),
1195 +                                                                                          cumulativeFlags.at("muon-event pairs").at(currentDir),scaleFactor);
1196 +            else if(currentHistogram.inputCollection == "met-jet pairs")  fill1DHistogram(histo,currentHistogram, mets.product(),jets.product(),
1197 +                                                                                          cumulativeFlags.at("met-jet pairs").at(currentDir),scaleFactor);
1198 +            else if(currentHistogram.inputCollection == "track-jet pairs")  fill1DHistogram(histo,currentHistogram,tracks.product(),jets.product(),
1199 +                                                                                          cumulativeFlags.at("track-jet pairs").at(currentDir),scaleFactor);
1200 +            else if(currentHistogram.inputCollection == "muon-photon pairs") fill1DHistogram(histo,currentHistogram, muons.product(),photons.product(),
1201 +                                                                                          cumulativeFlags.at("muon-photon pairs").at(currentDir),scaleFactor);
1202 +            else if(currentHistogram.inputCollection == "electron-photon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),photons.product(),
1203 +                                                                                          cumulativeFlags.at("electron-photon pairs").at(currentDir),scaleFactor);
1204 +            else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),
1205 +                                                                                                cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1206 +            else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),
1207 +                                                                                            cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1208 +            else if(currentHistogram.inputCollection == "secondary muon-track pairs") fill1DHistogram(histo,currentHistogram, secMuons.product(),tracks.product(),
1209 +                                                                                            cumulativeFlags.at("secondary muon-track pairs").at(currentDir),scaleFactor);
1210 +            else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),
1211 +                                                                                          cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1212 +            else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),
1213 +                                                                                         cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1214 +            else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
1215 +                                                                                           cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1216 +            else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),trigobjs.product(),
1217 +                                                                                                  cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1218 +            else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill1DHistogram(histo,currentHistogram, muons.product(),trigobjs.product(),
1219 +                                                                                              cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1220 +
1221 +            else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
1222 +            else if(currentHistogram.inputCollection == "taus") fill1DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").at(currentDir),scaleFactor);
1223 +            else if(currentHistogram.inputCollection == "mets") fill1DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").at(currentDir),scaleFactor);
1224 +            else if(currentHistogram.inputCollection == "tracks") fill1DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").at(currentDir),scaleFactor);
1225 +            else if(currentHistogram.inputCollection == "genjets") fill1DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").at(currentDir),scaleFactor);
1226 +            else if(currentHistogram.inputCollection == "mcparticles") fill1DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").at(currentDir),scaleFactor);
1227 +            else if(currentHistogram.inputCollection == "primaryvertexs") fill1DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").at(currentDir),scaleFactor);
1228 +            else if(currentHistogram.inputCollection == "bxlumis") fill1DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").at(currentDir),scaleFactor);
1229 +            else if(currentHistogram.inputCollection == "photons") fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").at(currentDir),scaleFactor);
1230 +            else if(currentHistogram.inputCollection == "superclusters") fill1DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").at(currentDir),scaleFactor);
1231 +            else if(currentHistogram.inputCollection == "trigobjs") fill1DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").at(currentDir),scaleFactor);
1232 +            else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill1DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").at(currentDir),scaleFactor);
1233 +          }
1234 +          else if(currentHistogram.inputVariables.size() == 2){
1235 +            TH2D* histo;
1236 +            histo = twoDHists_.at(currentChannelIndex).at(currentCut).at(currentHistogram.name);
1237 +            if     (currentHistogram.inputCollection == "jets")            fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
1238 +            else if(currentHistogram.inputCollection == "secondary jets")  fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
1239 +            else if(currentHistogram.inputCollection == "secondary photons")  fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("secondary photons").at(currentDir),scaleFactor);
1240 +            else if(currentHistogram.inputCollection == "muons")           fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
1241 +            else if(currentHistogram.inputCollection == "secondary muons") fill2DHistogram(histo,currentHistogram,secMuons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1242 +            else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(),
1243 +                                                                                           cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
1244 +            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),secMuons.product(),
1245 +                                                                                                     cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
1246 +            else if(currentHistogram.inputCollection == "muon-secondary photon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),photons.product(),
1247 +                                                                                                     cumulativeFlags.at("muon-secondary photon pairs").at(currentDir),scaleFactor);
1248 +            else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(),
1249 +                                                                                                     cumulativeFlags.at("muon-secondary jet pairs").at(currentDir),scaleFactor);
1250 +            else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(),
1251 +                                                                                                     cumulativeFlags.at("electron-secondary jet pairs").at(currentDir),scaleFactor);
1252 +            else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(),
1253 +                                                                                                     cumulativeFlags.at("photon-secondary jet pairs").at(currentDir),scaleFactor);
1254 +            else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
1255 +            else if(currentHistogram.inputCollection == "secondary electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
1256 +            else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1257 +                                                                                                   cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
1258 +            else if(currentHistogram.inputCollection == "jet-jet pairs") fill2DHistogram(histo,currentHistogram,jets.product(),jets.product(),
1259 +                                                                                         cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1260 +            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1261 +                                                                                                             cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1262 +            else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(),
1263 +                                                                                               cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1264 +            else if(currentHistogram.inputCollection == "electron-jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(),
1265 +                                                                                              cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1266 +            else if(currentHistogram.inputCollection == "electron-photon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),photons.product(),
1267 +                                                                                              cumulativeFlags.at("electron-photon pairs").at(currentDir),scaleFactor);
1268 +            else if(currentHistogram.inputCollection == "muon-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(),
1269 +                                                                                          cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1270 +            else if(currentHistogram.inputCollection == "muon-event pairs") fill2DHistogram(histo,currentHistogram,muons.product(),events.product(),
1271 +                                                                                          cumulativeFlags.at("muon-event pairs").at(currentDir),scaleFactor);
1272 +            else if(currentHistogram.inputCollection == "met-jet pairs") fill2DHistogram(histo,currentHistogram,mets.product(),jets.product(),
1273 +                                                                                         cumulativeFlags.at("met-jet pairs").at(currentDir),scaleFactor);
1274 +            else if(currentHistogram.inputCollection == "track-jet pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),jets.product(),
1275 +                                                                                         cumulativeFlags.at("track-jet pairs").at(currentDir),scaleFactor);
1276 +            else if(currentHistogram.inputCollection == "photon-jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(),
1277 +                                                                                          cumulativeFlags.at("photon-jet pairs").at(currentDir),scaleFactor);
1278 +            else if(currentHistogram.inputCollection == "muon-photon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),photons.product(),
1279 +                                                                                          cumulativeFlags.at("muon-photon pairs").at(currentDir),scaleFactor);
1280 +            else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),
1281 +                                                                                                cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1282 +            else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),
1283 +                                                                                            cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1284 +            else if(currentHistogram.inputCollection == "secondary muon-track pairs") fill2DHistogram(histo,currentHistogram,secMuons.product(),tracks.product(),
1285 +                                                                                            cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1286 +            else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),
1287 +                                                                                          cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1288 +            else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),
1289 +                                                                                         cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1290 +            else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
1291 +                                                                                           cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1292 +            else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),trigobjs.product(),
1293 +                                                                                                  cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1294 +            else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill2DHistogram(histo,currentHistogram,muons.product(),trigobjs.product(),
1295 +                                                                                              cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1296 +            else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
1297 +            else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").at(currentDir),scaleFactor);
1298 +            else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").at(currentDir),scaleFactor);
1299 +            else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").at(currentDir),scaleFactor);
1300 +            else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
1301 +                                                                                             cumulativeFlags.at("track-event pairs").at(currentDir),scaleFactor);
1302 +            else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").at(currentDir),scaleFactor);
1303 +            else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").at(currentDir),scaleFactor);
1304 +            else if(currentHistogram.inputCollection == "primaryvertexs") fill2DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").at(currentDir),scaleFactor);
1305 +            else if(currentHistogram.inputCollection == "bxlumis") fill2DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").at(currentDir),scaleFactor);
1306 +            else if(currentHistogram.inputCollection == "photons") fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").at(currentDir),scaleFactor);
1307 +            else if(currentHistogram.inputCollection == "superclusters") fill2DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").at(currentDir),scaleFactor);
1308 +            else if(currentHistogram.inputCollection == "trigobjs") fill2DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").at(currentDir),scaleFactor);
1309 +            else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill2DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").at(currentDir),scaleFactor);
1310 +          }
1311  
791    //fills histograms with the sizes of collections
792    for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
793
794      string currentObject = objectsToPlot.at(currentObjectIndex);
795
796      string objectToPlot = "";  
797
798      // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().  
799      if(currentObject == "muon-muon pairs") objectToPlot = "dimuonPairs";
800      else if(currentObject == "electron-electron pairs") objectToPlot = "dielectronPairs";
801      else if(currentObject == "electron-muon pairs")     objectToPlot = "electronMuonPairs";
802      else if(currentObject == "electron-track pairs")    objectToPlot = "electronTrackPairs";
803      else if(currentObject == "muon-track pairs")        objectToPlot = "muonTrackPairs";      
804      else if(currentObject == "muon-tau pairs")          objectToPlot = "muonTauPairs";        
805      else if(currentObject == "tau-tau pairs")           objectToPlot = "ditauPairs";
806      else if(currentObject == "tau-track pairs")         objectToPlot = "tauTrackPairs";
807      else if(currentObject == "track-event pairs")       objectToPlot = "trackEventPairs";  
808      else if(currentObject == "muon-secondary muon pairs")       objectToPlot = "muonSecondaryMuonPairs";  
809      else if(currentObject == "secondary muons")         objectToPlot = "secondaryMuons";  
810      else objectToPlot = currentObject;
811
812      string tempCurrentObject = objectToPlot;
813      tempCurrentObject.at(0) = toupper(tempCurrentObject.at(0));  
814      string histoName = "num" + tempCurrentObject;
815
816      //set position of primary vertex in event, in order to calculate quantities relative to it
817      if(std::find(objectsToCut.begin(), objectsToCut.end(), currentObject) != objectsToCut.end()) {
818        vector<bool> lastCutFlags = cumulativeFlags.at(currentObject).back();
819        int numToPlot = 0;
820        for (uint currentFlag = 0; currentFlag != lastCutFlags.size(); currentFlag++){
821          if(lastCutFlags.at(currentFlag)) numToPlot++;
822        }
823        if(objectToPlot == "primaryvertexs"){
824          oneDHists_.at(currentChannelIndex).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
825          oneDHists_.at(currentChannelIndex).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
1312          }
827        else {
828          oneDHists_.at(currentChannelIndex).at(histoName)->Fill(numToPlot,scaleFactor);
829        }
830      }
831      else if(objectToPlot == "jets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(jets->size(),scaleFactor);
832      else if(objectToPlot == "muons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size(),scaleFactor);
833      else if(objectToPlot == "secondaryMuons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size(),scaleFactor);
834      else if(objectToPlot == "dimuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*(muons->size()-1)/2,scaleFactor);
835      else if(objectToPlot == "muonSecondaryMuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(muons->size()*(muons->size()-1)/2,scaleFactor);
836      else if(objectToPlot == "electrons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size(),scaleFactor);
837      else if(objectToPlot == "dielectronPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*(electrons->size()-1)/2,scaleFactor);
838      else if(objectToPlot == "electronMuonPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*muons->size(),scaleFactor);
839      else if(objectToPlot == "electronTrackPairs") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(electrons->size()*tracks->size(),scaleFactor);
840      else if(objectToPlot == "events") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(events->size(),scaleFactor);
841      else if(objectToPlot == "taus") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(taus->size(),scaleFactor);
842      else if(objectToPlot == "mets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(mets->size(),scaleFactor);
843      else if(objectToPlot == "tracks") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(tracks->size(),scaleFactor);
844      else if(objectToPlot == "genjets") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(genjets->size(),scaleFactor);
845      else if(objectToPlot == "mcparticles") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(mcparticles->size(),scaleFactor);
846      else if(objectToPlot == "bxlumis") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(bxlumis->size(),scaleFactor);
847      else if(objectToPlot == "photons") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(photons->size(),scaleFactor);
848      else if(objectToPlot == "superclusters") oneDHists_.at(currentChannelIndex).at(histoName)->Fill(superclusters->size(),scaleFactor);
849      else if(objectToPlot == "primaryvertexs"){
850        oneDHists_.at(currentChannelIndex).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
851        oneDHists_.at(currentChannelIndex).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
852      }
1313  
854    } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
1314  
1315 <  } //end loop over channel
1315 >        //fills histograms with the sizes of collections
1316 >        for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
1317 >
1318 >          string currentObject = objectsToPlot.at(currentObjectIndex);
1319 >          string objectToPlot = "";
1320  
1321 <  masterCutFlow_->fillCutFlow(scaleFactor);
1321 >          if (verbose_) clog << "Filling histogram of number of selected objects in collection: " << currentObject << endl;  
1322  
1323 < } // end void OSUAnalysis::analyze (const edm::Event &event, const edm::EventSetup &setup)
1323 >          // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().
1324 >          if(currentObject == "muon-muon pairs")                         objectToPlot = "dimuonPairs";
1325 >          else if(currentObject == "electron-electron pairs")            objectToPlot = "dielectronPairs";
1326 >          else if(currentObject == "electron-muon pairs")                objectToPlot = "electronMuonPairs";
1327 >          else if(currentObject == "electron-photon pairs")              objectToPlot = "electronPhotonPairs";
1328 >          else if(currentObject == "electron-jet pairs")                 objectToPlot = "electronJetPairs";
1329 >          else if(currentObject == "muon-jet pairs")                     objectToPlot = "muonJetPairs";
1330 >          else if(currentObject == "muon-event pairs")                   objectToPlot = "muonEventPairs";
1331 >          else if(currentObject == "muon-photon pairs")                  objectToPlot = "muonPhotonPairs";
1332 >          else if(currentObject == "photon-jet pairs")                   objectToPlot = "photonJetPairs";
1333 >          else if(currentObject == "met-jet pairs")                      objectToPlot = "metJetPairs";
1334 >          else if(currentObject == "track-jet pairs")                    objectToPlot = "trackJetPairs";
1335 >          else if(currentObject == "jet-jet pairs")                      objectToPlot = "dijetPairs";
1336 >          else if(currentObject == "jet-secondary jet pairs")            objectToPlot = "jetSecondaryJetPairs";
1337 >          else if(currentObject == "secondary jets")                     objectToPlot = "secondaryJets";
1338 >          else if(currentObject == "secondary photons")                  objectToPlot = "secondaryPhotons";
1339 >          else if(currentObject == "electron-track pairs")               objectToPlot = "electronTrackPairs";
1340 >          else if(currentObject == "muon-track pairs")                   objectToPlot = "muonTrackPairs";
1341 >          else if(currentObject == "secondary muon-track pairs")         objectToPlot = "secondaryMuonTrackPairs";
1342 >          else if(currentObject == "muon-tau pairs")                     objectToPlot = "muonTauPairs";
1343 >          else if(currentObject == "tau-tau pairs")                      objectToPlot = "ditauPairs";
1344 >          else if(currentObject == "tau-track pairs")                    objectToPlot = "tauTrackPairs";
1345 >          else if(currentObject == "track-event pairs")                  objectToPlot = "trackEventPairs";
1346 >          else if(currentObject == "muon-secondary muon pairs")          objectToPlot = "muonSecondaryMuonPairs";
1347 >          else if(currentObject == "secondary muons")                    objectToPlot = "secondaryMuons";
1348 >          else if(currentObject == "muon-secondary jet pairs")           objectToPlot = "muonSecondaryJetPairs";
1349 >          else if(currentObject == "muon-secondary photon pairs")        objectToPlot = "muonSecondaryJetPairs";
1350 >          else if(currentObject == "electron-secondary jet pairs")       objectToPlot = "electronSecondaryJetPairs";
1351 >          else if(currentObject == "photon-secondary jet pairs")         objectToPlot = "photonSecondaryJetPairs";
1352 >          else if(currentObject == "electron-secondary electron pairs")  objectToPlot = "electronSecondaryElectronPairs";
1353 >          else if(currentObject == "secondary electrons")                objectToPlot = "secondaryElectrons";
1354 >          else if(currentObject == "electron-trigobj pairs")             objectToPlot = "electronTrigobjPairs";
1355 >          else if(currentObject == "muon-trigobj pairs")                 objectToPlot = "muonTrigobjPairs";
1356 >          else if(currentObject == "electron-mcparticle pairs")          objectToPlot = "electronMCparticlePairs";
1357 >          else objectToPlot = currentObject;
1358 >
1359 >          string tempCurrentObject = objectToPlot;
1360 >          tempCurrentObject.at(0) = toupper(tempCurrentObject.at(0));
1361 >          string histoName = "num" + tempCurrentObject;
1362 >
1363 >
1364 >          if(find(objectsToPlot.begin(), objectsToPlot.end(), currentObject) != objectsToPlot.end()) {
1365 >            flagPair lastCutFlags = cumulativeFlags.at(currentObject).at(currentDir);
1366 >            int numToPlot = 0;
1367 >            for (uint iObj = 0; iObj != lastCutFlags.size(); iObj++){  // loop over all the objects  
1368 >              if(lastCutFlags.at(iObj).second) {
1369 >                numToPlot++;  
1370 >                if (verbose_>3) clog << "   Found object " << iObj << " in collection " << currentObject << " to plot." << endl;
1371 >              }
1372 >            }
1373 >
1374 >            if(objectToPlot == "primaryvertexs"){
1375 >              oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
1376 >              oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
1377 >            }
1378 >            else {
1379 >              if (printEventInfo_) clog << "Number of selected " << objectToPlot << " to plot:  " << numToPlot << endl;  
1380 >              oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName)->Fill(numToPlot,scaleFactor);
1381 >            }
1382 >          }
1383 >
1384 >        } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++)
1385 >
1386 >
1387 >      } // end if(eventPassedPreviousCuts.at(currentDir))
1388 >    } // end loop over cuts
1389 >
1390 >    if (!useEDMFormat_ && eventPassedAllCuts){
1391 >      // Assign BNTree variables
1392 >      for (uint iBranch = 0; iBranch != treeBranches_.size(); iBranch++) {
1393 >        BranchSpecs brSpecs = treeBranches_.at(iBranch);
1394 >        string coll = brSpecs.inputCollection;
1395 >        if (cumulativeFlags.count(coll) == 0) clog << "Error: no flags found for collection:  " << coll << ", will cause a seg fault" << endl;
1396 >
1397 >        if     (coll == "jets")                assignTreeBranch(brSpecs,jets.product(),          cumulativeFlags.at(coll).back());
1398 >        else if(coll == "secondary jets")      assignTreeBranch(brSpecs,jets.product(),          cumulativeFlags.at(coll).back());
1399 >        else if(coll == "secondary photons")   assignTreeBranch(brSpecs,photons.product(),       cumulativeFlags.at(coll).back());
1400 >        else if(coll == "muons")               assignTreeBranch(brSpecs,muons.product(),         cumulativeFlags.at(coll).back());
1401 >        else if(coll == "secondary muons")     assignTreeBranch(brSpecs,secMuons.product(),      cumulativeFlags.at(coll).back());
1402 >        else if(coll == "electrons")           assignTreeBranch(brSpecs,electrons.product(),     cumulativeFlags.at(coll).back());
1403 >        else if(coll == "secondary electrons") assignTreeBranch(brSpecs,electrons.product(),     cumulativeFlags.at(coll).back());
1404 >        else if(coll == "events")              assignTreeBranch(brSpecs,events.product(),        cumulativeFlags.at(coll).back());
1405 >        else if(coll == "taus")                assignTreeBranch(brSpecs,taus.product(),          cumulativeFlags.at(coll).back());
1406 >        else if(coll == "mets")                assignTreeBranch(brSpecs,mets.product(),          cumulativeFlags.at(coll).back());
1407 >        else if(coll == "tracks")              assignTreeBranch(brSpecs,tracks.product(),        cumulativeFlags.at(coll).back());
1408 >        else if(coll == "genjets")             assignTreeBranch(brSpecs,genjets.product(),       cumulativeFlags.at(coll).back());
1409 >        else if(coll == "mcparticles")         assignTreeBranch(brSpecs,mcparticles.product(),   cumulativeFlags.at(coll).back());
1410 >        else if(coll == "primaryvertexs")      assignTreeBranch(brSpecs,primaryvertexs.product(),cumulativeFlags.at(coll).back());
1411 >        else if(coll == "bxlumis")             assignTreeBranch(brSpecs,bxlumis.product(),       cumulativeFlags.at(coll).back());
1412 >        else if(coll == "photons")             assignTreeBranch(brSpecs,photons.product(),       cumulativeFlags.at(coll).back());
1413 >        else if(coll == "superclusters")       assignTreeBranch(brSpecs,superclusters.product(), cumulativeFlags.at(coll).back());
1414 >        else if(coll == "trigobjs")            assignTreeBranch(brSpecs,trigobjs.product(),      cumulativeFlags.at(coll).back());
1415 >        else if(coll == "stops"
1416 >                && datasetType_ == "signalMC") assignTreeBranch(brSpecs,stops.product(),         cumulativeFlags.at(coll).back());
1417 >      } // end loop over branches
1418 >      // set the evtLong, runInt, and lumiInt variables separately, since they are not type float  
1419 >      BNTreeBranchVals_evtLong_ = events->at(0).evt;
1420 >      BNTreeBranchVals_runInt_  = events->at(0).run;
1421 >      BNTreeBranchVals_lumiInt_ = events->at(0).lumi;
1422 >
1423 >      if (!BNTrees_.at(currentChannelIndex)) { clog << "ERROR:  Undefined BNTree.  Will likely seg fault." << endl; }
1424 >      BNTrees_.at(currentChannelIndex)->Fill();  // only fill if event has passed cuts
1425 >    }
1426 >
1427 >    (*channelDecisions)[currentChannel.name] = eventPassedAllCuts;
1428 >
1429 >  } // end loop over channel
1430 >
1431 >  masterCutFlow_->fillCutFlow(masterScaleFactor);
1432 >
1433 >  event.put (channelDecisions, "channelDecisions");
1434 >
1435 >  isFirstEvent_ = false;  
1436 >
1437 >  if (verbose_) clog << "Finished OSUAnalysis::produce." << endl;  
1438 >
1439 > } // end void OSUAnalysis::produce (const edm::Event &event, const edm::EventSetup &setup)
1440  
1441  
1442  
# Line 872 | Line 1451 | OSUAnalysis::evaluateComparison (double
1451    else if(comparison == "==") return testValue == cutValue;
1452    else if(comparison == "=") return testValue == cutValue;
1453    else if(comparison == "!=") return testValue != cutValue;
1454 <  else {std::cout << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1454 >  else {clog << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1455  
1456   }
1457  
1458   bool
1459 < OSUAnalysis::evaluateTriggers (vector<string> triggersToTest, const BNtriggerCollection* triggerCollection){
1459 > OSUAnalysis::evaluateComparison (string testValue, string comparison, string cutValue){
1460  
1461 +
1462 +  if(comparison == ">")       return testValue >  cutValue;
1463 +  else if(comparison == ">=") return testValue >= cutValue;
1464 +  else if(comparison == "<")  return testValue <  cutValue;
1465 +  else if(comparison == "<=") return testValue <= cutValue;
1466 +  else if(comparison == "==") return testValue == cutValue;
1467 +  else if(comparison == "=")  return testValue == cutValue;
1468 +  else if(comparison == "!=") return testValue != cutValue;
1469 +  else {clog << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1470 +
1471 + }
1472 +
1473 + bool
1474 + OSUAnalysis::evaluateTriggers (vector<string> triggersToTest, vector<string> triggersToVeto, const BNtriggerCollection* triggerCollection){
1475 +
1476 +  //initialize to false until a chosen trigger is passed
1477    bool triggerDecision = false;
1478  
1479 <  for (BNtriggerCollection::const_iterator trigger = triggerCollection->begin (); trigger != triggerCollection->end (); trigger++)
1480 <    {
1481 <      if(trigger->pass != 1) continue;
1482 <      for(uint triggerName = 0; triggerName != triggersToTest.size(); triggerName++)
1483 <        {
1484 <          if(trigger->name.find(triggersToTest.at(triggerName))!=std::string::npos){
1485 <            triggerDecision = true;
1486 <          }
1487 <        }
1479 >  if (printAllTriggers_) clog << "Printing list of all available triggers (which this event may or may not pass):" << endl;
1480 >  //loop over all triggers defined in the event
1481 >  for (BNtriggerCollection::const_iterator trigger = triggerCollection->begin (); trigger != triggerCollection->end (); trigger++){
1482 >
1483 >    if (printAllTriggers_) clog << "   " << trigger->name << endl;
1484 >
1485 >    //we're only interested in triggers that actually passed
1486 >    if(trigger->pass != 1) continue;
1487 >
1488 >    //if the event passes one of the veto triggers, exit and return false
1489 >    for(uint triggerName = 0; triggerName != triggersToVeto.size(); triggerName++){
1490 >      if(trigger->name.find(triggersToVeto.at(triggerName))!=string::npos) return false;
1491 >    }
1492 >    //if the event passes one of the chosen triggers, set triggerDecision to true
1493 >    for(uint triggerName = 0; triggerName != triggersToTest.size(); triggerName++){
1494 >      if(trigger->name.find(triggersToTest.at(triggerName))!=string::npos) triggerDecision = true;
1495      }
1496 <  return triggerDecision;
1496 >  }
1497 >
1498 >  printAllTriggers_ = false;  // only print triggers once, not every event
1499  
1500 +  //if none of the veto triggers fired:
1501 +  //return the OR of all the chosen triggers
1502 +  if (triggersToTest.size() != 0) return triggerDecision;
1503 +  //or if no triggers were defined return true
1504 +  else return true;
1505   }
1506  
1507 < std::vector<std::string>
1507 >
1508 > vector<string>
1509   OSUAnalysis::splitString (string inputString){
1510  
1511 <  std::stringstream stringStream(inputString);
1512 <  std::istream_iterator<std::string> begin(stringStream);
1513 <  std::istream_iterator<std::string> end;
1514 <  std::vector<std::string> stringVector(begin, end);
1511 >  stringstream stringStream(inputString);
1512 >  istream_iterator<string> begin(stringStream);
1513 >  istream_iterator<string> end;
1514 >  vector<string> stringVector(begin, end);
1515    return stringVector;
1516  
1517   }
1518  
1519  
1520   void OSUAnalysis::getTwoObjs(string tempInputCollection, string& obj1, string& obj2) {
1521 <  // Set two object strings from the tempInputCollection string,
1522 <  // For example, if tempInputCollection is "electron-muon pairs",
1523 <  // then obj1 = "electrons" and obj2 = "muons".  
1524 <  // Note that the objects have an "s" appended.  
1521 >  // Set two object strings from the tempInputCollection string,
1522 >  // For example, if tempInputCollection is "electron-muon pairs",
1523 >  // then obj1 = "electrons" and obj2 = "muons".
1524 >  // Note that the objects have an "s" appended.
1525  
1526    int dashIndex = tempInputCollection.find("-");
1527    int spaceIndex = tempInputCollection.find_last_of(" ");
1528    int secondWordLength = spaceIndex - dashIndex;
1529 <  obj1 = tempInputCollection.substr(0,dashIndex) + "s";  
1529 >  obj1 = tempInputCollection.substr(0,dashIndex) + "s";
1530    obj2 = tempInputCollection.substr(dashIndex+1,secondWordLength-1)+"s";
1531 <  
1532 < }
1531 >
1532 > }
1533  
1534  
1535   string OSUAnalysis::getObjToGet(string obj) {
1536    // Return the string corresponding to the object to get for the given obj string.
1537 <  // Right now this only handles the case in which obj contains "secondary",
1538 <  // e.g, "secondary muons".  
1539 <  // 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);
1537 >  // Right now this only handles the case in which obj contains "secondary",
1538 >  // e.g, "secondary muons".
1539 >  // Note that "s" is NOT appended.
1540  
1541 < }  
1541 >  if (obj.find("secondary")==string::npos) return obj;  // "secondary" is not found
1542 >  int firstSpaceIndex = obj.find_first_of(" ");
1543 >  return obj.substr(firstSpaceIndex+1,obj.length()-1);
1544  
1545 + }
1546  
1547  
1548 + //!jet valueLookup
1549   double
1550 < OSUAnalysis::valueLookup (const BNjet* object, string variable, string function){
1550 > OSUAnalysis::valueLookup (const BNjet* object, string variable, string function, string &stringValue){
1551  
1552    double value = 0.0;
1553    if(variable == "energy") value = object->energy;
# Line 1056 | Line 1666 | OSUAnalysis::valueLookup (const BNjet* o
1666    else if(variable == "puJetId_loose_simple") value = object->puJetId_loose_simple;
1667    else if(variable == "puJetId_loose_cutbased") value = object->puJetId_loose_cutbased;
1668  
1669 +  //user defined variable
1670 +  else if(variable == "disappTrkLeadingJetID") {
1671 +    value = object->pt > 110
1672 +      && fabs(object->eta) < 2.4
1673 +      && object->chargedHadronEnergyFraction > 0.2
1674 +      && object->neutralHadronEnergyFraction < 0.7
1675 +      && object->chargedEmEnergyFraction < 0.5
1676 +      && object->neutralEmEnergyFraction < 0.7;
1677 +  }
1678 +
1679 +  else if(variable == "disappTrkSubLeadingJetID") {
1680 +    value = object->pt > 30
1681 +      && fabs(object->eta) < 4.5
1682 +      && object->neutralHadronEnergyFraction < 0.7
1683 +      && object->chargedEmEnergyFraction < 0.5;
1684 +  }
1685 +
1686 +  else if(variable == "dPhiMet") {
1687 +    if (const BNmet *met = chosenMET ()) {
1688 +      value = deltaPhi (object->phi, met->phi);
1689 +    } else value = -999;
1690 +  }
1691 +
1692  
1693 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1693 >  else{clog << "WARNING: invalid jet variable '" << variable << "'\n"; value = -999;}
1694  
1695    value = applyFunction(function, value);
1696  
1697    return value;
1698 < }
1066 <
1698 > } // end jet valueLookup
1699  
1700  
1701 + //!muon valueLookup
1702   double
1703 < OSUAnalysis::valueLookup (const BNmuon* object, string variable, string function){
1703 > OSUAnalysis::valueLookup (const BNmuon* object, string variable, string function, string &stringValue){
1704  
1705    double value = 0.0;
1706    if(variable == "energy") value = object->energy;
# Line 1159 | Line 1792 | OSUAnalysis::valueLookup (const BNmuon*
1792    else if(variable == "neutralHadronIsoDR04") value = object->neutralHadronIsoDR04;
1793    else if(variable == "photonIsoDR04") value = object->photonIsoDR04;
1794    else if(variable == "puChargedHadronIsoDR04") value = object->puChargedHadronIsoDR04;
1795 +  else if(variable == "chargedHadronIsoDR04") value = object->chargedHadronIsoDR04;
1796 +  else if(variable == "neutralHadronIsoDR04") value = object->neutralHadronIsoDR04;
1797 +  else if(variable == "photonIsoDR04") value = object->photonIsoDR04;
1798 +  else if(variable == "puChargedHadronIsoDR04") value = object->puChargedHadronIsoDR04;
1799    else if(variable == "rhoPrime") value = object->rhoPrime;
1800    else if(variable == "AEffDr03") value = object->AEffDr03;
1801    else if(variable == "AEffDr04") value = object->AEffDr04;
# Line 1166 | Line 1803 | OSUAnalysis::valueLookup (const BNmuon*
1803    else if(variable == "pfIsoR03SumNeutralHadronEt") value = object->pfIsoR03SumNeutralHadronEt;
1804    else if(variable == "pfIsoR03SumPhotonEt") value = object->pfIsoR03SumPhotonEt;
1805    else if(variable == "pfIsoR03SumPUPt") value = object->pfIsoR03SumPUPt;
1806 +  else if(variable == "relpfIsoR04SumExceptChargedHad") value = (object->pfIsoR04SumNeutralHadronEt + object->pfIsoR04SumPhotonEt - 0.5*object->pfIsoR04SumPUPt)/ object->pt;
1807 +  else if(variable == "relpfIsoR04SumChargedHadronPt") value = object->pfIsoR04SumChargedHadronPt/object->pt;
1808 +  else if(variable == "relpfIsoR04SumNeutralHadronEt") value = object->pfIsoR04SumNeutralHadronEt/object->pt;
1809 +  else if(variable == "relpfIsoR04SumPhotonEt") value = object->pfIsoR04SumPhotonEt/object->pt;
1810 +  else if(variable == "relpfIsoR04SumPUPt") value = object->pfIsoR04SumPUPt/object->pt;
1811    else if(variable == "pfIsoR04SumChargedHadronPt") value = object->pfIsoR04SumChargedHadronPt;
1812    else if(variable == "pfIsoR04SumNeutralHadronEt") value = object->pfIsoR04SumNeutralHadronEt;
1813    else if(variable == "pfIsoR04SumPhotonEt") value = object->pfIsoR04SumPhotonEt;
# Line 1222 | Line 1864 | OSUAnalysis::valueLookup (const BNmuon*
1864    else if(variable == "time_ndof") value = object->time_ndof;
1865  
1866    //user-defined variables
1867 +  else if(variable == "looseID") {
1868 +    value = object->pt > 10 &&
1869 +      (object->isGlobalMuon  > 0 ||
1870 +       object->isTrackerMuon > 0);
1871 +  }
1872 +
1873 +  else if(variable == "looseIDGlobalMuon") {
1874 +    value = object->pt > 10 &&
1875 +      object->isGlobalMuon  > 0;
1876 +  }
1877    else if(variable == "correctedD0VertexErr") value =  hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1878    else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1879    else if(variable == "detIso") value = (object->trackIsoDR03) / object->pt;
1880    else if(variable == "relPFdBetaIso") value = (object->pfIsoR04SumChargedHadronPt + max(0.0, object->pfIsoR04SumNeutralHadronEt + object->pfIsoR04SumPhotonEt - 0.5*object->pfIsoR04SumPUPt)) / object->pt;
1881 +  else if(variable == "relPFdBetaIsoPseudo") value = (object->pfIsoR04SumChargedHadronPt + object->pfIsoR04SumNeutralHadronEt + object->pfIsoR04SumPhotonEt - 0.5*object->pfIsoR04SumPUPt) / object->pt;
1882    else if(variable == "relPFrhoIso") value = ( object->chargedHadronIso + max(0.0, object->neutralHadronIso + object->photonIso - object->AEffDr03*object->rhoPrime) ) / object->pt;
1883    else if(variable == "metMT") {
1884 <    const BNmet *met = chosenMET ();
1232 <    if (met)
1884 >    if (const BNmet *met = chosenMET ())
1885        {
1886 <        TLorentzVector p1 (object->px, object->py, object->pz, object->energy),
1887 <          p2 (met->px, met->py, 0.0, met->pt);
1888 <
1889 <        value = (p1 + p2).Mt ();
1886 >        double dPhi = deltaPhi (object->phi, met->phi);
1887 >        value = sqrt (2 * object->pt * met->pt * (1 - cos (dPhi)));
1888 >      }
1889 >    else
1890 >      value = -999;
1891 >  }
1892 >  else if(variable == "ptPlusMet") {
1893 >    // Calculate the magnitude of the vector sum of the muon pT and the Met.  
1894 >    if (const BNmet *met = chosenMET ())
1895 >      {
1896 >        TVector2 p2Met;
1897 >        TVector2 p2Muon;
1898 >        p2Met. SetMagPhi(   met->pt,    met->phi);
1899 >        p2Muon.SetMagPhi(object->pt, object->phi);  
1900 >        TVector2 p2MetElec = p2Met + p2Muon;
1901 >        value = p2MetElec.Mod();  
1902        }
1903      else
1904        value = -999;
1905    }
1242
1243
1906  
1907    else if(variable == "correctedD0VertexInEBPlus"){
1908      if(fabs(object->eta) < 0.8 && object->eta > 0) value = object->correctedD0Vertex;
# Line 1352 | Line 2014 | OSUAnalysis::valueLookup (const BNmuon*
2014      value = object->isGlobalMuon > 0                \
2015        && object->isPFMuon > 0                        \
2016        && object->normalizedChi2 < 10                \
2017 <                                  && object->numberOfValidMuonHits > 0        \
2017 >      && object->numberOfValidMuonHits > 0        \
2018        && object->numberOfMatchedStations > 1        \
2019        && fabs(object->correctedD0Vertex) < 0.2        \
2020        && fabs(object->correctedDZ) < 0.5        \
# Line 1361 | Line 2023 | OSUAnalysis::valueLookup (const BNmuon*
2023    }
2024    else if(variable == "tightIDdisplaced"){
2025      value = object->isGlobalMuon > 0                \
2026 +      && object->isPFMuon > 0                        \
2027        && object->normalizedChi2 < 10                \
2028 <                                  && object->numberOfValidMuonHits > 0        \
2028 >      && object->numberOfValidMuonHits > 0        \
2029        && object->numberOfMatchedStations > 1        \
2030        && object->numberOfValidPixelHits > 0        \
2031        && object->numberOfLayersWithMeasurement > 5;
2032    }
2033  
2034 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2034 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2035  
2036    else if(variable == "genMatchedPdgId"){
2037      int index = getGenMatchedParticleIndex(object);
# Line 1388 | Line 2051 | OSUAnalysis::valueLookup (const BNmuon*
2051    }
2052    else if(variable == "genMatchedMotherIdReverse"){
2053      int index = getGenMatchedParticleIndex(object);
2054 <    if(index == -1) value = 23;
2055 <    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
2054 >    if(index == -1) value = 24;
2055 >    else value = 24 - getPdgIdBinValue(mcparticles->at(index).motherId);
2056    }
2057    else if(variable == "genMatchedGrandmotherId"){
2058      int index = getGenMatchedParticleIndex(object);
# Line 1401 | Line 2064 | OSUAnalysis::valueLookup (const BNmuon*
2064      }
2065      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2066    }
2067 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2068 +    int index = getGenMatchedParticleIndex(object);
2069 +    if(index == -1) value = 24;
2070 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2071 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2072 +      if(motherIndex == -1) value = 24;
2073 +      else value = 24 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2074 +    }
2075 +    else value = 24 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2076 +  }
2077 +  else if(variable == "pfMuonsFromVertex"){
2078 +    double d0Error, dzError;
2079 +
2080 +    d0Error = hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
2081 +    dzError = hypot (object->tkDZerr, chosenVertex ()->zError);
2082 +    value = fabs (object->correctedD0Vertex) > 0.2 || fabs (object->correctedDZ) > 0.5
2083 +      || fabs (object->correctedD0Vertex / d0Error) > 99.0
2084 +      || fabs (object->correctedDZ / dzError) > 99.0;
2085 +    value = (object->isStandAloneMuon && !object->isTrackerMuon && !object->isGlobalMuon) || !value;
2086 +  }
2087  
2088  
2089  
2090 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2090 >  else{clog << "WARNING: invalid muon variable '" << variable << "'\n"; value = -999;}
2091  
2092    value = applyFunction(function, value);
2093  
2094    return value;
2095 < }
2095 > } // end muon valueLookup
2096  
2097  
2098 + //!electron valueLookup
2099   double
2100 < OSUAnalysis::valueLookup (const BNelectron* object, string variable, string function){
2100 > OSUAnalysis::valueLookup (const BNelectron* object, string variable, string function, string &stringValue){
2101  
2102    double value = 0.0;
2103    if(variable == "energy") value = object->energy;
# Line 1578 | Line 2262 | OSUAnalysis::valueLookup (const BNelectr
2262    else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
2263    else if(variable == "detIso") value = (object->trackIso) / object->pt;
2264    else if(variable == "relPFrhoIso") value = ( object->chargedHadronIsoDR03 + max(0.0, object->neutralHadronIsoDR03 + object->photonIsoDR03 - object->AEffDr03*object->rhoPrime) ) / object->pt;
2265 +  else if(variable == "relPFrhoIsoEB") value = object->isEB ? ( object->chargedHadronIsoDR03 + max(0.0, object->neutralHadronIsoDR03 + object->photonIsoDR03 - object->AEffDr03*object->rhoPrime) ) / object->pt : -999;
2266 +  else if(variable == "relPFrhoIsoEE") value = object->isEE ? ( object->chargedHadronIsoDR03 + max(0.0, object->neutralHadronIsoDR03 + object->photonIsoDR03 - object->AEffDr03*object->rhoPrime) ) / object->pt : -999;
2267    else if(variable == "metMT") {
2268 <    const BNmet *met = chosenMET ();
1583 <    if (met)
2268 >    if (const BNmet *met = chosenMET ())
2269        {
2270 <        TLorentzVector p1 (object->px, object->py, object->pz, object->energy),
2271 <          p2 (met->px, met->py, 0.0, met->pt);
2270 >        double dPhi = deltaPhi (object->phi, met->phi);
2271 >        value = sqrt (2 * object->pt * met->pt * (1 - cos (dPhi)));
2272 >      }
2273 >    else
2274 >      value = -999;
2275 >  }
2276  
2277 <        value = (p1 + p2).Mt ();
2277 >  else if(variable == "ptPlusMet") {
2278 >    // Calculate the magnitude of the vector sum of the electron pT and the Met.  
2279 >    if (const BNmet *met = chosenMET ())
2280 >      {
2281 >        TVector2 p2Met;
2282 >        TVector2 p2Elec;
2283 >        p2Met. SetMagPhi(   met->pt,    met->phi);
2284 >        p2Elec.SetMagPhi(object->pt, object->phi);  
2285 >        TVector2 p2MetElec = p2Met + p2Elec;
2286 >        value = p2MetElec.Mod();  
2287        }
2288      else
2289        value = -999;
# Line 1652 | Line 2350 | OSUAnalysis::valueLookup (const BNelectr
2350      else value = -999;
2351    }
2352  
2353 +  else if(variable == "looseID"){
2354 +    if (object->isEB)
2355 +      {
2356 +        value = fabs(object->delEtaIn) < 0.007 \
2357 +          && fabs (object->delPhiIn) < 0.15 \
2358 +          && object->scSigmaIEtaIEta < 0.01 \
2359 +          && object->hadOverEm < 0.12 \
2360 +          && fabs (object->correctedD0Vertex) < 0.02 \
2361 +          && fabs (object->correctedDZ) < 0.2 \
2362 +          && object->absInvEMinusInvPin < 0.05 \
2363 +          && object->passConvVeto;
2364 +      }
2365 +    else
2366 +      {
2367 +        value = fabs(object->delEtaIn) < 0.009 \
2368 +          && fabs (object->delPhiIn) < 0.10 \
2369 +          && object->scSigmaIEtaIEta < 0.03 \
2370 +          && object->hadOverEm < 0.10 \
2371 +          && fabs (object->correctedD0Vertex) < 0.02 \
2372 +          && fabs (object->correctedDZ) < 0.2 \
2373 +          && object->absInvEMinusInvPin < 0.05 \
2374 +          && object->passConvVeto;
2375 +      }
2376 +  }
2377 +
2378    else if(variable == "tightID"){
2379      if (object->isEB)
2380        {
# Line 1677 | Line 2400 | OSUAnalysis::valueLookup (const BNelectr
2400        }
2401    }
2402  
2403 +  else if(variable == "looseID_MVA"){
2404 +    value = object->pt > 10
2405 +      && object->mvaNonTrigV0 > 0;
2406 +      }
2407    else if(variable == "correctedD0VertexInEBPositiveCharge"){
2408      if(fabs(object->eta) < 0.8 && object->charge > 0) value = object->correctedD0Vertex;
2409      else value = -999;
# Line 1750 | Line 2477 | OSUAnalysis::valueLookup (const BNelectr
2477    }
2478  
2479  
2480 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2480 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2481  
2482    else if(variable == "genMatchedPdgId"){
2483      int index = getGenMatchedParticleIndex(object);
# Line 1771 | Line 2498 | OSUAnalysis::valueLookup (const BNelectr
2498    }
2499    else if(variable == "genMatchedMotherIdReverse"){
2500      int index = getGenMatchedParticleIndex(object);
2501 <    if(index == -1) value = 23;
2502 <    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
2501 >    if(index == -1) value = 24;
2502 >    else value = 24 -getPdgIdBinValue(mcparticles->at(index).motherId);
2503    }
2504    else if(variable == "genMatchedGrandmotherId"){
2505      int index = getGenMatchedParticleIndex(object);
# Line 1784 | Line 2511 | OSUAnalysis::valueLookup (const BNelectr
2511      }
2512      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2513    }
2514 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2515 +    int index = getGenMatchedParticleIndex(object);
2516 +    if(index == -1) value = 24;
2517 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2518 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2519 +      if(motherIndex == -1) value = 24;
2520 +      else value = 24 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2521 +    }
2522 +    else value = 24 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2523 +  }
2524 +  else if(variable == "pfElectronsFromVertex"){
2525 +    double d0Error, dzError;
2526 +
2527 +    d0Error = hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
2528 +    dzError = hypot (object->tkDZerr, chosenVertex ()->zError);
2529 +    value = fabs (object->correctedD0Vertex) > 0.2 || fabs (object->correctedDZ) > 0.5
2530 +      || fabs (object->correctedD0Vertex / d0Error) > 99.0
2531 +      || fabs (object->correctedDZ / dzError) > 99.0;
2532 +    value = !value;
2533 +  }
2534  
2535  
2536  
2537 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2537 >  else{clog << "WARNING: invalid electron variable '" << variable << "'\n"; value = -999;}
2538  
2539    value = applyFunction(function, value);
2540  
2541    return value;
2542 < }
2542 > } // end electron valueLookup
2543  
2544  
2545 + //!event valueLookup
2546   double
2547 < OSUAnalysis::valueLookup (const BNevent* object, string variable, string function){
2547 > OSUAnalysis::valueLookup (const BNevent* object, string variable, string function, string &stringValue){
2548  
2549    double value = 0.0;
2550  
# Line 1865 | Line 2613 | OSUAnalysis::valueLookup (const BNevent*
2613    else if(variable == "id2") value = object->id2;
2614    else if(variable == "evt") value = object->evt;
2615    else if(variable == "puScaleFactor"){
2616 <    if(datasetType_ != "data")
2616 >    if(doPileupReweighting_ && datasetType_ != "data")
2617        value = puWeight_->at (events->at (0).numTruePV);
2618      else
2619        value = 1.0;
2620    }
2621 <  else if(variable == "muonScaleFactor"){
2622 <    if(datasetType_ != "data")
2623 <      //      value = muonSFWeight_->at (chosenMuon ()->eta);
2624 <      value = 1.0;
2625 <    else
2626 <      value = 1.0;
2627 <  }
2628 <  else if(variable == "electronScaleFactor"){
2629 <    if(datasetType_ != "data")
2630 <      //      value = electronSFWeight_->at (chosenElectron ()->eta, chosenElectron ()->pt);
2631 <      value = 1.0;
2632 <    else
2633 <      value = 1.0;
2621 >  else if(variable == "muonScaleFactor") value = muonScaleFactor_;
2622 >  else if(variable == "electronScaleFactor") value = electronScaleFactor_;
2623 >  else if(variable == "stopCTauScaleFactor") value = stopCTauScaleFactor_;
2624 >  else if(variable == "bTagScaleFactor") value = bTagScaleFactor_;
2625 >
2626 >  else if(variable == "unfilteredHt") value = getHt(jets.product());
2627 >  else if(variable == "ht") value = chosenHT ();
2628 >
2629 >  else if(variable == "leadMuPairInvMass"){
2630 >    pair<const BNmuon *, const BNmuon *> muPair = leadMuonPair ();
2631 >    TLorentzVector p0 (muPair.first->px, muPair.first->py, muPair.first->pz, muPair.first->energy),
2632 >                   p1 (muPair.second->px, muPair.second->py, muPair.second->pz, muPair.second->energy);
2633 >    value = (p0 + p1).M ();
2634 >  }
2635 >  else if(variable == "leadMuPairPt"){
2636 >    pair<const BNmuon *, const BNmuon *> muPair = leadMuonPair ();
2637 >    TVector2 pt0 (muPair.first->px, muPair.first->py),
2638 >             pt1 (muPair.second->px, muPair.second->py);
2639 >    pt0 += pt1;
2640 >    value = pt0.Mod ();
2641 >  }
2642 >  else if(variable == "leadElPairInvMass"){
2643 >    pair<const BNelectron *, const BNelectron *> muPair = leadElectronPair ();
2644 >    TLorentzVector p0 (muPair.first->px, muPair.first->py, muPair.first->pz, muPair.first->energy),
2645 >                   p1 (muPair.second->px, muPair.second->py, muPair.second->pz, muPair.second->energy);
2646 >    value = (p0 + p1).M ();
2647 >  }
2648 >  else if(variable == "leadElPairPt"){
2649 >    pair<const BNelectron *, const BNelectron *> muPair = leadElectronPair ();
2650 >    TVector2 pt0 (muPair.first->px, muPair.first->py),
2651 >             pt1 (muPair.second->px, muPair.second->py);
2652 >    pt0 += pt1;
2653 >    value = pt0.Mod ();
2654    }
2655 <  else if(variable == "cTauScaleFactor")
1888 <    value = cTauScaleFactor_;
1889 <
1890 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2655 >  else{clog << "WARNING: invalid event variable '" << variable << "'\n"; value = -999;}
2656  
2657    value = applyFunction(function, value);
2658  
2659    return value;
2660 < }
2660 > } // end event valueLookup
2661  
2662 +
2663 + //!tau valueLookup
2664   double
2665 < OSUAnalysis::valueLookup (const BNtau* object, string variable, string function){
2665 > OSUAnalysis::valueLookup (const BNtau* object, string variable, string function, string &stringValue){
2666  
2667    double value = 0.0;
2668  
# Line 1939 | Line 2706 | OSUAnalysis::valueLookup (const BNtau* o
2706    else if(variable == "HPSdecayModeFinding") value = object->HPSdecayModeFinding;
2707    else if(variable == "leadingTrackValid") value = object->leadingTrackValid;
2708  
2709 +  else if (variable == "looseHadronicID") {
2710 +    //criteria taken from http://cms.cern.ch/iCMS/jsp/db_notes/showNoteDetails.jsp?noteID=CMS%20AN-2011/019
2711 +    value = object->pt > 30
2712 +      && fabs(object->eta) < 2.3
2713 +      && object->HPSbyLooseCombinedIsolationDeltaBetaCorr > 0
2714 +      && object->HPSdecayModeFinding > 0
2715 +      && object->HPSagainstElectronLoose > 0
2716 +      && object->HPSagainstMuonTight > 0;
2717 +  }
2718  
2719 <
1944 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2719 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2720  
2721    else if(variable == "genMatchedPdgId"){
2722      int index = getGenMatchedParticleIndex(object);
# Line 1961 | Line 2736 | OSUAnalysis::valueLookup (const BNtau* o
2736    }
2737    else if(variable == "genMatchedMotherIdReverse"){
2738      int index = getGenMatchedParticleIndex(object);
2739 <    if(index == -1) value = 23;
2740 <    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
2739 >    if(index == -1) value = 24;
2740 >    else value = 24 -getPdgIdBinValue(mcparticles->at(index).motherId);
2741    }
2742    else if(variable == "genMatchedGrandmotherId"){
2743      int index = getGenMatchedParticleIndex(object);
# Line 1974 | Line 2749 | OSUAnalysis::valueLookup (const BNtau* o
2749      }
2750      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2751    }
2752 +  else if(variable == "genMatchedGrandmotherIdReverse"){
2753 +    int index = getGenMatchedParticleIndex(object);
2754 +    if(index == -1) value = 24;
2755 +    else if(fabs(mcparticles->at(index).motherId) == 15){
2756 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
2757 +      if(motherIndex == -1) value = 24;
2758 +      else value = 24 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
2759 +    }
2760 +    else value = 24 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
2761 +  }
2762  
2763  
2764 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2764 >  else{clog << "WARNING: invalid tau variable '" << variable << "'\n"; value = -999;}
2765  
2766    value = applyFunction(function, value);
2767  
2768    return value;
2769 < }
2769 > } // end tau valueLookup
2770  
2771 +
2772 + //!met valueLookup
2773   double
2774 < OSUAnalysis::valueLookup (const BNmet* object, string variable, string function){
2774 > OSUAnalysis::valueLookup (const BNmet* object, string variable, string function, string &stringValue){
2775  
2776    double value = 0.0;
2777  
# Line 2048 | Line 2835 | OSUAnalysis::valueLookup (const BNmet* o
2835    else if(variable == "pfT1jet10pt") value = object->pfT1jet10pt;
2836    else if(variable == "pfT1jet10phi") value = object->pfT1jet10phi;
2837  
2838 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2838 >  else{clog << "WARNING: invalid met variable '" << variable << "'\n"; value = -999;}
2839  
2840    value = applyFunction(function, value);
2841  
2842    return value;
2843 < }
2843 > } // end met valueLookup
2844  
2845 +
2846 + //!track valueLookup
2847   double
2848 < OSUAnalysis::valueLookup (const BNtrack* object, string variable, string function){
2848 > OSUAnalysis::valueLookup (const BNtrack* object, string variable, string function, string &stringValue){
2849  
2850    double value = 0.0;
2851    double pMag = sqrt(object->pt * object->pt +
2852 <                     object->pz * object->pz);
2853 <  
2852 >                     object->pz * object->pz);
2853 >
2854    if(variable == "pt") value = object->pt;
2855    else if(variable == "px") value = object->px;
2856    else if(variable == "py") value = object->py;
# Line 2080 | Line 2869 | OSUAnalysis::valueLookup (const BNtrack*
2869    else if(variable == "numValidHits") value = object->numValidHits;
2870    else if(variable == "isHighPurity") value = object->isHighPurity;
2871  
2083
2872    //additional BNs info for disappTrks
2873 <  else if(variable == "isGoodPtResolution") value = object->isGoodPtResolution;
2874 <  else if(variable == "caloEMDeltaRp3") value = object->caloEMDeltaRp3;
2875 <  else if(variable == "caloHadDeltaRp3") value = object->caloHadDeltaRp3;
2876 <  else if(variable == "caloEMDeltaRp4") value = object->caloEMDeltaRp4;
2877 <  else if(variable == "caloHadDeltaRp4") value = object->caloHadDeltaRp4;
2878 <  else if(variable == "caloEMDeltaRp5") value = object->caloEMDeltaRp5;
2879 <  else if(variable == "caloHadDeltaRp5") value = object->caloHadDeltaRp5;
2880 <  else if(variable == "nHitsMissingOuter") value = object->nHitsMissingOuter;
2093 <  else if(variable == "nHitsMissingInner") value = object->nHitsMissingInner;
2873 >  else if(variable == "caloEMDeltaRp3")     value = object->caloEMDeltaRp3;
2874 >  else if(variable == "caloHadDeltaRp3")    value = object->caloHadDeltaRp3;
2875 >  else if(variable == "caloEMDeltaRp4")     value = object->caloEMDeltaRp4;
2876 >  else if(variable == "caloHadDeltaRp4")    value = object->caloHadDeltaRp4;
2877 >  else if(variable == "caloEMDeltaRp5")     value = object->caloEMDeltaRp5;
2878 >  else if(variable == "caloHadDeltaRp5")    value = object->caloHadDeltaRp5;
2879 >  else if(variable == "nHitsMissingOuter")  value = object->nHitsMissingOuter;
2880 >  else if(variable == "nHitsMissingInner")  value = object->nHitsMissingInner;
2881    else if(variable == "nHitsMissingMiddle") value = object->nHitsMissingMiddle;
2882 <  
2882 >  else if(variable == "depTrkRp3")          value = object->depTrkRp3;
2883 >  else if(variable == "trkRelIsoRp3")     { value = (object->depTrkRp3 - object->pt) / object->pt; if (value<0) value = 0; }
2884 >  else if(variable == "trkRelIsoRp5")     { value = (object->depTrkRp5 - object->pt) / object->pt; if (value<0) value = 0; }
2885 >  else if(variable == "depEcalRp3")         value = object->depEcalRp3;
2886 >  else if(variable == "depHcalRp3")         value = object->depHcalRp3;
2887 >  else if(variable == "depHoRp3")           value = object->depHoRp3;
2888 >  else if(variable == "nTracksRp3")         value = object->nTracksRp3;
2889 >  else if(variable == "trackerVetoPtRp3")   value = object->trackerVetoPtRp3;
2890 >  else if(variable == "emVetoEtRp3")        value = object->emVetoEtRp3;
2891 >  else if(variable == "hadVetoEtRp3")       value = object->hadVetoEtRp3;
2892 >  else if(variable == "hoVetoEtRp3")        value = object->hoVetoEtRp3;
2893 >  else if(variable == "depTrkRp5")          value = object->depTrkRp5;
2894 >  else if(variable == "depEcalRp5")         value = object->depEcalRp5;
2895 >  else if(variable == "depHcalRp5")         value = object->depHcalRp5;
2896 >  else if(variable == "depHoRp5")           value = object->depHoRp5;
2897 >  else if(variable == "nTracksRp5")         value = object->nTracksRp5;
2898 >  else if(variable == "trackerVetoPtRp5")   value = object->trackerVetoPtRp5;
2899 >  else if(variable == "emVetoEtRp5")        value = object->emVetoEtRp5;
2900 >  else if(variable == "hadVetoEtRp5")       value = object->hadVetoEtRp5;
2901 >  else if(variable == "hoVetoEtRp5")        value = object->hoVetoEtRp5;
2902  
2903    //user defined variables
2904    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;
2905    else if(variable == "dZwrtBS") value = object->dZ - events->at(0).BSz;
2906 +  else if(variable == "depTrkRp5MinusPt"){
2907 +    if ( (object->depTrkRp5 - object->pt) < 0 ) {
2908 + //       clog << "Warning:  found track with depTrkRp5 < pt:  depTrkRp5=" << object->depTrkRp5
2909 + //         << "; pt=" << object->pt
2910 + //         << "; object->depTrkRp5 - object->pt = " << object->depTrkRp5 - object->pt
2911 + //         << endl;  
2912 +           value = 0;
2913 +         }
2914 +         else value =  (object->depTrkRp5 - object->pt);
2915 +  }
2916 +  else if(variable == "depTrkRp3MinusPt"){
2917 +    if ( (object->depTrkRp3 - object->pt) < 0 ) {
2918 +      value = 0;
2919 +    }
2920 +    else value =  (object->depTrkRp3 - object->pt);
2921 +  }
2922 +
2923 +  else if(variable == "dPhiMet") {
2924 +    if (const BNmet *met = chosenMET ()) {
2925 +      value = deltaPhi (object->phi, met->phi);
2926 +    } else value = -999;
2927 +  }
2928 +  
2929 +  
2930    else if(variable == "caloTotDeltaRp5")            value =  (object->caloHadDeltaRp5 + object->caloEMDeltaRp5);
2931    else if(variable == "caloTotDeltaRp5ByP")         value = ((object->caloHadDeltaRp5 + object->caloEMDeltaRp5)/pMag);
2932 <  else if(variable == "caloTotDeltaRp5RhoCorr")     value = getTrkCaloTotRhoCorr(object);  
2933 <  else if(variable == "caloTotDeltaRp5ByPRhoCorr")  value = getTrkCaloTotRhoCorr(object) / pMag;  
2932 >  else if(variable == "caloTotDeltaRp5RhoCorr")     value = getTrkCaloTotRhoCorr(object);
2933 >  else if(variable == "caloTotDeltaRp5ByPRhoCorr")  value = getTrkCaloTotRhoCorr(object) / pMag;
2934 >  else if(variable == "depTrkRp5RhoCorr")           value = getTrkDepTrkRp5RhoCorr(object);
2935 >  else if(variable == "depTrkRp3RhoCorr")           value = getTrkDepTrkRp3RhoCorr(object);
2936 >
2937 >  else if(variable == "depTrkRp5MinusPtRhoCorr")    {
2938 >    if ( (getTrkDepTrkRp5RhoCorr(object) - object->pt) < 0 ) value = 0;
2939 >    else {value = (getTrkDepTrkRp5RhoCorr(object) - object->pt );}
2940 >  }
2941 >  
2942 >  else if(variable == "depTrkRp3MinusPtRhoCorr")    
2943 >    {
2944 >      if ( (getTrkDepTrkRp3RhoCorr(object) - object->pt) < 0 ) value = 0;
2945 >      else {value = (getTrkDepTrkRp3RhoCorr(object) - object->pt );}
2946 >    }
2947 >
2948    else if(variable == "isIso")                      value = getTrkIsIso(object, tracks.product());
2949    else if(variable == "isMatchedDeadEcal")          value = getTrkIsMatchedDeadEcal(object);
2950    else if(variable == "ptErrorByPt")                value = (object->ptError/object->pt);
2951    else if(variable == "ptError")                    value = object->ptError;
2952    else if(variable == "ptRes")                      value = getTrkPtRes(object);
2953 <  else if (variable == "d0wrtPV"){      
2954 <    double vx = object->vx - chosenVertex ()->x,        
2955 <      vy = object->vy - chosenVertex ()->y,      
2956 <      px = object->px,  
2957 <      py = object->py,  
2958 <      pt = object->pt;  
2959 <    value = (-vx * py + vy * px) / pt;  
2960 <  }      
2961 <  else if (variable == "dZwrtPV"){      
2962 <    double vx = object->vx - chosenVertex ()->x,        
2963 <      vy = object->vy - chosenVertex ()->y,      
2964 <      vz = object->vz - chosenVertex ()->z,      
2965 <      px = object->px,  
2966 <      py = object->py,  
2967 <      pz = object->pz,  
2968 <      pt = object->pt;  
2969 <    value = vz - (vx * px + vy * py)/pt * (pz/pt);      
2970 <  }    
2971 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2953 >  else if (variable == "d0wrtPV"){
2954 >    double vx = object->vx - chosenVertex ()->x,
2955 >      vy = object->vy - chosenVertex ()->y,
2956 >      px = object->px,
2957 >      py = object->py,
2958 >      pt = object->pt;
2959 >    value = (-vx * py + vy * px) / pt;
2960 >  }
2961 >  else if (variable == "dZwrtPV"){
2962 >    double vx = object->vx - chosenVertex ()->x,
2963 >      vy = object->vy - chosenVertex ()->y,
2964 >      vz = object->vz - chosenVertex ()->z,
2965 >      px = object->px,
2966 >      py = object->py,
2967 >      pz = object->pz,
2968 >      pt = object->pt;
2969 >    value = vz - (vx * px + vy * py)/pt * (pz/pt);
2970 >  }
2971 >
2972 >  else if(variable == "deltaRMinSubLeadJet") {
2973 >    // calculate minimum deltaR between track and any other subleading jet  
2974 >    double trkJetDeltaRMin = 99.;  
2975 >    for (uint ijet = 0; ijet<jets->size(); ijet++) {
2976 >      string empty = "";  
2977 >      double isSubLeadingJet = valueLookup(&jets->at(ijet), "disappTrkSubLeadingJetID", "", empty);  
2978 >      if (!isSubLeadingJet) continue;  // only consider jets that pass the subleading jet ID criteria  
2979 >      double jetEta = valueLookup(&jets->at(ijet), "eta", "", empty);
2980 >      double jetPhi = valueLookup(&jets->at(ijet), "phi", "", empty);
2981 >      double trkJetDeltaR = deltaR(object->eta, object->phi, jetEta, jetPhi);  
2982 >      if (trkJetDeltaR < trkJetDeltaRMin) trkJetDeltaRMin = trkJetDeltaR;
2983 >    }
2984 >    value = trkJetDeltaRMin;  
2985 >  }  
2986 >  
2987 >  else if(variable == "deltaRMinElecLooseMvaId") {
2988 >    // calculate minimum deltaR between track and any other electron passing loose mva ID, i.e., mvaNonTrigV0 > 0
2989 >    double trkElecDeltaRMin = 99.;  
2990 >    for (uint ielec = 0; ielec<electrons->size(); ielec++) {
2991 >      string empty = "";  
2992 >      double mvaNonTrigV0 = valueLookup(&electrons->at(ielec), "mvaNonTrigV0", "", empty);  
2993 >      if (mvaNonTrigV0 < 0) continue;  // only consider electrons with mvaNonTrigV0 > 0  
2994 >      double elecEta = valueLookup(&electrons->at(ielec), "eta", "", empty);
2995 >      double elecPhi = valueLookup(&electrons->at(ielec), "phi", "", empty);
2996 >      double trkElecDeltaR = deltaR(object->eta, object->phi, elecEta, elecPhi);  
2997 >      if (trkElecDeltaR < trkElecDeltaRMin) trkElecDeltaRMin = trkElecDeltaR;
2998 >    }
2999 >    value = trkElecDeltaRMin;  
3000 >  }  
3001 >
3002 >  else if(variable == "deltaRMinMuonLooseId") {
3003 >    // calculate minimum deltaR between track and any other loose-Id muon
3004 >    double trkMuonDeltaRMin = 99.;  
3005 >    //    if (!muons) cout << "ERROR:  could not find muon collection for calculation of deltaRMinMuonLooseId" << endl;  
3006 >    for (uint imuon = 0; imuon<muons->size(); imuon++) {
3007 >      string empty = "";  
3008 >      double isLooseIdMuon = valueLookup(&muons->at(imuon), "looseID", "", empty);  
3009 >      if (!isLooseIdMuon) continue;  // only consider muons that pass the looseID criteria  
3010 >      double muonEta = valueLookup(&muons->at(imuon), "eta", "", empty);
3011 >      double muonPhi = valueLookup(&muons->at(imuon), "phi", "", empty);
3012 >      double trkMuonDeltaR = deltaR(object->eta, object->phi, muonEta, muonPhi);  
3013 >      if (trkMuonDeltaR < trkMuonDeltaRMin) trkMuonDeltaRMin = trkMuonDeltaR;
3014 >    }
3015 >    value = trkMuonDeltaRMin;  
3016 >  }  
3017 >  
3018 >  else if(variable == "deltaRMinSecMuonLooseIdGlobal") {
3019 >    // calculate minimum deltaR between track and any other loose-Id muon
3020 >    double trkMuonDeltaRMin = 99.;  
3021 >    //    if (!secMuons) cout << "ERROR:  could not find secondary muon collection for calculation of deltaRMinSecMuonLooseIdGlobal" << endl;  
3022 >    for (uint imuon = 0; imuon<secMuons->size(); imuon++) {  
3023 >      string empty = "";  
3024 >      double isLooseIdMuon = valueLookup(&secMuons->at(imuon), "looseIDGlobalMuon", "", empty);  
3025 >      if (!isLooseIdMuon) continue;  // only consider muons that pass the looseIDGlobal criteria  
3026 >      double muonEta = valueLookup(&secMuons->at(imuon), "eta", "", empty);
3027 >      double muonPhi = valueLookup(&secMuons->at(imuon), "phi", "", empty);
3028 >      double trkMuonDeltaR = deltaR(object->eta, object->phi, muonEta, muonPhi);  
3029 >      if (trkMuonDeltaR < trkMuonDeltaRMin) trkMuonDeltaRMin = trkMuonDeltaR;
3030 >    }
3031 >    value = trkMuonDeltaRMin;  
3032 >  }  
3033 >  
3034 >  else if(variable == "deltaRMinTauLooseHadronicId") {
3035 >    // calculate minimum deltaR between track and any other tau passing loose hadronic ID  
3036 >    double trkTauDeltaRMin = 99.;  
3037 >    //    if (!taus) cout << "ERROR:  could not find tau collection for calculation of deltaRMinTauLooseHadronicId" << endl;  
3038 >    for (uint itau = 0; itau<taus->size(); itau++) {
3039 >      string empty = "";  
3040 >      double isIdTau = valueLookup(&taus->at(itau), "looseHadronicID", "", empty);  
3041 >      if (!isIdTau) continue;  // only consider taus that pass the loose hadronic ID criteria  
3042 >      double tauEta = valueLookup(&taus->at(itau), "eta", "", empty);
3043 >      double tauPhi = valueLookup(&taus->at(itau), "phi", "", empty);
3044 >      double trkTauDeltaR = deltaR(object->eta, object->phi, tauEta, tauPhi);  
3045 >      if (trkTauDeltaR < trkTauDeltaRMin) trkTauDeltaRMin = trkTauDeltaR;
3046 >    }
3047 >    value = trkTauDeltaRMin;  
3048 >  }  
3049 >
3050 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
3051  
3052    else if(variable == "genMatchedPdgId"){
3053      int index = getGenMatchedParticleIndex(object);
# Line 2145 | Line 3068 | OSUAnalysis::valueLookup (const BNtrack*
3068    }
3069    else if(variable == "genMatchedMotherIdReverse"){
3070      int index = getGenMatchedParticleIndex(object);
3071 <    if(index == -1) value = 23;
3072 <    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
3071 >    if(index == -1) value = 24;
3072 >    else value = 24 -getPdgIdBinValue(mcparticles->at(index).motherId);
3073    }
3074    else if(variable == "genMatchedGrandmotherId"){
3075      int index = getGenMatchedParticleIndex(object);
# Line 2158 | Line 3081 | OSUAnalysis::valueLookup (const BNtrack*
3081      }
3082      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
3083    }
3084 +  else if(variable == "genMatchedGrandmotherIdReverse"){
3085 +    int index = getGenMatchedParticleIndex(object);
3086 +    if(index == -1) value = 24;
3087 +    else if(fabs(mcparticles->at(index).motherId) == 15){
3088 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
3089 +      if(motherIndex == -1) value = 24;
3090 +      else value = 24 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
3091 +    }
3092 +    else value = 24 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
3093 +  }
3094  
3095  
3096  
3097 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3097 >  else{clog << "WARNING: invalid track variable '" << variable << "'\n"; value = -999;}
3098  
3099    value = applyFunction(function, value);
3100  
3101    return value;
3102 < }
3102 > } // end track valueLookup
3103 >
3104  
3105 + //!genjet valueLookup
3106   double
3107 < OSUAnalysis::valueLookup (const BNgenjet* object, string variable, string function){
3107 > OSUAnalysis::valueLookup (const BNgenjet* object, string variable, string function, string &stringValue){
3108  
3109    double value = 0.0;
3110  
# Line 2189 | Line 3124 | OSUAnalysis::valueLookup (const BNgenjet
3124    else if(variable == "charge") value = object->charge;
3125  
3126  
3127 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3127 >  else{clog << "WARNING: invalid genjet variable '" << variable << "'\n"; value = -999;}
3128  
3129    value = applyFunction(function, value);
3130  
3131    return value;
3132   }
3133  
3134 + //!mcparticle valueLookup
3135   double
3136 < OSUAnalysis::valueLookup (const BNmcparticle* object, string variable, string function){
3136 > OSUAnalysis::valueLookup (const BNmcparticle* object, string variable, string function, string &stringValue){
3137  
3138    double value = 0.0;
3139  
# Line 2322 | Line 3258 | OSUAnalysis::valueLookup (const BNmcpart
3258    }
3259  
3260  
3261 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3261 >  else{clog << "WARNING: invalid mcparticle variable '" << variable << "'\n"; value = -999;}
3262  
3263    value = applyFunction(function, value);
3264  
3265    return value;
3266 < }
3266 > } // end mcparticle valueLookup
3267 >
3268  
3269 + //!primaryvertex valueLookup
3270   double
3271 < OSUAnalysis::valueLookup (const BNprimaryvertex* object, string variable, string function){
3271 > OSUAnalysis::valueLookup (const BNprimaryvertex* object, string variable, string function, string &stringValue){
3272  
3273    double value = 0.0;
3274  
# Line 2349 | Line 3287 | OSUAnalysis::valueLookup (const BNprimar
3287    else if(variable == "isGood") value = object->isGood;
3288  
3289  
3290 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3290 >  else{clog << "WARNING: invalid primaryvertex variable '" << variable << "'\n"; value = -999;}
3291  
3292    value = applyFunction(function, value);
3293  
3294    return value;
3295   }
3296  
3297 + //!bxlumi valueLookup
3298   double
3299 < OSUAnalysis::valueLookup (const BNbxlumi* object, string variable, string function){
3299 > OSUAnalysis::valueLookup (const BNbxlumi* object, string variable, string function, string &stringValue){
3300  
3301    double value = 0.0;
3302  
# Line 2366 | Line 3305 | OSUAnalysis::valueLookup (const BNbxlumi
3305    else if(variable == "bx_LUMI_now") value = object->bx_LUMI_now;
3306  
3307  
3308 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3308 >  else{clog << "WARNING: invalid bxlumi variable '" << variable << "'\n"; value = -999;}
3309  
3310    value = applyFunction(function, value);
3311  
3312    return value;
3313   }
3314  
3315 + //!photon valueLookup
3316   double
3317 < OSUAnalysis::valueLookup (const BNphoton* object, string variable, string function){
3317 > OSUAnalysis::valueLookup (const BNphoton* object, string variable, string function, string &stringValue){
3318  
3319    double value = 0.0;
3320  
# Line 2449 | Line 3389 | OSUAnalysis::valueLookup (const BNphoton
3389    else if(variable == "seedRecoFlag") value = object->seedRecoFlag;
3390  
3391  
2452
3392  
3393 <  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
3393 >
3394 >  else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
3395  
3396    else if(variable == "genMatchedPdgId"){
3397      int index = getGenMatchedParticleIndex(object);
# Line 2473 | Line 3413 | OSUAnalysis::valueLookup (const BNphoton
3413    }
3414    else if(variable == "genMatchedMotherIdReverse"){
3415      int index = getGenMatchedParticleIndex(object);
3416 <    if(index == -1) value = 23;
3417 <    else value = 23 -getPdgIdBinValue(mcparticles->at(index).motherId);
3416 >    if(index == -1) value = 24;
3417 >    else value = 24 -getPdgIdBinValue(mcparticles->at(index).motherId);
3418    }
3419    else if(variable == "genMatchedGrandmotherId"){
3420      int index = getGenMatchedParticleIndex(object);
# Line 2486 | Line 3426 | OSUAnalysis::valueLookup (const BNphoton
3426      }
3427      else value = getPdgIdBinValue(mcparticles->at(index).grandMotherId);
3428    }
3429 +  else if(variable == "genMatchedGrandmotherIdReverse"){
3430 +    int index = getGenMatchedParticleIndex(object);
3431 +    if(index == -1) value = 24;
3432 +    else if(fabs(mcparticles->at(index).motherId) == 15){
3433 +      int motherIndex = findTauMotherIndex(&mcparticles->at(index));
3434 +      if(motherIndex == -1) value = 24;
3435 +      else value = 24 - getPdgIdBinValue(mcparticles->at(motherIndex).motherId);
3436 +    }
3437 +    else value = 24 - getPdgIdBinValue(mcparticles->at(index).grandMotherId);
3438 +  }
3439  
3440  
3441 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3441 >  else{clog << "WARNING: invalid photon variable '" << variable << "'\n"; value = -999;}
3442  
3443    value = applyFunction(function, value);
3444  
3445    return value;
3446 < }
3446 > } // end photon valueLookup
3447 >
3448  
3449 + //!supercluster valueLookup
3450   double
3451 < OSUAnalysis::valueLookup (const BNsupercluster* object, string variable, string function){
3451 > OSUAnalysis::valueLookup (const BNsupercluster* object, string variable, string function, string &stringValue){
3452  
3453    double value = 0.0;
3454  
# Line 2510 | Line 3462 | OSUAnalysis::valueLookup (const BNsuperc
3462    else if(variable == "theta") value = object->theta;
3463  
3464  
3465 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3465 >  else{clog << "WARNING: invalid supercluster variable '" << variable << "'\n"; value = -999;}
3466  
3467    value = applyFunction(function, value);
3468  
3469    return value;
3470   }
3471  
3472 + //!trigobj valueLookup
3473 + double
3474 + OSUAnalysis::valueLookup (const BNtrigobj* object, string variable, string function, string &stringValue){
3475 +
3476 +  double value = 0.0;
3477 +
3478 +  if(variable == "pt") value = object->pt;
3479 +  else if(variable == "eta") value = object->eta;
3480 +  else if(variable == "phi") value = object->phi;
3481 +  else if(variable == "px") value = object->px;
3482 +  else if(variable == "py") value = object->py;
3483 +  else if(variable == "pz") value = object->pz;
3484 +  else if(variable == "et") value = object->et;
3485 +  else if(variable == "energy") value = object->energy;
3486 +  else if(variable == "etTotal") value = object->etTotal;
3487 +  else if(variable == "id") value = object->id;
3488 +  else if(variable == "charge") value = object->charge;
3489 +  else if(variable == "isIsolated") value = object->isIsolated;
3490 +  else if(variable == "isMip") value = object->isMip;
3491 +  else if(variable == "isForward") value = object->isForward;
3492 +  else if(variable == "isRPC") value = object->isRPC;
3493 +  else if(variable == "bx") value = object->bx;
3494 +  else if(variable == "filter") {
3495 +    if ((stringValue = object->filter) == "")
3496 +      stringValue = "none";  // stringValue should only be empty if value is filled
3497 +  }
3498 +
3499 +  else{clog << "WARNING: invalid trigobj variable '" << variable << "'\n"; value = -999;}
3500 +
3501 +  value = applyFunction(function, value);
3502 +
3503 +  return value;
3504 + }
3505  
3506 + //!muon-muon pair valueLookup
3507   double
3508 < OSUAnalysis::valueLookup (const BNmuon* object1, const BNmuon* object2, string variable, string function){
3508 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNmuon* object2, string variable, string function, string &stringValue){
3509  
3510    double value = 0.0;
3511  
# Line 2581 | Line 3567 | OSUAnalysis::valueLookup (const BNmuon*
3567        value = object2->correctedD0;
3568      }
3569  
3570 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3570 >  else{clog << "WARNING: invalid muon-muon pair variable '" << variable << "'\n"; value = -999;}
3571  
3572    value = applyFunction(function, value);
3573  
3574    return value;
3575 < }
3575 > } // end muon-muon pair valueLookup
3576 >
3577 >
3578 > //!muon-photon pair valueLookup
3579 > double
3580 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNphoton* object2, string variable, string function, string &stringValue){
3581 >
3582 >  double value = 0.0;
3583 >
3584 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3585 >  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3586 >  else if(variable == "photonEta") value = object2->eta;
3587 >  else if(variable == "photonPt") value = object2->pt;
3588 >  else if(variable == "muonEta") value = object1->eta;
3589 >  else if(variable == "photonPhi") value = object2->phi;
3590 >  else if(variable == "muonPhi") value = object1->phi;
3591 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3592 >  else if(variable == "photonGenMotherId") value = object2->genMotherId;
3593 >  else if(variable == "muonRelPFdBetaIso") value = (object1->pfIsoR04SumChargedHadronPt + max(0.0, object1->pfIsoR04SumNeutralHadronEt + object1->pfIsoR04SumPhotonEt - 0.5*object1->pfIsoR04SumPUPt)) / object1->pt;
3594 >  else if(variable == "invMass"){
3595 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3596 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3597 >    value = (fourVector1 + fourVector2).M();
3598 >  }
3599 >  else if(variable == "pt"){
3600 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3601 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3602 >    value = (fourVector1 + fourVector2).Pt();
3603 >  }
3604 >  else if(variable == "threeDAngle")
3605 >    {
3606 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3607 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3608 >      value = (threeVector1.Angle(threeVector2));
3609 >    }
3610 >  else if(variable == "alpha")
3611 >    {
3612 >      static const double pi = 3.1415926535897932384626433832795028841971693993751058;
3613 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3614 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3615 >      value = (pi-threeVector1.Angle(threeVector2));
3616 >    }
3617 >  else{clog << "WARNING: invalid muon-photon pair variable '" << variable << "'\n"; value = -999;}
3618 >
3619 >  value = applyFunction(function, value);
3620 >
3621 >  return value;
3622 > } // end muon-photon pair valueLookup
3623 >
3624  
3625 + //!electron-photon pair valueLookup
3626   double
3627 < OSUAnalysis::valueLookup (const BNelectron* object1, const BNelectron* object2, string variable, string function){
3627 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNphoton* object2, string variable, string function, string &stringValue){
3628 >
3629 >  double value = 0.0;
3630 >
3631 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3632 >  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3633 >  else if(variable == "photonEta") value = object2->eta;
3634 >  else if(variable == "photonPt") value = object2->pt;
3635 >  else if(variable == "electronEta") value = object1->eta;
3636 >  else if(variable == "photonPhi") value = object2->phi;
3637 >  else if(variable == "electronPhi") value = object1->phi;
3638 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3639 >  else if(variable == "photonGenMotherId") value = object2->genMotherId;
3640 >  else if(variable == "electronRelPFrhoIso") value = ( object1->chargedHadronIsoDR03 + max(0.0, object1->neutralHadronIsoDR03 + object1->photonIsoDR03 - object1->AEffDr03*object1->rhoPrime) ) / object1->pt;
3641 >  else if(variable == "invMass"){
3642 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3643 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3644 >    value = (fourVector1 + fourVector2).M();
3645 >  }
3646 >  else if(variable == "pt"){
3647 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3648 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3649 >    value = (fourVector1 + fourVector2).Pt();
3650 >  }
3651 >  else if(variable == "threeDAngle")
3652 >    {
3653 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3654 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3655 >      value = (threeVector1.Angle(threeVector2));
3656 >    }
3657 >  else if(variable == "alpha")
3658 >    {
3659 >      static const double pi = 3.1415926535897932384626433832795028841971693993751058;
3660 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3661 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3662 >      value = (pi-threeVector1.Angle(threeVector2));
3663 >    }
3664 >  else{clog << "WARNING: invalid electron-photon pair variable '" << variable << "'\n"; value = -999;}
3665 >
3666 >  value = applyFunction(function, value);
3667 >
3668 >  return value;
3669 > } // end electron-photon pair valueLookup
3670 >
3671 >
3672 > //!electron-electron pair valueLookup
3673 > double
3674 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNelectron* object2, string variable, string function, string &stringValue){
3675  
3676    double value = 0.0;
3677  
# Line 2636 | Line 3718 | OSUAnalysis::valueLookup (const BNelectr
3718      value = object2->correctedD0;
3719    }
3720  
3721 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3721 >  else{clog << "WARNING: invalid electron-electron pair variable '" << variable << "'\n"; value = -999;}
3722  
3723    value = applyFunction(function, value);
3724  
3725    return value;
3726 < }
3726 > } // end electron-electron pair valueLookup
3727 >
3728  
3729 + //!electron-muon pair valueLookup
3730   double
3731 < OSUAnalysis::valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function){
3731 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function, string &stringValue){
3732  
3733    double value = 0.0;
3734  
# Line 2702 | Line 3786 | OSUAnalysis::valueLookup (const BNelectr
3786    else if(variable == "muonRelPFdBetaIso"){
3787      value = (object2->pfIsoR04SumChargedHadronPt + max(0.0, object2->pfIsoR04SumNeutralHadronEt + object2->pfIsoR04SumPhotonEt - 0.5*object2->pfIsoR04SumPUPt)) / object2->pt;
3788    }
3789 +  else{clog << "WARNING: invalid electron-muon pair variable '" << variable << "'\n"; value = -999;}
3790 +  value = applyFunction(function, value);
3791 +
3792 +  return value;
3793 + } // end electron-muon pair valueLookup
3794 +
3795 +
3796 + //!electron-jet pair valueLookup
3797 + double
3798 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNjet* object2, string variable, string function, string &stringValue){
3799  
3800 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3800 >  double value = 0.0;
3801  
3802 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3803 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3804 +  else if(variable == "jetEta") value = object2->eta;
3805 +  else if(variable == "jetPhi") value = object2->phi;
3806 +  else if(variable == "electronEta") value = object1->eta;
3807 +  else if(variable == "electronPhi") value = object1->phi;
3808 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3809 +  else if(variable == "invMass"){
3810 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3811 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3812 +    value = (fourVector1 + fourVector2).M();
3813 +  }
3814 +  else if(variable == "pt"){
3815 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3816 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3817 +    value = (fourVector1 + fourVector2).Pt();
3818 +  }
3819 +  else if(variable == "threeDAngle")
3820 +    {
3821 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3822 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3823 +      value = (threeVector1.Angle(threeVector2));
3824 +    }
3825 +  else if(variable == "chargeProduct"){
3826 +    value = object1->charge*object2->charge;
3827 +  }
3828 +
3829 +  else{clog << "WARNING: invalid electron-jet pair variable '" << variable << "'\n"; value = -999;}
3830    value = applyFunction(function, value);
3831  
3832    return value;
3833   }
3834  
3835 + //!electron-mcparticle pair valueLookup
3836 + double
3837 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNmcparticle* object2, string variable, string function, string &stringValue){
3838 +
3839 +  double value = 0.0;
3840  
3841 < 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));  
3841 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3842    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3843 <  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);    
3844 <  else if(variable == "invMass"){        
3845 <    fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, electronMass);    
3846 <    fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, electronMass );    
3847 <        
3848 <    value = (fourVector1 + fourVector2).M();    
3843 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3844 >  else if(variable == "threeDAngle")
3845 >    {
3846 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3847 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3848 >      value = (threeVector1.Angle(threeVector2));
3849 >    }
3850 >  else if(variable == "chargeProduct"){
3851 >    value = object1->charge*object2->charge;
3852    }
3853 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}  
3854 <  value = applyFunction(function, value);        
3855 <  return value;  
3853 >
3854 >  else{clog << "WARNING: invalid electron-mcparticle variable '" << variable << "'\n"; value = -999;}
3855 >  value = applyFunction(function, value);
3856 >
3857 >  return value;
3858   }
3859  
3860  
3861 + //!photon-jet pair valueLookup
3862 + double
3863 + OSUAnalysis::valueLookup (const BNphoton* object1, const BNjet* object2, string variable, string function, string &stringValue){
3864 +
3865 +  double value = 0.0;
3866 +
3867 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3868 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3869 +  else if(variable == "jetEta") value = object2->eta;
3870 +  else if(variable == "jetPhi") value = object2->phi;
3871 +  else if(variable == "photonEta") value = object1->eta;
3872 +  else if(variable == "photonPhi") value = object1->phi;
3873 +  else if(variable == "photonGenMotherId") value = object1->genMotherId;
3874 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3875 +  else if(variable == "invMass"){
3876 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3877 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3878 +    value = (fourVector1 + fourVector2).M();
3879 +  }
3880 +  else if(variable == "pt"){
3881 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3882 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3883 +    value = (fourVector1 + fourVector2).Pt();
3884 +  }
3885 +  else if(variable == "threeDAngle")
3886 +    {
3887 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3888 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3889 +      value = (threeVector1.Angle(threeVector2));
3890 +    }
3891 +  else{clog << "WARNING: invalid photon-jet pair variable '" << variable << "'\n"; value = -999;}
3892 +  value = applyFunction(function, value);
3893  
3894 +  return value;
3895 + }
3896 +
3897 + // track-jet pair valueLookup
3898   double
3899 < OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrack* object2, string variable, string function){
3900 <  double pionMass = 0.140;
3901 <  double muonMass = 0.106;
3899 > OSUAnalysis::valueLookup (const BNtrack* object1, const BNjet* object2, string variable, string function, string &stringValue){
3900 >
3901 >  double value = 0.0;
3902 >
3903 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3904 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3905 >
3906 >  else{clog << "WARNING: invalid track-jet pair variable '" << variable << "'\n"; value = -999;}
3907 >  value = applyFunction(function, value);
3908 >
3909 >  return value;
3910 >
3911 > }
3912 >
3913 >
3914 >
3915 > // met-jet pair valueLookup
3916 > double
3917 > OSUAnalysis::valueLookup (const BNmet* object1, const BNjet* object2, string variable, string function, string &stringValue){
3918 >
3919 >  double value = 0.0;
3920 >
3921 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3922 >
3923 >  else{clog << "WARNING: invalid met-jet pair variable '" << variable << "'\n"; value = -999;}
3924 >  value = applyFunction(function, value);
3925 >
3926 >  return value;
3927 >
3928 > }  
3929 >
3930 >
3931 >
3932 > //!muon-jet pair valueLookup
3933 > double
3934 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNjet* object2, string variable, string function, string &stringValue){
3935 >
3936 >  double value = 0.0;
3937 >
3938 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3939 >  else if(variable == "jetEta") value = object2->eta;
3940 >  else if(variable == "relPFdBetaIso") value = (object1->pfIsoR04SumChargedHadronPt + max(0.0, object1->pfIsoR04SumNeutralHadronEt + object1->pfIsoR04SumPhotonEt - 0.5*object1->pfIsoR04SumPUPt)) / object1->pt;
3941 >  else if(variable == "jetPt") value = object2->pt;
3942 >  else if(variable == "jetPhi") value = object2->phi;
3943 >  else if(variable == "deltaPt") value = object1->pt - object2->pt;
3944 >  else if(variable == "muonEta") value = object1->eta;
3945 >  else if(variable == "muonPt") value = object1->pt;
3946 >  else if(variable == "muonPhi") value = object1->phi;
3947 >  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);          
3948 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3949 >  else if(variable == "invMass"){
3950 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3951 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3952 >    value = (fourVector1 + fourVector2).M();
3953 >  }
3954 >  else if(variable == "pt"){
3955 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3956 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3957 >    value = (fourVector1 + fourVector2).Pt();
3958 >  }
3959 >  else if(variable == "threeDAngle")
3960 >    {
3961 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3962 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3963 >      value = (threeVector1.Angle(threeVector2));
3964 >    }
3965 >  else if(variable == "chargeProduct"){
3966 >    value = object1->charge*object2->charge;
3967 >  }
3968 >
3969 >  else{clog << "WARNING: invalid muon-jet pair variable '" << variable << "'\n"; value = -999;}
3970 >  value = applyFunction(function, value);
3971 >
3972 >  return value;
3973 > } // end muon-jet pair valueLookup
3974 >
3975 >
3976 > //!muon-event valueLookup
3977 > double
3978 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNevent* object2, string variable, string function, string &stringValue){
3979 >
3980 >  double value = 0.0;
3981 >
3982 >  if(variable == "muonEta") value = object1->eta;
3983 >  else if(variable == "muonPt") value = object1->pt;
3984 >  else if(variable == "muonPhi") value = object1->phi;
3985 >  else if(variable == "Ht") value = getHt(jets.product());
3986 >  else if(variable == "pthat")   value = object2->pthat;
3987 >  else if(variable == "relPFdBetaIso") value = (object1->pfIsoR04SumChargedHadronPt + max(0.0, object1->pfIsoR04SumNeutralHadronEt + object1->pfIsoR04SumPhotonEt - 0.5*object1->pfIsoR04SumPUPt)) / object1->pt;
3988 >  else{clog << "WARNING: invalid muon-event pair variable '" << variable << "'\n"; value = -999;}
3989 >  value = applyFunction(function, value);
3990 >
3991 >  return value;
3992 > }
3993 > //!jet-jet pair valueLookup
3994 > double
3995 > OSUAnalysis::valueLookup (const BNjet* object1, const BNjet* object2, string variable, string function, string &stringValue){
3996 >
3997 >  double value = 0.0;
3998 >
3999 >  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4000 >  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4001 >  else if(variable == "deltaPt") value = object1->pt - object2->pt;
4002 >  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4003 >  else if(variable == "invMass"){
4004 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
4005 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
4006 >    value = (fourVector1 + fourVector2).M();
4007 >  }
4008 >  else if(variable == "pt"){
4009 >    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
4010 >    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
4011 >    value = (fourVector1 + fourVector2).Pt();
4012 >  }
4013 >  else if(variable == "threeDAngle")
4014 >    {
4015 >      TVector3 threeVector1(object1->px, object1->py, object1->pz);
4016 >      TVector3 threeVector2(object2->px, object2->py, object2->pz);
4017 >      value = (threeVector1.Angle(threeVector2));
4018 >    }
4019 >  else if(variable == "chargeProduct"){
4020 >    value = object1->charge*object2->charge;
4021 >  }
4022 >
4023 >  else{clog << "WARNING: invalid jet-jet pair variable '" << variable << "'\n"; value = -999;}
4024 >  value = applyFunction(function, value);
4025 >
4026 >  return value;
4027 > }
4028 >
4029 > //!electron-track pair valueLookup
4030 > double
4031 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrack* object2, string variable, string function, string &stringValue){
4032 >  double electronMass = 0.000511;
4033    double value = 0.0;
4034    TLorentzVector fourVector1(0, 0, 0, 0);
4035    TLorentzVector fourVector2(0, 0, 0, 0);
4036    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4037    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4038    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4039 +  else if(variable == "deltaRLooseMvaId") {
4040 +    // only consider electrons that pass "loose MVA id", i.e., mvaNonTrigV0 > 0;
4041 +    // otherwise return very large value (99)  
4042 +    if (object1->mvaNonTrigV0>0) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4043 +    else                         value = 99.;  
4044 +  }
4045    else if(variable == "invMass"){
4046 +    fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, electronMass);
4047 +    fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, electronMass );
4048 +
4049 +    value = (fourVector1 + fourVector2).M();
4050 +  }
4051 +  else if(variable == "chargeProduct"){
4052 +    value = object1->charge*object2->charge;
4053 +  }
4054 +  else{clog << "WARNING: invalid electron-track pair variable '" << variable << "'\n"; value = -999;}
4055 +  value = applyFunction(function, value);
4056 +  return value;
4057 +
4058 + }
4059 +
4060 +
4061 + //!muon-track pair valueLookup
4062 + double
4063 + OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrack* object2, string variable, string function, string &stringValue){
4064 +  double value = 0.0;
4065 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4066 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4067 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4068 +  else if(variable == "deltaRLooseID") {
4069 +    // only consider muons that pass looseId criteria; otherwise return very large value (99.)  
4070 +    string empty = "";  
4071 +    double isLooseId = valueLookup(object1, "looseID", "", empty);    
4072 +    if (isLooseId) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4073 +    else           value = 99.;  
4074 +  }
4075 +  else if(variable == "deltaRGlobalMuon") {
4076 +    // only consider muons that pass looseId criteria; otherwise return very large value (99.)  
4077 +    if (object1->isGlobalMuon) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4078 +    else                       value = 99.;  
4079 +  }
4080 +  else if(variable == "invMass"){
4081 +    double pionMass = 0.140;
4082 +    double muonMass = 0.106;
4083 +    TLorentzVector fourVector1(0, 0, 0, 0);
4084 +    TLorentzVector fourVector2(0, 0, 0, 0);
4085      fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, muonMass);
4086      fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, pionMass );
2749
4087      value = (fourVector1 + fourVector2).M();
4088    }
4089 +  else if(variable == "chargeProduct"){
4090 +    value = object1->charge*object2->charge;
4091 +  }
4092  
4093 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4093 >  else{clog << "WARNING: invalid muon-track pair variable '" << variable << "'\n"; value = -999;}
4094    value = applyFunction(function, value);
4095    return value;
4096   }
4097  
4098 <
4098 > //!tau-tau pair valueLookup
4099   double
4100 < OSUAnalysis::valueLookup (const BNtau* object1, const BNtau* object2, string variable, string function){
4100 > OSUAnalysis::valueLookup (const BNtau* object1, const BNtau* object2, string variable, string function, string &stringValue){
4101    double value = 0.0;
4102    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4103    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
# Line 2768 | Line 4108 | OSUAnalysis::valueLookup (const BNtau* o
4108      value = (fourVector1 + fourVector2).M();
4109    }
4110  
4111 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4111 >  else if(variable == "chargeProduct"){
4112 >    value = object1->charge*object2->charge;
4113 >  }
4114 >
4115 >  else{clog << "WARNING: invalid tau-tau pair variable '" << variable << "'\n"; value = -999;}
4116    value = applyFunction(function, value);
4117    return value;
4118   }
4119  
4120 <
4120 > //!muon-tau pair valueLookup
4121   double
4122 < OSUAnalysis::valueLookup (const BNmuon* object1, const BNtau* object2, string variable, string function){
4122 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNtau* object2, string variable, string function, string &stringValue){
4123    double value = 0.0;
4124    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4125    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
# Line 2786 | Line 4130 | OSUAnalysis::valueLookup (const BNmuon*
4130      value = (fourVector1 + fourVector2).M();
4131    }
4132  
4133 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4133 >  else if(variable == "chargeProduct"){
4134 >    value = object1->charge*object2->charge;
4135 >  }
4136 >
4137 >  else{clog << "WARNING: invalid muon-tau pair variable '" << variable << "'\n"; value = -999;}
4138    value = applyFunction(function, value);
4139    return value;
4140   }
4141  
4142 + //!tau-track pair valueLookup
4143   double
4144 < OSUAnalysis::valueLookup (const BNtau* object1, const BNtrack* object2, string variable, string function){
4144 > OSUAnalysis::valueLookup (const BNtau* object1, const BNtrack* object2, string variable, string function, string &stringValue){
4145    double value = 0.0;
4146    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4147    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4148 +  else if(variable == "deltaRLooseHadronicID") {
4149 +    // only consider tau's that pass the loose hadronic ID criteria; otherwise return very large value (99)  
4150 +    string empty = "";  
4151 +    double isLooseHadronicID = valueLookup(object1, "looseHadronicID", "", empty);    
4152 +  
4153 +    if (isLooseHadronicID) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4154 +    else                   value = 99.;  
4155 +  }
4156 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4157 +  else if(variable == "invMass"){
4158 +    double tauMass = 1.777;  // PDG 2010
4159 +    double pionMass = 0.140; // PDG 2010  
4160 +    TLorentzVector fourVector1(0, 0, 0, 0);
4161 +    TLorentzVector fourVector2(0, 0, 0, 0);
4162 +    fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, tauMass);
4163 +    fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, pionMass );
4164 +    value = (fourVector1 + fourVector2).M();
4165 +  }
4166 +  else if(variable == "chargeProduct"){
4167 +    value = object1->charge*object2->charge;
4168 +  }
4169  
4170 <  else{std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
4170 >  else{clog << "WARNING: invalid tau-track pair variable '" << variable << "'\n"; value = -999;}
4171    value = applyFunction(function, value);
4172    return value;
4173   }
4174  
4175  
4176 <
4176 > //!track-event pair valueLookup
4177   double
4178 < OSUAnalysis::valueLookup (const BNtrack* object1, const BNevent* object2, string variable, string function){
4178 > OSUAnalysis::valueLookup (const BNtrack* object1, const BNevent* object2, string variable, string function, string &stringValue){
4179  
4180    double value = 0.0;
4181    double pMag = sqrt(object1->pt * object1->pt +
4182 <                     object1->pz * object1->pz);  
4182 >                     object1->pz * object1->pz);
4183  
4184    if      (variable == "numPV")                      value = object2->numPV;
4185    else if (variable == "caloTotDeltaRp5")            value =  (object1->caloHadDeltaRp5 + object1->caloEMDeltaRp5);
4186    else if (variable == "caloTotDeltaRp5ByP")         value = ((object1->caloHadDeltaRp5 + object1->caloEMDeltaRp5)/pMag);
4187 <  else if (variable == "caloTotDeltaRp5_RhoCorr")    value = getTrkCaloTotRhoCorr(object1);  
4188 <  else if (variable == "caloTotDeltaRp5ByP_RhoCorr") value = getTrkCaloTotRhoCorr(object1) / pMag;  
4187 >  else if (variable == "caloTotDeltaRp5_RhoCorr")    value = getTrkCaloTotRhoCorr(object1);
4188 >  else if (variable == "caloTotDeltaRp5ByP_RhoCorr") value = getTrkCaloTotRhoCorr(object1) / pMag;
4189  
4190 <  else { std::cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999; }
4190 >  else { clog << "WARNING: invalid track-event pair variable '" << variable << "'\n"; value = -999; }
4191  
4192    value = applyFunction(function, value);
4193  
4194    return value;
4195  
4196 < }  
4196 > }
4197 >
4198 > //!electron-trigobj pair valueLookup
4199 > double
4200 > OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrigobj* object2, string variable, string function, string &stringValue){
4201 >
4202 >  double value = 0.0;
4203 >
4204 >  if (variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4205 >  else if (variable == "match"){
4206 >    if (deltaR(object1->eta,object1->phi,object2->eta,object2->phi) < 0.2 && abs(object2->id) == 11)
4207 >      stringValue = object2->filter;
4208 >    else
4209 >      stringValue = "none";
4210 >  }
4211 >
4212 >  else { clog << "WARNING: invalid electron-trigobj variable '" << variable << "'\n"; value = -999; }
4213 >
4214 >  value = applyFunction(function, value);
4215 >
4216 >  return value;
4217 >
4218 > }
4219 >
4220 > //!muon-trigobj pair valueLookup
4221 > double
4222 > OSUAnalysis::valueLookup (const BNmuon* object1, const BNtrigobj* object2, string variable, string function, string &stringValue){
4223 >
4224 >  double value = 0.0;
4225 >
4226 >  if (variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4227 >
4228 >  else { clog << "WARNING: invalid muon-trigobj variable '" << variable << "'\n"; value = -999; }
4229 >
4230 >  value = applyFunction(function, value);
4231 >
4232 >  return value;
4233 >
4234 > }
4235 >
4236 > //!stop valueLookup
4237 > double
4238 > OSUAnalysis::valueLookup (const BNstop* object, string variable, string function, string &stringValue){
4239 >
4240 >
4241 >  double value = 0.0;
4242 >
4243 >  if(variable == "ctau") value = object->ctau;
4244 >
4245 >  else if (variable == "d0"){
4246 >    double vx = object->vx - chosenVertex ()->x,
4247 >      vy = object->vy - chosenVertex ()->y,
4248 >      px = object->px,
4249 >      py = object->py,
4250 >      pt = object->pt;
4251 >    value = (-vx * py + vy * px) / pt;
4252 >  }
4253 >
4254 >  else if (variable == "dz"){
4255 >    double vx = object->vx - chosenVertex ()->x,
4256 >      vy = object->vy - chosenVertex ()->y,
4257 >      vz = object->vz - chosenVertex ()->z,
4258 >      px = object->px,
4259 >      py = object->py,
4260 >      pz = object->pz,
4261 >      pt = object->pt;
4262 >    value = vz - (vx * px + vy * py)/pt * (pz/pt);
4263 >  }
4264 >
4265 >  else if (variable == "minD0"){
4266 >    double minD0=999;
4267 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
4268 >      double vx = object->vx - vertex->x,
4269 >        vy = object->vy - vertex->y,
4270 >        px = object->px,
4271 >        py = object->py,
4272 >        pt = object->pt;
4273 >      value = (-vx * py + vy * px) / pt;
4274 >      if(abs(value) < abs(minD0)) minD0 = value;
4275 >    }
4276 >    value = minD0;
4277 >  }
4278 >  else if (variable == "minDz"){
4279 >    double minDz=999;
4280 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
4281 >      double vx = object->vx - vertex->x,
4282 >        vy = object->vy - vertex->y,
4283 >        vz = object->vz - vertex->z,
4284 >        px = object->px,
4285 >        py = object->py,
4286 >        pz = object->pz,
4287 >        pt = object->pt;
4288 >      value = vz - (vx * px + vy * py)/pt * (pz/pt);
4289 >      if(abs(value) < abs(minDz)) minDz = value;
4290 >    }
4291 >    value = minDz;
4292 >  }
4293 >  else if(variable == "distToVertex"){
4294 >    value = sqrt((object->vx-chosenVertex()->x)*(object->vx-chosenVertex()->x) + \
4295 >                 (object->vy-chosenVertex()->y)*(object->vy-chosenVertex()->y) + \
4296 >                 (object->vz-chosenVertex()->z)*(object->vz-chosenVertex()->z));
4297 >  }
4298 >  else if (variable == "minDistToVertex"){
4299 >    double minDistToVertex=999;
4300 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
4301 >      value = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
4302 >                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
4303 >                   (object->vz-vertex->z)*(object->vz-vertex->z));
4304 >
4305 >      if(abs(value) < abs(minDistToVertex)) minDistToVertex = value;
4306 >    }
4307 >    value = minDistToVertex;
4308 >  }
4309 >  else if (variable == "distToVertexDifference"){
4310 >    double minDistToVertex=999;
4311 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
4312 >      value = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
4313 >                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
4314 >                   (object->vz-vertex->z)*(object->vz-vertex->z));
4315 >
4316 >      if(abs(value) < abs(minDistToVertex)) minDistToVertex = value;
4317 >    }
4318 >    double distToChosenVertex = sqrt((object->vx-chosenVertex()->x)*(object->vx-chosenVertex()->x) + \
4319 >                                     (object->vy-chosenVertex()->y)*(object->vy-chosenVertex()->y) + \
4320 >                                     (object->vz-chosenVertex()->z)*(object->vz-chosenVertex()->z));
4321 >
4322 >    value = distToChosenVertex - minDistToVertex;
4323 >  }
4324 >
4325 >  else if (variable == "closestVertexRank"){
4326 >    double minDistToVertex=999;
4327 >    int vertex_rank = 0;
4328 >    for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
4329 >      vertex_rank++;
4330 >      int dist = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
4331 >                      (object->vy-vertex->y)*(object->vy-vertex->y) + \
4332 >                      (object->vz-vertex->z)*(object->vz-vertex->z));
4333 >
4334 >      if(abs(dist) < abs(minDistToVertex)){
4335 >        value = vertex_rank;
4336 >        minDistToVertex = dist;
4337 >      }
4338 >    }
4339 >  }
4340 >
4341 >  else if (variable == "decaysToTau"){
4342 >    value = abs (object->daughter0Id) == 15 || abs (object->daughter1Id) == 15;
4343 >  }
4344 >
4345 >
4346 >
4347 >
4348 >  else { clog << "WARNING: invalid stop variable '" << variable << "'\n"; value = -999; }
4349 >
4350 >  value = applyFunction(function, value);
4351 >
4352 >  return value;
4353 >
4354 > } // end stop valueLookup
4355 >
4356 >
4357 >
4358 >
4359  
4360   // Calculate the number of tracks in cone of DeltaR<0.5 around track1.
4361   // Return true iff no other tracks are found in this cone.
# Line 2838 | Line 4370 | OSUAnalysis::getTrkIsIso (const BNtrack*
4370  
4371   }
4372  
4373 + //calculate the scalar sum of Jet Pt in the event.
4374 + double
4375 + OSUAnalysis::getHt (const BNjetCollection* jetColl){
4376 +  double Ht = 0;
4377 +  for(BNjetCollection::const_iterator jet = jetColl->begin(); jet !=jetColl->end(); jet++){
4378 +    Ht += abs(jet->pt);
4379 +  }
4380 +  return Ht;
4381 + }
4382  
4383   double
4384   OSUAnalysis::getTrkPtRes (const BNtrack* track1){
# Line 2872 | Line 4413 | OSUAnalysis::getTrkPtTrue (const BNtrack
4413  
4414   double
4415   OSUAnalysis::getTrkCaloTotRhoCorr(const BNtrack* track) {
4416 <  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.  
4417 <  if (!useTrackCaloRhoCorr_) return -99;  
4418 <  // if (!rhokt6CaloJetsHandle_) {
4419 <  //   cout << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;  
4420 <  //   return -99;  
4416 >  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.
4417 >  if (!useTrackCaloRhoCorr_) return -99;
4418 >  // if (!rhokt6CaloJetsHandle_) {
4419 >  //   clog << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;
4420 >  //   return -99;
4421    // }
4422 <  double radDeltaRCone = 0.5;  
4423 <  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  // Define effective area as pi*r^2, where r is radius of DeltaR cone.  
4424 <  double rawCaloTot = track->caloHadDeltaRp5 + track->caloEMDeltaRp5;  
4425 <  double caloTotRhoCorrCalo = TMath::Max(0., rawCaloTot - rhoCorr_kt6CaloJets);  
4426 <  return caloTotRhoCorrCalo;  
4427 <
4422 >  double radDeltaRCone = 0.5;
4423 >  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  // Define effective area as pi*r^2, where r is radius of DeltaR cone.
4424 >  double rawCaloTot = track->caloHadDeltaRp5 + track->caloEMDeltaRp5;
4425 >  double caloTotRhoCorrCalo = TMath::Max(0., rawCaloTot - rhoCorr_kt6CaloJets);
4426 >  return caloTotRhoCorrCalo;
4427 >
4428 > }
4429 >
4430 > double
4431 > OSUAnalysis::getTrkDepTrkRp5RhoCorr(const BNtrack* track) {
4432 >  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.              
4433 >  if (!useTrackCaloRhoCorr_) return -99;
4434 >  // if (!rhokt6CaloJetsHandle_) {                                                                                                    
4435 >  //   clog << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;                        
4436 >  //   return -99;                                                                                                                    
4437 >  // }                                                                                                                                
4438 >  double radDeltaRCone = 0.5;
4439 >  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  // Define effective area as pi*r^2, where r is radius of DeltaR cone.                                                                                                          
4440 >  double rawDepTrkRp5 = track->depTrkRp5;
4441 > double depTrkRp5RhoCorr = TMath::Max(0., rawDepTrkRp5 - rhoCorr_kt6CaloJets);
4442 > return depTrkRp5RhoCorr;
4443 >
4444 > }
4445 >
4446 > double
4447 > OSUAnalysis::getTrkDepTrkRp3RhoCorr(const BNtrack* track) {
4448 >  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.                                                
4449 >  if (!useTrackCaloRhoCorr_) return -99;
4450 >  // if (!rhokt6CaloJetsHandle_) {                                                                                                                                      
4451 >  //   clog << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;                                                          
4452 >  //   return -99;                                                                                                                                                      
4453 >  // }                                                                                                                                                                  
4454 >  double radDeltaRCone = 0.3;
4455 > // Define effective area as pi*r^2, where r is radius of DeltaR cone
4456 >  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  
4457 >  double rawDepTrkRp3 = track->depTrkRp3;
4458 >  double depTrkRp3RhoCorr = TMath::Max(0., rawDepTrkRp3 - rhoCorr_kt6CaloJets);
4459 >  return depTrkRp3RhoCorr;
4460 >  
4461   }
4462  
4463  
# Line 2897 | Line 4471 | OSUAnalysis::WriteDeadEcal (){
4471    double etaEcal, phiEcal;
4472    ifstream DeadEcalFile(deadEcalFile_);
4473    if(!DeadEcalFile) {
4474 <    cout << "Error: DeadEcalFile has not been found." << endl;
4474 >    clog << "Error: DeadEcalFile has not been found." << endl;
4475      return;
4476    }
4477    if(DeadEcalVec.size()!= 0){
4478 <    cout << "Error: DeadEcalVec has a nonzero size" << endl;
4478 >    clog << "Error: DeadEcalVec has a nonzero size" << endl;
4479      return;
4480    }
4481    while(!DeadEcalFile.eof())
# Line 2912 | Line 4486 | OSUAnalysis::WriteDeadEcal (){
4486        newChan.phiEcal = phiEcal;
4487        DeadEcalVec.push_back(newChan);
4488      }
4489 <  if(DeadEcalVec.size() == 0) cout << "Warning: No dead Ecal channels have been found." << endl;
4489 >  if(DeadEcalVec.size() == 0) clog << "Warning: No dead Ecal channels have been found." << endl;
4490   }
4491  
4492   //if a track is found within dR<0.05 of a dead Ecal channel value = 1, otherwise value = 0
# Line 2921 | Line 4495 | OSUAnalysis::getTrkIsMatchedDeadEcal (co
4495    double deltaRLowest = 999;
4496    int value = 0;
4497    if (DeadEcalVec.size() == 0) WriteDeadEcal();
4498 <  for(std::vector<DeadEcal>::const_iterator ecal = DeadEcalVec.begin(); ecal != DeadEcalVec.end(); ++ecal){
4498 >  for(vector<DeadEcal>::const_iterator ecal = DeadEcalVec.begin(); ecal != DeadEcalVec.end(); ++ecal){
4499      double eta = ecal->etaEcal;
4500      double phi = ecal->phiEcal;
4501 <    double deltaRtemp = deltaR(eta, track1->eta, phi, track1->phi);
4501 >    double deltaRtemp = deltaR(eta, phi, track1->eta, track1->phi);
4502      if(deltaRtemp < deltaRLowest) deltaRLowest = deltaRtemp;
4503    }
4504    if (deltaRLowest<0.05) {value = 1;}
# Line 2932 | Line 4506 | OSUAnalysis::getTrkIsMatchedDeadEcal (co
4506    return value;
4507   }
4508  
4509 < // Returns the smallest DeltaR between the object and any generated true particle in the event.  
4509 > // Returns the smallest DeltaR between the object and any generated true particle in the event.
4510   template <class InputObject>
4511   double OSUAnalysis::getGenDeltaRLowest(InputObject object){
4512    double genDeltaRLowest = 999.;
# Line 2952 | Line 4526 | OSUAnalysis::applyFunction(string functi
4526    else if(function == "log") value = log10(value);
4527  
4528    else if(function == "") value = value;
4529 <  else{std::cout << "WARNING: invalid function '" << function << "'\n";}
4529 >  else{clog << "WARNING: invalid function '" << function << "'\n";}
4530  
4531    return value;
4532  
# Line 2961 | Line 4535 | OSUAnalysis::applyFunction(string functi
4535  
4536   template <class InputCollection>
4537   void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, InputCollection inputCollection, string inputType){
4538 <
4539 <  if (currentCut.inputCollection.find("pair")!=std::string::npos)  {
4540 <    string obj1, obj2;
4538 >
4539 >  if (verbose_>2) clog << "  Beginning setObjectFlags for cut " << currentCutIndex << ": " << currentCut.name
4540 >                       << ", inputType=" << inputType
4541 >                       << endl;  
4542 >  if (currentCut.inputCollection.find("pair")!=string::npos)  {
4543 >    string obj1, obj2;
4544      getTwoObjs(currentCut.inputCollection, obj1, obj2);
4545 +    if (verbose_>2) clog << "  Two object types:  " << obj1 << ", " << obj2 << endl;
4546      if (inputType==obj1 ||
4547 <        inputType==obj2) {
4547 >        inputType==obj2) {
4548        // Do not add a cut to individualFlags or cumulativeFlags, if the cut is on a paired collection,
4549 <      // and the inputType is a member of the pair.  
4550 <      // The cut will instead be applied when the setObjectFlags() is called for the paired collection.  
4551 <      // For example, if currentCut.inputCollection==electron-muon pairs,
4552 <      // then the flags should not be set here when inputType==muons or inputType==electrons.  
4553 <      return;
4554 <    }  
4555 <  }    
4549 >      // and the inputType is a member of the pair.
4550 >      // The cut will instead be applied when the setObjectFlags() is called for the paired collection.
4551 >      // For example, if currentCut.inputCollection==electron-muon pairs,
4552 >      // then the flags should not be set here when inputType==muons or inputType==electrons.
4553 >      return;
4554 >    }
4555 >  }
4556 >
4557 >  if (!inputCollection) cout << "ERROR:  invalid input collection for inputType=" << inputType << endl;  
4558 >
4559 >  if (verbose_>3) clog << "   Collection size:  " << inputCollection->size() << endl;
4560  
4561    for (uint object = 0; object != inputCollection->size(); object++){
4562  
4563 <    bool decision = true;//object passes if this cut doesn't cut on that type of object
4563 >    if (verbose_>4) clog << "    Setting flags for object " << object << endl;
4564 >
4565 >    bool cutDecision = true;//object passes if this cut doesn't cut on that type of object
4566 >    bool plotDecision = true;
4567  
4568      if(currentCut.inputCollection == inputType){
4569  
4570        vector<bool> subcutDecisions;
4571        for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
4572 <        double value = valueLookup(&inputCollection->at(object), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex));
4573 <        subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
4572 >        string stringValue = "";
4573 >        double value = valueLookup(&inputCollection->at(object), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex), stringValue);
4574 >        if (stringValue == "") subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
4575 >        else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
4576  
4577        }
4578 <      if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
4578 >      if(currentCut.numSubcuts == 1) cutDecision = subcutDecisions.at(0);
4579        else{
4580          bool tempDecision = true;
4581          for( int subcutIndex = 0;subcutIndex != currentCut.numSubcuts-1; subcutIndex++){
# Line 2997 | Line 4584 | void OSUAnalysis::setObjectFlags(cut &cu
4584            else if(currentCut.logicalOperators.at(subcutIndex) == "|"|| currentCut.logicalOperators.at(subcutIndex) == "||")
4585              tempDecision = subcutDecisions.at(subcutIndex) || subcutDecisions.at(subcutIndex+1);
4586          }
4587 <        decision = tempDecision;
4587 >        cutDecision = tempDecision;
4588        }
4589 +      //invert the cut if this cut is a veto
4590 +      if(currentCut.isVeto) cutDecision = !cutDecision;
4591 +      plotDecision = cutDecision;
4592      }
4593  
4594 <    individualFlags.at(inputType).at(currentCutIndex).push_back(decision);
4594 >    individualFlags.at(inputType).at(currentCutIndex).push_back(make_pair(cutDecision,plotDecision));
4595  
4596 <    //set flags for objects that pass each cut AND all the previous cuts
4597 <    bool previousCumulativeFlag = true;
4596 >    //set flags for objects that pass this cut AND all the previous cuts
4597 >    bool previousCumulativeCutFlag = true;
4598 >    for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4599 >      if(previousCumulativeCutFlag && individualFlags.at(inputType).at(previousCutIndex).at(object).first) previousCumulativeCutFlag = true;
4600 >      else{ previousCumulativeCutFlag = false; break;}
4601 >    }
4602 >    previousCumulativeCutFlag = previousCumulativeCutFlag && cutDecision;
4603 >    bool previousCumulativePlotFlag = true;
4604      for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4605 <      if(previousCumulativeFlag && individualFlags.at(inputType).at(previousCutIndex).at(object)) previousCumulativeFlag = true;
4606 <      else{ previousCumulativeFlag = false; break;}
4605 >      if(previousCumulativePlotFlag && individualFlags.at(inputType).at(previousCutIndex).at(object).second) previousCumulativePlotFlag = true;
4606 >      else{ previousCumulativePlotFlag = false; break;}
4607      }
4608 <    cumulativeFlags.at(inputType).at(currentCutIndex).push_back(previousCumulativeFlag && decision);
4608 >    previousCumulativePlotFlag = previousCumulativePlotFlag && plotDecision;
4609  
4610 <  }
4610 >    cumulativeFlags.at(inputType).at(currentCutIndex).push_back(make_pair(previousCumulativeCutFlag,previousCumulativePlotFlag));
4611  
4612 < }
4612 >  }  //   for (uint object = 0; object != inputCollection->size(); object++){
4613  
4614 + } // end void OSUAnalysis::setObjectFlags
4615  
3019 template <class InputCollection1, class InputCollection2>
3020 void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, \
3021                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, string inputType){
4616  
4617 + template <class InputCollection1, class InputCollection2>
4618 + void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags,
4619 +                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, string inputType){
4620 +  // This function sets the flags for the paired object collection.  
4621 +  // If the cut is applying on the given paired object collection, then the flags for the single object collections are also set.
4622 +  // If not, then the flags for the paired object collection are taken as the AND of the flags for each single object collection.  
4623 +
4624 +  if (verbose_>2) clog << "  Beginning setObjectFlags for cut=" << currentCut.name
4625 +                       << ", inputType=" << inputType
4626 +                       << endl;  
4627  
4628    bool sameObjects = false;
4629 <  if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
4629 >  if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;  // FIXME:  is sameObjects just the not of isTwoTypesOfObject?  If so, it's redundant.  
4630  
4631 <  // Get the strings for the two objects that make up the pair.  
4632 <  string obj1Type, obj2Type;
4631 >  // Get the strings for the two objects that make up the pair.
4632 >  string obj1Type, obj2Type;
4633    getTwoObjs(inputType, obj1Type, obj2Type);
4634    bool isTwoTypesOfObject = true;
4635 <  if (obj1Type==obj2Type) isTwoTypesOfObject = false;  
4635 >  if (obj1Type==obj2Type) isTwoTypesOfObject = false;
4636  
4637 <  // Initialize the flags for individual objects to all be false, if the cut is on the pair.  
4638 <  // Set them to true later, if any paired object passes (in which case both of its constituents should pass).  
4639 <  if (currentCut.inputCollection == inputType) {    
4637 >  // Initialize the flags for individual objects to all be false, if the cut is on the pair.
4638 >  // Set them to true later, if any paired object passes (in which case both of its constituents should pass).
4639 >  if (currentCut.inputCollection == inputType) {
4640      for (uint object1 = 0; object1 != inputCollection1->size(); object1++) {
4641 <      individualFlags.at(obj1Type).at(currentCutIndex).push_back(false);
4642 <      cumulativeFlags.at(obj1Type).at(currentCutIndex).push_back(false);
4641 >      individualFlags.at(obj1Type).at(currentCutIndex).push_back(make_pair(false,false));
4642 >      cumulativeFlags.at(obj1Type).at(currentCutIndex).push_back(make_pair(false,false));
4643      }
4644 <    if (isTwoTypesOfObject) { // Only initialize the second object if it is different from the first.  
4644 >    if (isTwoTypesOfObject) { // Only initialize the second object if it is different from the first.
4645        for (uint object2 = 0; object2 != inputCollection2->size(); object2++)  {
4646 <        individualFlags.at(obj2Type).at(currentCutIndex).push_back(false);
4647 <        cumulativeFlags.at(obj2Type).at(currentCutIndex).push_back(false);
4646 >        individualFlags.at(obj2Type).at(currentCutIndex).push_back(make_pair(false,false));
4647 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).push_back(make_pair(false,false));
4648        }
4649      }
4650    }
4651 <  
4651 >
4652    int counter = 0;
4653  
4654    for (uint object1 = 0; object1 != inputCollection1->size(); object1++){
# Line 3053 | Line 4657 | void OSUAnalysis::setObjectFlags(cut &cu
4657        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
4658  
4659  
4660 <      bool decision = true;//object passes if this cut doesn't cut on that type of object
4660 >      bool cutDecision  = true;//object passes if this cut doesn't cut on that type of object
4661 >      bool plotDecision = true;
4662  
4663 +      // Determine whether each pair passes the cut, only if inputCollection is the same as the inputType.  
4664        if(currentCut.inputCollection == inputType){
4665  
4666          vector<bool> subcutDecisions;
4667          for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
4668 <          double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex));
4669 <          subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
4668 >          string stringValue = "";
4669 >          double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex), stringValue);
4670 >          if (verbose_>1) clog << currentCut.variables.at(subcutIndex) << " = " << value
4671 >                               << endl;  
4672 >          if (stringValue == "") subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
4673 >          else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
4674          }
4675  
4676 <        if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
4676 >        if(currentCut.numSubcuts == 1) cutDecision = subcutDecisions.at(0);
4677          else{
4678            bool tempDecision = subcutDecisions.at(0);
4679            for( int subcutIndex = 1; subcutIndex < currentCut.numSubcuts; subcutIndex++){
# Line 3072 | Line 4682 | void OSUAnalysis::setObjectFlags(cut &cu
4682              else if(currentCut.logicalOperators.at(subcutIndex-1) == "|"|| currentCut.logicalOperators.at(subcutIndex-1) == "||")
4683                tempDecision = tempDecision || subcutDecisions.at(subcutIndex);
4684            }
4685 <          decision = tempDecision;
4685 >          cutDecision = tempDecision;
4686          }
4687 +        //invert the cut if this cut is a veto
4688 +        if (currentCut.isVeto) cutDecision = !cutDecision;
4689 +        plotDecision = cutDecision;
4690 +
4691 +        if (verbose_>1) clog << " cutDecision = " << cutDecision
4692 +                             << "; for currentCut.inputCollection = " << currentCut.inputCollection
4693 +                             << "; object1 (" << obj1Type << ") = " << object1
4694 +                             << "; object2 (" << obj2Type << ") = " << object2
4695 +                             << endl;  
4696 +        
4697 +        if (cutDecision) {  // only set the flags for the individual objects if the pair object is being cut on
4698 +          individualFlags.at(obj1Type).at(currentCutIndex).at(object1).first = true;
4699 +          individualFlags.at(obj2Type).at(currentCutIndex).at(object2).first = true;
4700 +        }
4701 +        if (plotDecision) {  // only set the flags for the individual objects if the pair object is being cut on
4702 +          individualFlags.at(obj1Type).at(currentCutIndex).at(object1).second = true;
4703 +          individualFlags.at(obj2Type).at(currentCutIndex).at(object2).second = true;
4704 +        }
4705 +        
4706 +
4707 +      } // if(currentCut.inputCollection == inputType){
4708 +
4709 +      // The individualFlags will be true if the inputCollection is not the same as the inputType.
4710 +      // They are also independent of the previous flags on the single objects.  
4711 +      individualFlags.at(inputType).at(currentCutIndex).push_back(make_pair(cutDecision,plotDecision));  
4712 +
4713 +
4714 +
4715 +      // ************************************
4716 +      // Determine cumulative flags
4717 +      // ************************************
4718 +      // determine whether this paired object passes this cut AND all previous cuts
4719 +      bool previousCumulativeCutFlag = true;
4720 +      for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4721 +        if(previousCumulativeCutFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter).first) previousCumulativeCutFlag = true;
4722 +        else{ previousCumulativeCutFlag = false; break;}
4723        }
4724 <      // if (decision) isPassObj1.at(object1) = true;
3079 <      // if (decision) isPassObj2.at(object2) = true;
3080 <      individualFlags.at(inputType).at(currentCutIndex).push_back(decision);  
3081 <      if (decision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on  
3082 <        individualFlags.at(obj1Type).at(currentCutIndex).at(object1) = true;  
3083 <        individualFlags.at(obj2Type).at(currentCutIndex).at(object2) = true;  
3084 <      }  
4724 >      previousCumulativeCutFlag = previousCumulativeCutFlag && cutDecision;
4725  
4726 <      //set flags for objects that pass each cut AND all the previous cuts
3087 <      bool previousCumulativeFlag = true;
4726 >      bool previousCumulativePlotFlag = true;
4727        for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4728 <        if(previousCumulativeFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter)) previousCumulativeFlag = true;
4729 <        else{ previousCumulativeFlag = false; break;}
4728 >        if(previousCumulativePlotFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter).second) previousCumulativePlotFlag = true;
4729 >        else{ previousCumulativePlotFlag = false; break;}
4730        }
4731 <      //apply flags for the components of the composite object as well
4732 <      bool currentCumulativeFlag = true;
4733 <      if(flags1.size() == 0 && flags2.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision;
4734 <      else if(flags1.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision && flags2.at(object2);
4735 <      else if(flags2.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1);
4736 <      else currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1) && flags2.at(object2);
4737 <      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(currentCumulativeFlag);
4738 <      if (currentCumulativeFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on  
4739 <        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1);  
4740 <        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2);  
4731 >      previousCumulativePlotFlag = previousCumulativePlotFlag && plotDecision;
4732 >      
4733 >      // Get the index for the flags of each of the single objects in the pair.  Usually this is the index of the previous cut, i.e., currentCutIndex-1.    
4734 >      int cutIdxFlagsObj1 = max(int(currentCutIndex-1),0);
4735 >      int cutIdxFlagsObj2 = max(int(currentCutIndex-1),0);
4736 >      // If the inputCollection of the cut is not equal to the inputType but the inputCollection includes objects that are contained in inputType, then use the currentCutIndex for those collections.
4737 >      // For example, if the inputType is jet-jet pairs, and the inputCollection is track-jet pairs, then use currentCutIndex for cutIdxFlagsObj{1,2}, i.e., for both jets.  
4738 >      // For example, if the inputType is jets, and the inputCollection is track-jet pairs, then use currentCutIndex for cutIdxFlagsObj2 (jets) and currentCutIndex-1 for cutIdxFlagsObj1 (tracks).  
4739 >      if (currentCut.inputCollection != inputType) {  
4740 >        if (currentCut.inputCollection.find(obj1Type)!=string::npos) cutIdxFlagsObj1 = currentCutIndex;
4741 >        if (currentCut.inputCollection.find(obj2Type)!=string::npos) cutIdxFlagsObj2 = currentCutIndex;
4742 >      }  
4743 >      flagPair flags1 = cumulativeFlags.at(obj1Type).at(cutIdxFlagsObj1);  // flag for input collection 1
4744 >      flagPair flags2 = cumulativeFlags.at(obj2Type).at(cutIdxFlagsObj2);  // flag for input collection 2
4745 >      
4746 >      // The cumulative flag is only true if the paired object cumulative flag is true, and if the single object cumulative flags are true.  
4747 >      bool currentCumulativeCutFlag = true;
4748 >      bool currentCumulativePlotFlag = true;
4749 >      if(flags1.size() == 0 && flags2.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag;
4750 >      else if(flags1.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag && flags2.at(object2).first;
4751 >      else if(flags2.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag && flags1.at(object1).first;
4752 >      else currentCumulativeCutFlag = previousCumulativeCutFlag && flags1.at(object1).first && flags2.at(object2).first;
4753 >
4754 >      if(flags1.size() == 0 && flags2.size() == 0) currentCumulativePlotFlag = previousCumulativePlotFlag;
4755 >      else if(flags1.size() == 0) currentCumulativePlotFlag = previousCumulativePlotFlag && flags2.at(object2).second;
4756 >      else if(flags2.size() == 0) currentCumulativePlotFlag = previousCumulativePlotFlag && flags1.at(object1).second;
4757 >      else currentCumulativePlotFlag = previousCumulativePlotFlag && flags1.at(object1).first && flags2.at(object2).second;
4758 >
4759 >      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(make_pair(currentCumulativeCutFlag,currentCumulativePlotFlag));  // Set the flag for the paired object
4760 >
4761 >
4762 >      if (currentCumulativeCutFlag && currentCut.inputCollection == inputType) {  // Set the flags for the individual objects if the paired object is being cut on.  
4763 >        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1).first  = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1, "cut");
4764 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2).first  = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "cut");
4765 >        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1).second = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1, "plot");
4766 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2).second = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "plot");
4767 >
4768 >        if (verbose_>1) clog << " previousCumulativeCutFlag for object1 = " << getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object1, "cut") << endl;  
4769 >        if (verbose_>1) clog << " previousCumulativeCutFlag for object2 = " << getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "cut") << endl;  
4770 >
4771        }
4772 +
4773        counter++;
4774  
4775 <    } // end   for (uint object2 = 0; object2 != inputCollection2->size(); object2++){
4776 <  }  // end   for (uint object1 = 0; object1 != inputCollection1->size(); object1++){
4775 >    } // end   for (uint object2 = 0; object2 != inputCollection2->size(); object2++)
4776 >  }  // end   for (uint object1 = 0; object1 != inputCollection1->size(); object1++)
4777  
4778 < }
4778 > } // end void OSUAnalysis::setObjectFlags
4779  
4780  
4781 < bool OSUAnalysis::getPreviousCumulativeFlags(uint currentCutIndex, flagMap &individualFlags, string obj1Type, uint object1) {
4782 <  // Return true iff for the collection obj1Type, the element with index object1 has individal flags set to true for
4783 <  // all cuts up to currentCutIndex  
4784 <  bool previousCumulativeFlag = true;  
4785 <  for (uint previousCutIndex = 0; previousCutIndex < currentCutIndex; previousCutIndex++) {  
4786 <    if (previousCumulativeFlag && individualFlags.at(obj1Type).at(previousCutIndex).at(object1)) previousCumulativeFlag = true;
4787 <    else {  
4788 <      previousCumulativeFlag = false; break;  
4781 > bool OSUAnalysis::getPreviousCumulativeFlags(uint currentCutIndex, flagMap &individualFlags, string obj1Type, uint object1, string flagType) {
4782 >  // Return true iff for the collection obj1Type, the element with index object1 has individal flags set to true for
4783 >  // all cuts up to currentCutIndex
4784 >  bool previousCumulativeFlag = true;
4785 >  for (uint previousCutIndex = 0; previousCutIndex < currentCutIndex; previousCutIndex++) {
4786 >    bool tempFlag = false;
4787 >    if(flagType == "cut") tempFlag = individualFlags.at(obj1Type).at(previousCutIndex).at(object1).first;
4788 >    else if(flagType == "plot") tempFlag = individualFlags.at(obj1Type).at(previousCutIndex).at(object1).second;
4789 >
4790 >    if (previousCumulativeFlag && tempFlag) previousCumulativeFlag = true;
4791 >    else {
4792 >      previousCumulativeFlag = false; break;
4793      }
4794    }
4795 <  return previousCumulativeFlag;  
4796 < }  
4795 >  return previousCumulativeFlag;
4796 > }
4797 >
4798 >
4799  
4800  
4801   template <class InputCollection>
4802 < void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double scaleFactor){
4802 > void OSUAnalysis::assignTreeBranch(BranchSpecs parameters, InputCollection inputCollection, flagPair flags){
4803 >  // This function is similar to fill1DHistogram(), but instead of filling a histogram it assigns a value to a variable for the BNTree
4804 >
4805 >  if (BNTreeBranchVals_.count(parameters.name)==0) clog << "Error[assignTreeBranch]:  trying to assign value to " << parameters.name << " that does not have a branch set up.  Will likely seg fault." << endl;
4806 >  for (uint object = 0; object != inputCollection->size(); object++) {
4807 >
4808 >    if (!plotAllObjectsInPassingEvents_ && !flags.at(object).second) continue;
4809 >
4810 >    string inputVariable = parameters.inputVariable;
4811 >    string function = "";
4812 >    string stringValue = "";
4813 >    double value = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
4814 >    BNTreeBranchVals_.at(parameters.name).push_back(value);
4815 >
4816 >  }
4817 > }
4818 >
4819 >
4820 > template <class InputCollection>
4821 > void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection inputCollection, flagPair flags, double scaleFactor){
4822 >
4823 >  if (verbose_>2) clog << "  Filling histogram for " << parameters.name << endl;  
4824  
4825    for (uint object = 0; object != inputCollection->size(); object++){
4826  
4827 <    if(!plotAllObjectsInPassingEvents_ && !flags.at(object)) continue;
4827 >    if(!plotAllObjectsInPassingEvents_ && !flags.at(object).second) continue;
4828  
4829      string currentString = parameters.inputVariables.at(0);
4830      string inputVariable = "";
4831      string function = "";
4832 <    if(currentString.find("(")==std::string::npos){
4832 >    if(currentString.find("(")==string::npos){
4833        inputVariable = currentString;// variable to cut on
4834      }
4835      else{
# Line 3141 | Line 4838 | void OSUAnalysis::fill1DHistogram(TH1* h
4838        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
4839      }
4840  
4841 <    double value = valueLookup(&inputCollection->at(object), inputVariable, function);
4841 >    string stringValue = "";
4842 >    double value = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
4843      histo->Fill(value,scaleFactor);
4844  
4845      if (printEventInfo_) {
4846 <      // Write information about event to screen, for testing purposes.  
4847 <      cout << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << endl;  
4846 >      // Write information about event to screen, for testing purposes.
4847 >      clog << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << " (object number " << object << ")" << endl;
4848      }
4849 <    
4849 >
4850    }
4851   }
4852  
4853   template <class InputCollection1, class InputCollection2>
4854 < void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double scaleFactor){
4854 > void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2,
4855 >                                  flagPair pairFlags, double scaleFactor){
4856  
4857    bool sameObjects = false;
4858    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
# Line 3165 | Line 4864 | void OSUAnalysis::fill1DHistogram(TH1* h
4864        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
4865  
4866        pairCounter++;
4867 <      //only take objects which have passed all cuts and pairs which have passed all cuts
3169 <      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1)) continue;
3170 <      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2)) continue;
3171 <      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter)) continue;
4867 >      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter).second) continue;
4868  
4869        string currentString = parameters.inputVariables.at(0);
4870        string inputVariable = "";
4871        string function = "";
4872 <      if(currentString.find("(")==std::string::npos){
4872 >      if(currentString.find("(")==string::npos){
4873          inputVariable = currentString;// variable to cut on
4874        }
4875        else{
# Line 3182 | Line 4878 | void OSUAnalysis::fill1DHistogram(TH1* h
4878          inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
4879        }
4880  
4881 <      double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
4881 >      string stringValue = "";
4882 >      double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
4883        histo->Fill(value,scaleFactor);
4884  
4885 +      if (printEventInfo_) {
4886 +        // Write information about event to screen, for testing purposes.
4887 +        clog << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value
4888 +             << " (object1 number " << object1 << "), "
4889 +             << " (object2 number " << object2 << ")"
4890 +             << endl;
4891 +      }
4892 +      
4893      }
4894    }
4895  
# Line 3192 | Line 4897 | void OSUAnalysis::fill1DHistogram(TH1* h
4897  
4898  
4899   template <class InputCollection>
4900 < void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double scaleFactor){
4900 > void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection inputCollection, flagPair flags, double scaleFactor){
4901  
4902    for (uint object = 0; object != inputCollection->size(); object++){
4903  
4904 <    if(!plotAllObjectsInPassingEvents_ && !flags.at(object)) continue;
4904 >    if(!plotAllObjectsInPassingEvents_ && !flags.at(object).second) continue;
4905  
4906 +    string stringValue = "";
4907      string currentString = parameters.inputVariables.at(0);
4908      string inputVariable = "";
4909      string function = "";
4910 <    if(currentString.find("(")==std::string::npos){
4910 >    if(currentString.find("(")==string::npos){
4911        inputVariable = currentString;// variable to cut on
4912      }
4913      else{
# Line 3209 | Line 4915 | void OSUAnalysis::fill2DHistogram(TH2* h
4915        inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
4916        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
4917      }
4918 <    double valueX = valueLookup(&inputCollection->at(object), inputVariable, function);
4918 >    double valueX = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
4919  
4920      currentString = parameters.inputVariables.at(1);
4921      inputVariable = "";
4922      function = "";
4923 <    if(currentString.find("(")==std::string::npos){
4923 >    if(currentString.find("(")==string::npos){
4924        inputVariable = currentString;// variable to cut on
4925      }
4926      else{
# Line 3223 | Line 4929 | void OSUAnalysis::fill2DHistogram(TH2* h
4929        inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
4930      }
4931  
4932 <    double valueY = valueLookup(&inputCollection->at(object), inputVariable, function);
4932 >    double valueY = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
4933  
4934      histo->Fill(valueX,valueY,scaleFactor);
4935  
# Line 3232 | Line 4938 | void OSUAnalysis::fill2DHistogram(TH2* h
4938   }
4939  
4940   template <class InputCollection1, class InputCollection2>
4941 < void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double scaleFactor){
4941 > void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2,
4942 >                                  flagPair pairFlags, double scaleFactor){
4943  
4944    bool sameObjects = false;
4945    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
# Line 3245 | Line 4952 | void OSUAnalysis::fill2DHistogram(TH2* h
4952  
4953        pairCounter++;
4954  
4955 <      //only take objects which have passed all cuts and pairs which have passed all cuts
3249 <      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1)) continue;
3250 <      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2)) continue;
3251 <      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter)) continue;
4955 >      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter).second) continue;
4956  
4957 +      string stringValue = "";
4958        string currentString = parameters.inputVariables.at(0);
4959        string inputVariable = "";
4960        string function = "";
4961 <      if(currentString.find("(")==std::string::npos){
4961 >      if(currentString.find("(")==string::npos){
4962          inputVariable = currentString;// variable to cut on
4963        }
4964        else{
# Line 3261 | Line 4966 | void OSUAnalysis::fill2DHistogram(TH2* h
4966          inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
4967          inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
4968        }
4969 <      double valueX = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
4969 >      double valueX = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
4970  
4971        currentString = parameters.inputVariables.at(1);
4972        inputVariable = "";
4973        function = "";
4974 <      if(currentString.find("(")==std::string::npos){
4974 >      if(currentString.find("(")==string::npos){
4975          inputVariable = currentString;// variable to cut on
4976        }
4977        else{
# Line 3274 | Line 4979 | void OSUAnalysis::fill2DHistogram(TH2* h
4979          inputVariable = currentString.substr(currentString.find("(")+1);//get rest of string
4980          inputVariable = inputVariable.substr(0,inputVariable.size()-1);//remove trailing ")"
4981        }
4982 <      double valueY = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function);
4982 >      double valueY = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
4983  
4984  
4985        histo->Fill(valueX,valueY,scaleFactor);
# Line 3295 | Line 5000 | int OSUAnalysis::getGenMatchedParticleIn
5000  
5001      double currentDeltaR = deltaR(object->eta,object->phi,mcparticle->eta,mcparticle->phi);
5002      if(currentDeltaR > 0.05) continue;
5003 <    //     cout << std::setprecision(3) << std::setw(20)
5003 >    //     clog << setprecision(3) << setw(20)
5004      //          << "\tcurrentParticle:  eta = " << mcparticles->at(mcparticle - mcparticles->begin()).eta
5005 <    //          << std::setw(20)
5005 >    //          << setw(20)
5006      //          << "\tphi = " << mcparticles->at(mcparticle - mcparticles->begin()).phi
5007 <    //          << std::setw(20)
5007 >    //          << setw(20)
5008      //          << "\tdeltaR = " << currentDeltaR
5009 <    //          << std::setprecision(1)
5010 <    //          << std::setw(20)
5009 >    //          << setprecision(1)
5010 >    //          << setw(20)
5011      //          << "\tid = " << mcparticles->at(mcparticle - mcparticles->begin()).id
5012 <    //          << std::setw(20)
5012 >    //          << setw(20)
5013      //          << "\tmotherId = " << mcparticles->at(mcparticle - mcparticles->begin()).motherId
5014 <    //          << std::setw(20)
5014 >    //          << setw(20)
5015      //          << "\tstatus = " << mcparticles->at(mcparticle - mcparticles->begin()).status<< endl;
5016      if(currentDeltaR < bestMatchDeltaR && mcparticles->at(mcparticle - mcparticles->begin()).id != mcparticles->at(mcparticle - mcparticles->begin()).motherId){
5017        bestMatchIndex = mcparticle - mcparticles->begin();
# Line 3314 | Line 5019 | int OSUAnalysis::getGenMatchedParticleIn
5019      }
5020  
5021    }
5022 <  //   if(bestMatchDeltaR != 999)  cout << "bestMatch:  deltaR = " << bestMatchDeltaR << "   id = " << mcparticles->at(bestMatchIndex).id << "   motherId = " << mcparticles->at(bestMatchIndex).motherId << endl;
5023 <  //   else cout << "no match found..." << endl;
5022 >  //   if(bestMatchDeltaR != 999)  clog << "bestMatch:  deltaR = " << bestMatchDeltaR << "   id = " << mcparticles->at(bestMatchIndex).id << "   motherId = " << mcparticles->at(bestMatchIndex).motherId << endl;
5023 >  //   else clog << "no match found..." << endl;
5024    return bestMatchIndex;
5025  
5026   }
# Line 3369 | Line 5074 | int OSUAnalysis::findTauMotherIndex(cons
5074   // 20        strange baryon
5075   // 21        charm baryon
5076   // 22        bottom baryon
5077 < // 23        other
5077 > // 23        QCD string
5078 > // 24        other
5079  
5080   int OSUAnalysis::getPdgIdBinValue(int pdgId){
5081  
# Line 3393 | Line 5099 | int OSUAnalysis::getPdgIdBinValue(int pd
5099    else if(absPdgId > 3000 && absPdgId < 4000  ) binValue = 20;
5100    else if(absPdgId > 4000 && absPdgId < 5000  ) binValue = 21;
5101    else if(absPdgId > 5000 && absPdgId < 6000  ) binValue = 22;
5102 +  else if(absPdgId == 92  ) binValue = 23;
5103  
5104 <  else binValue = 23;
5104 >  else binValue = 24;
5105  
5106    return binValue;
5107  
# Line 3404 | Line 5111 | const BNprimaryvertex *
5111   OSUAnalysis::chosenVertex ()
5112   {
5113    const BNprimaryvertex *chosenVertex = 0;
5114 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "primaryvertexs") != objectsToCut.end()) {
5115 <    vector<bool> vertexFlags = cumulativeFlags.at("primaryvertexs").back().size() ? cumulativeFlags.at("primaryvertexs").back() :
5116 <      cumulativeFlags.at("primaryvertexs").at(cumulativeFlags.at("primaryvertexs").size() - 2);
5114 >  if(cumulativeFlags.find ("primaryvertexs") != cumulativeFlags.end ()){
5115 >    flagPair vertexFlags;
5116 >    for (int i = cumulativeFlags.at("primaryvertexs").size() - 1; i >= 0; i--){
5117 >      if (cumulativeFlags.at("primaryvertexs").at(i).size()){
5118 >        vertexFlags = cumulativeFlags.at("primaryvertexs").at(i);
5119 >        break;
5120 >      }
5121 >    }
5122      for (uint vertexIndex = 0; vertexIndex != vertexFlags.size(); vertexIndex++){
5123 <      if(!vertexFlags.at(vertexIndex)) continue;
5123 >      if(!vertexFlags.at(vertexIndex).first) continue;
5124        chosenVertex = & primaryvertexs->at(vertexIndex);
5125        break;
5126      }
5127    }
5128 <  else {
5129 <    chosenVertex = &primaryvertexs->at(0);
3418 <  }
5128 >  else if (find (objectsToGet.begin (), objectsToGet.end (), "primaryvertexs") != objectsToGet.end ())
5129 >    chosenVertex = & primaryvertexs->at (0);
5130  
5131    return chosenVertex;
5132   }
# Line 3424 | Line 5135 | const BNmet *
5135   OSUAnalysis::chosenMET ()
5136   {
5137    const BNmet *chosenMET = 0;
5138 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "mets") != objectsToCut.end()) {
5139 <    vector<bool> metFlags = cumulativeFlags.at("mets").back().size() ? cumulativeFlags.at("mets").back() :
5140 <      cumulativeFlags.at("mets").at(cumulativeFlags.at("mets").size() - 2);
5138 >  if(cumulativeFlags.find ("mets") != cumulativeFlags.end ()){
5139 >    flagPair metFlags;
5140 >    for (int i = cumulativeFlags.at("mets").size() - 1; i >= 0; i--){
5141 >      if (cumulativeFlags.at("mets").at(i).size()){
5142 >        metFlags = cumulativeFlags.at("mets").at(i);
5143 >        break;
5144 >      }
5145 >    }
5146      for (uint metIndex = 0; metIndex != metFlags.size(); metIndex++){
5147 <      if(!metFlags.at(metIndex)) continue;
5147 >      if(!metFlags.at(metIndex).first) continue;
5148        chosenMET = & mets->at(metIndex);
5149        break;
5150      }
5151    }
5152 <  else {
5153 <    chosenMET = &mets->at(0);
3438 <  }
5152 >  else if (find (objectsToGet.begin (), objectsToGet.end (), "mets") != objectsToGet.end ())
5153 >    chosenMET = & mets->at (0);
5154  
5155    return chosenMET;
5156   }
# Line 3444 | Line 5159 | const BNelectron *
5159   OSUAnalysis::chosenElectron ()
5160   {
5161    const BNelectron *chosenElectron = 0;
5162 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "electrons") != objectsToCut.end()) {
5163 <    vector<bool> electronFlags = cumulativeFlags.at("electrons").back().size() ? cumulativeFlags.at("electrons").back() :
5164 <      cumulativeFlags.at("electrons").at(cumulativeFlags.at("electrons").size() - 2);
5162 >  if(cumulativeFlags.find ("electrons") != cumulativeFlags.end ()){
5163 >    flagPair electronFlags;
5164 >    for (int i = cumulativeFlags.at("electrons").size() - 1; i >= 0; i--){
5165 >      if (cumulativeFlags.at("electrons").at(i).size()){
5166 >        electronFlags = cumulativeFlags.at("electrons").at(i);
5167 >        break;
5168 >      }
5169 >    }
5170      for (uint electronIndex = 0; electronIndex != electronFlags.size(); electronIndex++){
5171 <      if(!electronFlags.at(electronIndex)) continue;
5171 >      if(!electronFlags.at(electronIndex).first) continue;
5172        chosenElectron = & electrons->at(electronIndex);
5173        break;
5174      }
5175    }
5176 <  else {
5177 <    chosenElectron = &electrons->at(0);
3458 <  }
5176 >  else if (find (objectsToGet.begin (), objectsToGet.end (), "electrons") != objectsToGet.end ())
5177 >    chosenElectron = & electrons->at (0);
5178  
5179    return chosenElectron;
5180   }
5181  
5182 +
5183   const BNmuon *
5184   OSUAnalysis::chosenMuon ()
5185   {
5186    const BNmuon *chosenMuon = 0;
5187 <  if(std::find(objectsToCut.begin(), objectsToCut.end(), "muons") != objectsToCut.end()) {
5188 <    vector<bool> muonFlags = cumulativeFlags.at("muons").back().size() ? cumulativeFlags.at("muons").back() :
5189 <      cumulativeFlags.at("muons").at(cumulativeFlags.at("muons").size() - 2);
5187 >  if(cumulativeFlags.find ("muons") != cumulativeFlags.end ()){
5188 >    flagPair muonFlags;
5189 >    for (int i = cumulativeFlags.at("muons").size() - 1; i >= 0; i--){
5190 >      if (cumulativeFlags.at("muons").at(i).size()){
5191 >        muonFlags = cumulativeFlags.at("muons").at(i);
5192 >        break;
5193 >      }
5194 >    }
5195      for (uint muonIndex = 0; muonIndex != muonFlags.size(); muonIndex++){
5196 <      if(!muonFlags.at(muonIndex)) continue;
5196 >      if(!muonFlags.at(muonIndex).first) continue;
5197        chosenMuon = & muons->at(muonIndex);
5198        break;
5199      }
5200    }
5201 <  else {
5202 <    chosenMuon = &muons->at(0);
3478 <  }
5201 >  else if (find (objectsToGet.begin (), objectsToGet.end (), "muons") != objectsToGet.end ())
5202 >    chosenMuon = & muons->at (0);
5203  
5204    return chosenMuon;
5205   }
5206  
5207 + double
5208 + OSUAnalysis::chosenHT ()
5209 + {
5210 +  double chosenHT = 0.0;
5211 +  if(cumulativeFlags.find ("jets") != cumulativeFlags.end ()){
5212 +    flagPair jetFlags;
5213 +    for (int i = cumulativeFlags.at("jets").size() - 1; i >= 0; i--){
5214 +      if (cumulativeFlags.at("jets").at(i).size()){
5215 +        jetFlags = cumulativeFlags.at("jets").at(i);
5216 +        break;
5217 +      }
5218 +    }
5219 +    for (uint jetIndex = 0; jetIndex != jetFlags.size(); jetIndex++){
5220 +      if(!jetFlags.at(jetIndex).first) continue;
5221 +      chosenHT += jets->at(jetIndex).pt;
5222 +    }
5223 +  }
5224 +
5225 +  return chosenHT;
5226 + }
5227 +
5228 + pair<const BNmuon *, const BNmuon *>
5229 + OSUAnalysis::leadMuonPair ()
5230 + {
5231 +  pair<const BNmuon *, const BNmuon *> leadMuonPair;
5232 +  leadMuonPair.first = leadMuonPair.second = 0;
5233 +
5234 +  if(cumulativeFlags.find ("muons") != cumulativeFlags.end ()){
5235 +    flagPair muonFlags;
5236 +    for (int i = cumulativeFlags.at("muons").size() - 1; i >= 0; i--){
5237 +      if (cumulativeFlags.at("muons").at(i).size()){
5238 +        muonFlags = cumulativeFlags.at("muons").at(i);
5239 +        break;
5240 +      }
5241 +    }
5242 +    for (uint muonIndex0 = 0; muonIndex0 != muonFlags.size(); muonIndex0++){
5243 +      if(!muonFlags.at(muonIndex0).first) continue;
5244 +      for (uint muonIndex1 = muonIndex0 + 1; muonIndex1 < muonFlags.size(); muonIndex1++){
5245 +        if(!muonFlags.at(muonIndex1).first) continue;
5246 +        const BNmuon *mu0 = & muons->at(muonIndex0);
5247 +        const BNmuon *mu1 = & muons->at(muonIndex1);
5248 +        if(leadMuonPair.first == 0 || leadMuonPair.second == 0){
5249 +          leadMuonPair.first = mu0;
5250 +          leadMuonPair.second = mu1;
5251 +        }
5252 +        else{
5253 +          TVector2 newPt0 (mu0->px, mu0->py),
5254 +                   newPt1 (mu1->px, mu1->py),
5255 +                   oldPt0 (leadMuonPair.first->px, leadMuonPair.first->py),
5256 +                   oldPt1 (leadMuonPair.second->px, leadMuonPair.second->py);
5257 +          if(newPt0.Mod () + newPt1.Mod () > oldPt0.Mod() + oldPt1.Mod ())
5258 +            {
5259 +              leadMuonPair.first = mu0;
5260 +              leadMuonPair.second = mu1;
5261 +            }
5262 +        }
5263 +      }
5264 +    }
5265 +  }
5266 +
5267 +  return leadMuonPair;
5268 + }
5269 +
5270 + pair<const BNelectron *, const BNelectron *>
5271 + OSUAnalysis::leadElectronPair ()
5272 + {
5273 +  pair<const BNelectron *, const BNelectron *> leadElectronPair;
5274 +  leadElectronPair.first = leadElectronPair.second = 0;
5275 +  if(cumulativeFlags.find ("electrons") != cumulativeFlags.end ()){
5276 +    flagPair electronFlags;
5277 +    for (int i = cumulativeFlags.at("electrons").size() - 1; i >= 0; i--){
5278 +      if (cumulativeFlags.at("electrons").at(i).size()){
5279 +        electronFlags = cumulativeFlags.at("electrons").at(i);
5280 +        break;
5281 +      }
5282 +    }
5283 +    for (uint electronIndex0 = 0; electronIndex0 != electronFlags.size(); electronIndex0++){
5284 +      if(!electronFlags.at(electronIndex0).first) continue;
5285 +      for (uint electronIndex1 = electronIndex0 + 1; electronIndex1 < electronFlags.size(); electronIndex1++){
5286 +        if(!electronFlags.at(electronIndex1).first) continue;
5287 +        const BNelectron *el0 = & electrons->at(electronIndex0);
5288 +        const BNelectron *el1 = & electrons->at(electronIndex1);
5289 +        if(leadElectronPair.first == 0 || leadElectronPair.second == 0){
5290 +          leadElectronPair.first = el0;
5291 +          leadElectronPair.second = el1;
5292 +        }
5293 +        else{
5294 +          TVector2 newPt0 (el0->px, el0->py),
5295 +                   newPt1 (el1->px, el1->py),
5296 +                   oldPt0 (leadElectronPair.first->px, leadElectronPair.first->py),
5297 +                   oldPt1 (leadElectronPair.second->px, leadElectronPair.second->py);
5298 +          if(newPt0.Mod () + newPt1.Mod () > oldPt0.Mod() + oldPt1.Mod ())
5299 +            {
5300 +              leadElectronPair.first = el0;
5301 +              leadElectronPair.second = el1;
5302 +            }
5303 +        }
5304 +      }
5305 +    }
5306 +  }
5307 +
5308 +  return leadElectronPair;
5309 + }
5310  
5311   DEFINE_FWK_MODULE(OSUAnalysis);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines