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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines