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.73 by lantonel, Thu May 30 18:09:58 2013 UTC vs.
Revision 1.92 by wulsin, Mon Jul 1 11:54:18 2013 UTC

# Line 28 | Line 28 | OSUAnalysis::OSUAnalysis (const edm::Par
28    datasetType_ (cfg.getParameter<string> ("datasetType")),
29    channels_  (cfg.getParameter<vector<edm::ParameterSet> >("channels")),
30    histogramSets_ (cfg.getParameter<vector<edm::ParameterSet> >("histogramSets")),
31 +  useEDMFormat_   (cfg.getParameter<bool>("useEDMFormat")),
32 +  treeBranchSets_   (cfg.getParameter<vector<edm::ParameterSet> >("treeBranchSets")),
33    plotAllObjectsInPassingEvents_ (cfg.getParameter<bool> ("plotAllObjectsInPassingEvents")),
34    doPileupReweighting_ (cfg.getParameter<bool> ("doPileupReweighting")),
35    applyLeptonSF_ (cfg.getParameter<bool> ("applyLeptonSF")),
36 <  printEventInfo_ (cfg.getParameter<bool> ("printEventInfo")),
36 >  applyBtagSF_ (cfg.getParameter<bool> ("applyBtagSF")),
37 >  minBtag_ (cfg.getParameter<int> ("minBtag")),
38 >  maxBtag_ (cfg.getParameter<int> ("maxBtag")),
39 >  printEventInfo_      (cfg.getParameter<bool> ("printEventInfo")),
40 >  printAllTriggers_    (cfg.getParameter<bool> ("printAllTriggers")),
41    useTrackCaloRhoCorr_ (cfg.getParameter<bool> ("useTrackCaloRhoCorr")),
42    stopCTau_ (cfg.getParameter<vector<double> > ("stopCTau")),
43    GetPlotsAfterEachCut_ (cfg.getParameter<bool> ("GetPlotsAfterEachCut"))
44 < {
44 > {
45  
46    TH1::SetDefaultSumw2 ();
47  
# Line 46 | Line 52 | OSUAnalysis::OSUAnalysis (const edm::Par
52        muonSFWeight_ = new MuonSFWeight (muonSFFile_, muonSF_);
53        electronSFWeight_ = new ElectronSFWeight ("53X", electronSFID_);
54      }
55 +    if (applyBtagSF_){
56 +      bTagSFWeight_ = new BtagSFWeight;
57 +    }
58    }
59    if (datasetType_ == "signalMC" && regex_match (dataset_, regex ("stop.*to.*_.*mm.*")))
60      stopCTauWeight_ = new StopCTauWeight (stopCTau_.at (0), stopCTau_.at (1), stops_);
# Line 67 | Line 76 | OSUAnalysis::OSUAnalysis (const edm::Par
76    //always get the event collection to do pile-up reweighting
77    objectsToGet.push_back("events");
78  
79 +
80 +  // Parse the tree variable definitions.
81 +  for (uint iBranchSet = 0; !useEDMFormat_ && iBranchSet<treeBranchSets_.size(); iBranchSet++) {
82 +    string tempInputCollection = treeBranchSets_.at(iBranchSet).getParameter<string> ("inputCollection");
83 +    if(tempInputCollection.find("pairs")!=string::npos) { cout << "Warning:  tree filling is not configured for pairs of objects, so will not work for collection: " << tempInputCollection << endl; }
84 +    objectsToGet.push_back(tempInputCollection);
85 +    objectsToCut.push_back(tempInputCollection);
86 +
87 +    vector<string> branchList(treeBranchSets_.at(iBranchSet).getParameter<vector<string> >("branches"));
88 +
89 +    for (uint iBranch = 0; iBranch<branchList.size(); iBranch++) {
90 +      BranchSpecs br;
91 +      br.inputCollection = tempInputCollection;
92 +      br.inputVariable = branchList.at(iBranch);
93 +      TString newName = TString(br.inputCollection) + "_" + TString(br.inputVariable);
94 +      br.name = string(newName.Data());
95 +      treeBranches_.push_back(br);
96 +    }
97 +
98 +  } // end   for (uint iBranchSet = 0; iBranchSet<treeBranchSets_.size(); iBranchSet++)
99 +
100 +
101    //parse the histogram definitions
102    for(uint currentHistogramSet = 0; currentHistogramSet != histogramSets_.size(); currentHistogramSet++){
103  
104      string tempInputCollection = histogramSets_.at(currentHistogramSet).getParameter<string> ("inputCollection");
105      if(tempInputCollection == "muon-electron pairs") tempInputCollection = "electron-muon pairs";
106 +    if(tempInputCollection == "photon-muon pairs") tempInputCollection = "muon-photon pairs";
107 +    if(tempInputCollection == "photon-electron pairs") tempInputCollection = "electron-photon pairs";
108      if(tempInputCollection == "jet-electron pairs") tempInputCollection = "electron-jet pairs";
109 +    if(tempInputCollection == "jet-photon pairs") tempInputCollection = "photon-jet pairs";
110      if(tempInputCollection == "jet-muon pairs") tempInputCollection = "muon-jet pairs";
111 +    if(tempInputCollection == "jet-met pairs")  tempInputCollection = "met-jet pairs";
112      if(tempInputCollection == "event-track pairs")   tempInputCollection = "track-event pairs";
113      if(tempInputCollection == "secondary muon-muon pairs")   tempInputCollection = "muon-secondary muon pairs";
114 +    if(tempInputCollection == "secondary jet-muon pairs")   tempInputCollection = "muon-secondary jet pairs";
115 +    if(tempInputCollection == "secondary jet-electron pairs")   tempInputCollection = "electron-secondary jet pairs";
116 +    if(tempInputCollection == "secondary jet-photon pairs")   tempInputCollection = "photon-secondary jet pairs";
117 +    if(tempInputCollection == "secondary jet-jet pairs")   tempInputCollection = "jet-secondary jet pairs";
118      if(tempInputCollection == "secondary electron-electron pairs")   tempInputCollection = "electron-secondary electron pairs";
119      if(tempInputCollection == "trigobj-electron pairs")   tempInputCollection = "electron-trigobj pairs";
120      if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
# Line 90 | Line 129 | OSUAnalysis::OSUAnalysis (const edm::Par
129        }
130        objectsToPlot.push_back(tempInputCollection);
131        objectsToCut.push_back(tempInputCollection);
132 <    }
94 <    else{//pair of objects, need to add the pair and the individual objects to the lists of things to Get/Plot/Cut
132 >    } else { //pair of objects, need to add the pair and the individual objects to the lists of things to Get/Plot/Cut
133        string obj1;
134        string obj2;
135        getTwoObjs(tempInputCollection, obj1, obj2);
# Line 105 | Line 143 | OSUAnalysis::OSUAnalysis (const edm::Par
143        objectsToGet.push_back(tempInputCollection);
144        objectsToGet.push_back(obj1);
145        objectsToGet.push_back(obj2ToGet);
146 +    } // end else
147  
109 –    }
148  
149  
150      vector<edm::ParameterSet> histogramList_  (histogramSets_.at(currentHistogramSet).getParameter<vector<edm::ParameterSet> >("histograms"));
# Line 128 | Line 166 | OSUAnalysis::OSUAnalysis (const edm::Par
166        histograms.push_back(tempHistogram);
167  
168      }
169 <  }
169 >  } //   for(uint currentHistogramSet = 0; currentHistogramSet != histogramSets_.size(); currentHistogramSet++)
170 >
171    //make unique vector of objects we need to plot (so we can book a histogram with the number of each object)
172    sort( objectsToPlot.begin(), objectsToPlot.end() );
173    objectsToPlot.erase( unique( objectsToPlot.begin(), objectsToPlot.end() ), objectsToPlot.end() );
# Line 236 | Line 275 | OSUAnalysis::OSUAnalysis (const edm::Par
275      //create cutFlow for this channel
276      cutFlows_.push_back (new CutFlow (fs_, channelName));
277      vector<TFileDirectory> directories; //vector of directories in the output file.
278 +    vector<TFileDirectory> treeDirectories; //vector of directories for trees in the output file.
279      vector<string> subSubDirNames;//subdirectories in each channel.
280      //get list of cuts for this channel
281      vector<edm::ParameterSet> cuts_  (channels_.at(currentChannel).getParameter<vector<edm::ParameterSet> >("cuts"));
# Line 247 | Line 287 | OSUAnalysis::OSUAnalysis (const edm::Par
287        //store input collection for cut
288        string tempInputCollection = cuts_.at(currentCut).getParameter<string> ("inputCollection");
289        if(tempInputCollection == "muon-electron pairs") tempInputCollection = "electron-muon pairs";
290 +      if(tempInputCollection == "photon-electron pairs") tempInputCollection = "electron-photon pairs";
291 +      if(tempInputCollection == "photon-muon pairs") tempInputCollection = "muon-photon pairs";
292        if(tempInputCollection == "jet-electron pairs") tempInputCollection = "electron-jet pairs";
293        if(tempInputCollection == "jet-muon pairs") tempInputCollection = "muon-jet pairs";
294 +      if(tempInputCollection == "jet-met pairs")  tempInputCollection = "met-jet pairs";
295 +      if(tempInputCollection == "jet-photon pairs") tempInputCollection = "photon-jet pairs";
296        if(tempInputCollection == "event-track pairs")   tempInputCollection = "track-event pairs";
297        if(tempInputCollection == "secondary muon-muon pairs")   tempInputCollection = "muon-secondary muon pairs";
298 +      if(tempInputCollection == "secondary jet-jet pairs")   tempInputCollection = "jet-secondary jet pairs";
299 +      if(tempInputCollection == "secondary jet-muon pairs")   tempInputCollection = "muon-secondary jet pairs";
300 +      if(tempInputCollection == "secondary jet-photon pairs")   tempInputCollection = "photon-secondary jet pairs";
301 +      if(tempInputCollection == "secondary jet-electron pairs")   tempInputCollection = "electron-secondary jet pairs";
302        if(tempInputCollection == "secondary electron-electron pairs")   tempInputCollection = "electron-secondary electron pairs";
303        if(tempInputCollection == "trigobj-electron pairs")   tempInputCollection = "electron-trigobj pairs";
304        if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
# Line 320 | Line 368 | OSUAnalysis::OSUAnalysis (const edm::Par
368        tempCut.numberRequired = numberRequiredInt;// number of objects required to pass the cut
369        tempCut.eventComparativeOperator = numberRequiredVector.at(0);// comparison to make
370  
371 <      //Set up vectors to store the directories and subDIrectories for each channel.
371 >      //Set up vectors to store the directories and subDirectories for each channel.
372        string subSubDirName;
373        string tempCutName;
374        if(cuts_.at(currentCut).exists("alias")){
375          tempCutName = cuts_.at(currentCut).getParameter<string> ("alias");
376 <        subSubDirName = "After " + cuts_.at(currentCut).getParameter<string> ("alias") + " Cut Applied";
376 >        subSubDirName = "After " + tempCutName + " Cut Applied";
377        }
378        else{
379          //construct string for cutflow table
# Line 336 | Line 384 | OSUAnalysis::OSUAnalysis (const edm::Par
384          subSubDirName = "After " + numberRequiredString + " " + collectionString + " with " + cutString + " Cut Applied";
385        }
386  
387 +      tempCut.isVeto = false;
388 +      if(cuts_.at(currentCut).exists("isVeto")){
389 +        bool isVeto = cuts_.at(currentCut).getParameter<bool> ("isVeto");
390 +        if (isVeto == true) tempCut.isVeto = true;
391 +      }
392        subSubDirNames.push_back(subSubDirName);
393        tempCut.name = tempCutName;
394  
# Line 350 | Line 403 | OSUAnalysis::OSUAnalysis (const edm::Par
403      TFileDirectory subDir = fs_->mkdir( channelName );
404      //loop over the cuts to set up subdirectory for each cut if GetPlotsAfterEachCut_ is true.
405      if(GetPlotsAfterEachCut_){
406 <       for( uint currentDir=0; currentDir != subSubDirNames.size(); currentDir++){
407 <            TFileDirectory subSubDir = subDir.mkdir( subSubDirNames[currentDir] );
408 <            directories.push_back(subSubDir);
409 <            map<string, TH1D*> oneDhistoMap;
410 <            oneDHistsTmp.push_back(oneDhistoMap);
411 <            map<string, TH2D*> twoDhistoMap;
412 <            twoDHistsTmp.push_back(twoDhistoMap);
406 >      for( uint currentDir=0; currentDir != subSubDirNames.size(); currentDir++){
407 >        TFileDirectory subSubDir = subDir.mkdir( subSubDirNames[currentDir] );
408 >        directories.push_back(subSubDir);
409 >        map<string, TH1D*> oneDhistoMap;
410 >        oneDHistsTmp.push_back(oneDhistoMap);
411 >        map<string, TH2D*> twoDhistoMap;
412 >        twoDHistsTmp.push_back(twoDhistoMap);
413        }
414 +      treeDirectories.push_back(subDir);
415        oneDHists_.push_back(oneDHistsTmp);
416        twoDHists_.push_back(twoDHistsTmp);
417      }
418 <   //only set up directories with names of the channels if GetPlotsAfterEachCut_ is false.
419 <   else{
418 >    //only set up directories with names of the channels if GetPlotsAfterEachCut_ is false.
419 >    else{
420        map<string, TH1D*> oneDhistoMap;
421        oneDHistsTmp.push_back(oneDhistoMap);
422        map<string, TH2D*> twoDhistoMap;
# Line 370 | Line 424 | OSUAnalysis::OSUAnalysis (const edm::Par
424        oneDHists_.push_back(oneDHistsTmp);
425        twoDHists_.push_back(twoDHistsTmp);
426        directories.push_back(subDir);
427 <   }
427 >      treeDirectories.push_back(subDir);
428 >
429 >    }
430 >
431 >    for(uint currentDir = 0; !useEDMFormat_ && currentDir != treeDirectories.size(); currentDir++){
432 >      TTree* newTree = treeDirectories.at(currentDir).make<TTree> (TString("BNTree_"+channelLabel), TString("BNTree_"+channelLabel));
433 >      BNTrees_.push_back(newTree);
434 >      for (uint iBranch = 0; iBranch < treeBranches_.size(); iBranch++){
435 >        BranchSpecs currentVar = treeBranches_.at(iBranch);
436 >        vector<float> newVec;
437 >        BNTreeBranchVals_[currentVar.name] = newVec;
438 >        BNTrees_.back()->Branch(TString(currentVar.name), &BNTreeBranchVals_.at(currentVar.name));
439 >      } // end for (uint iBranch = 0; iBranch < treeBranches_.size(); iBranch++)
440 >    }
441 >
442      //book all histograms included in the configuration
443      for(uint currentDir = 0; currentDir != directories.size(); currentDir++){//loop over all the directories.
444 <    for(uint currentHistogramIndex = 0; currentHistogramIndex != histograms.size(); currentHistogramIndex++){
445 <      histogram currentHistogram = histograms.at(currentHistogramIndex);
446 <      int numBinsElements = currentHistogram.bins.size();
447 <      int numInputVariables = currentHistogram.inputVariables.size();
448 <      int numBinEdgesX = currentHistogram.variableBinsX.size();
449 <      int numBinEdgesY = currentHistogram.variableBinsY.size();
450 <
451 <      if(numBinsElements == 1){
452 <        if(numBinEdgesX > 1){
453 <          if(numBinEdgesY > 1)
454 <            numBinsElements = 6;
444 >
445 >      for(uint currentHistogramIndex = 0; currentHistogramIndex != histograms.size(); currentHistogramIndex++){
446 >
447 >        histogram currentHistogram = histograms.at(currentHistogramIndex);
448 >        int numBinsElements = currentHistogram.bins.size();
449 >        int numInputVariables = currentHistogram.inputVariables.size();
450 >        int numBinEdgesX = currentHistogram.variableBinsX.size();
451 >        int numBinEdgesY = currentHistogram.variableBinsY.size();
452 >
453 >        if(numBinsElements == 1){
454 >          if(numBinEdgesX > 1){
455 >            if(numBinEdgesY > 1)
456 >              numBinsElements = 6;
457 >            else
458 >              numBinsElements = 3;
459 >          }
460 >        }
461 >        if(numBinsElements != 3 && numBinsElements !=6){
462 >          cout << "Error: Didn't find correct number of bin specifications for histogram named '" << currentHistogram.name << "'\n";
463 >          exit(0);
464 >        }
465 >        else if((numBinsElements == 3 && numInputVariables !=1) || (numBinsElements == 6 && numInputVariables!=2)){
466 >          cout << "Error: Didn't find correct number of input variables for histogram named '" << currentHistogram.name << "'\n";
467 >          exit(0);
468 >        }
469 >        else if(numBinsElements == 3){
470 >          if (currentHistogram.bins.size () == 3)
471 >            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));
472            else
473 <            numBinsElements = 3;
473 >            {
474 >              oneDHists_.at(currentChannel).at(currentDir)[currentHistogram.name] = directories.at(currentDir).make<TH1D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, numBinEdgesX - 1, currentHistogram.variableBinsX.data ());
475 >            }
476          }
477 <      }
478 <      if(numBinsElements != 3 && numBinsElements !=6){
479 <        cout << "Error: Didn't find correct number of bin specifications for histogram named '" << currentHistogram.name << "'\n";
480 <        exit(0);
481 <      }
482 <      else if((numBinsElements == 3 && numInputVariables !=1) || (numBinsElements == 6 && numInputVariables!=2)){
483 <        cout << "Error: Didn't find correct number of input variables for histogram named '" << currentHistogram.name << "'\n";
484 <        exit(0);
485 <      }
486 <      else if(numBinsElements == 3){
487 <        if (currentHistogram.bins.size () == 3)
488 <          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));
489 <        else
490 <          {
491 <            oneDHists_.at(currentChannel).at(currentDir)[currentHistogram.name] = directories.at(currentDir).make<TH1D> (TString(currentHistogram.name),channelLabel+" channel: "+currentHistogram.title, numBinEdgesX - 1, currentHistogram.variableBinsX.data ());
477 >        else if(numBinsElements == 6){
478 >          if (currentHistogram.bins.size () == 6)
479 >            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));
480 >          else
481 >            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 ());
482 >        }
483 >
484 >
485 >        if(currentHistogram.name.find("GenMatch")==string::npos) continue;
486 >
487 >        // bin      particle type
488 >        // ---      -------------
489 >        //  0        unmatched
490 >        //  1        u
491 >        //  2        d
492 >        //  3        s
493 >        //  4        c
494 >        //  5        b
495 >        //  6        t
496 >        //  7        e
497 >        //  8        mu
498 >        //  9        tau
499 >        // 10        nu
500 >        // 11        g
501 >        // 12        gamma
502 >        // 13        Z
503 >        // 14        W
504 >        // 15        light meson
505 >        // 16        K meson
506 >        // 17        D meson
507 >        // 18        B meson
508 >        // 19        light baryon
509 >        // 20        strange baryon
510 >        // 21        charm baryon
511 >        // 22        bottom baryon
512 >        // 23        QCD string
513 >        // 24        other
514 >
515 >        vector<TString> labelArray;
516 >        labelArray.push_back("unmatched");
517 >        labelArray.push_back("u");
518 >        labelArray.push_back("d");
519 >        labelArray.push_back("s");
520 >        labelArray.push_back("c");
521 >        labelArray.push_back("b");
522 >        labelArray.push_back("t");
523 >        labelArray.push_back("e");
524 >        labelArray.push_back("#mu");
525 >        labelArray.push_back("#tau");
526 >        labelArray.push_back("#nu");
527 >        labelArray.push_back("g");
528 >        labelArray.push_back("#gamma");
529 >        labelArray.push_back("Z");
530 >        labelArray.push_back("W");
531 >        labelArray.push_back("light meson");
532 >        labelArray.push_back("K meson");
533 >        labelArray.push_back("D meson");
534 >        labelArray.push_back("B meson");
535 >        labelArray.push_back("light baryon");
536 >        labelArray.push_back("strange baryon");
537 >        labelArray.push_back("charm baryon");
538 >        labelArray.push_back("bottom baryon");
539 >        labelArray.push_back("QCD string");
540 >        labelArray.push_back("other");
541 >
542 >        for(int bin = 0; bin !=currentHistogram.bins.at(0); bin++){
543 >          if(currentHistogram.name.find("GenMatchIdVsMotherId")==string::npos && currentHistogram.name.find("GenMatchIdVsGrandmotherId")==string::npos) {
544 >            oneDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
545            }
546 <      }
547 <      else if(numBinsElements == 6){
548 <        if (currentHistogram.bins.size () == 6)
549 <          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));
550 <        else
551 <          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 ());
552 <      }
546 >          else {
547 >            twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetYaxis()->SetBinLabel(bin+1,labelArray.at(currentHistogram.bins.at(0)-bin-1));
548 >            twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
549 >          }
550 >        }
551 >        if(currentHistogram.name.find("GenMatchIdVsMotherId")!=string::npos || currentHistogram.name.find("GenMatchIdVsGrandmotherId")!=string::npos) {
552 >          twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->CenterTitle();
553 >          twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetYaxis()->CenterTitle();
554 >        }
555  
556 +      }  // end      for(uint currentHistogramIndex = 0; currentHistogramIndex != histograms.size(); currentHistogramIndex++)
557  
415 –      if(currentHistogram.name.find("GenMatch")==string::npos) continue;
558  
559 <      // bin      particle type
560 <      // ---      -------------
561 <      //  0        unmatched
562 <      //  1        u
563 <      //  2        d
564 <      //  3        s
565 <      //  4        c
566 <      //  5        b
567 <      //  6        t
568 <      //  7        e
569 <      //  8        mu
570 <      //  9        tau
571 <      // 10        nu
572 <      // 11        g
573 <      // 12        gamma
574 <      // 13        Z
575 <      // 14        W
576 <      // 15        light meson
577 <      // 16        K meson
578 <      // 17        D meson
579 <      // 18        B meson
580 <      // 19        light baryon
581 <      // 20        strange baryon
582 <      // 21        charm baryon
583 <      // 22        bottom baryon
584 <      // 23        QCD string
585 <      // 24        other
586 <
587 <      vector<TString> labelArray;
588 <      labelArray.push_back("unmatched");
589 <      labelArray.push_back("u");
590 <      labelArray.push_back("d");
591 <      labelArray.push_back("s");
592 <      labelArray.push_back("c");
593 <      labelArray.push_back("b");
594 <      labelArray.push_back("t");
595 <      labelArray.push_back("e");
596 <      labelArray.push_back("#mu");
597 <      labelArray.push_back("#tau");
598 <      labelArray.push_back("#nu");
599 <      labelArray.push_back("g");
600 <      labelArray.push_back("#gamma");
601 <      labelArray.push_back("Z");
602 <      labelArray.push_back("W");
603 <      labelArray.push_back("light meson");
604 <      labelArray.push_back("K meson");
605 <      labelArray.push_back("D meson");
464 <      labelArray.push_back("B meson");
465 <      labelArray.push_back("light baryon");
466 <      labelArray.push_back("strange baryon");
467 <      labelArray.push_back("charm baryon");
468 <      labelArray.push_back("bottom baryon");
469 <      labelArray.push_back("QCD string");
470 <      labelArray.push_back("other");
471 <
472 <      for(int bin = 0; bin !=currentHistogram.bins.at(0); bin++){
473 <        if(currentHistogram.name.find("GenMatchIdVsMotherId")==string::npos && currentHistogram.name.find("GenMatchIdVsGrandmotherId")==string::npos) {
474 <          oneDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
475 <        }
476 <        else {
477 <          twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetYaxis()->SetBinLabel(bin+1,labelArray.at(currentHistogram.bins.at(0)-bin-1));
478 <          twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->SetBinLabel(bin+1,labelArray.at(bin));
479 <        }
480 <      }
481 <      if(currentHistogram.name.find("GenMatchIdVsMotherId")!=string::npos || currentHistogram.name.find("GenMatchIdVsGrandmotherId")!=string::npos) {
482 <        twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetXaxis()->CenterTitle();
483 <        twoDHists_.at(currentChannel).at(currentDir)[currentHistogram.name]->GetYaxis()->CenterTitle();
484 <      }
485 <
486 <    }
487 <
488 <    // Book a histogram for the number of each object type to be plotted.
489 <    // Name of objectToPlot here must match the name specified in OSUAnalysis::analyze().
490 <    for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
491 <      string currentObject = objectsToPlot.at(currentObjectIndex);
492 <      int maxNum = 10;
493 <      if(currentObject == "mcparticles") maxNum = 50;
494 <      else if(currentObject == "primaryvertexs") maxNum = 50;
495 <
496 <      if(currentObject == "muon-muon pairs")                currentObject = "dimuonPairs";
497 <      else if(currentObject == "electron-electron pairs")   currentObject = "dielectronPairs";
498 <      else if(currentObject == "electron-muon pairs")       currentObject = "electronMuonPairs";
499 <      else if(currentObject == "secondary jets")            currentObject = "secondaryJets";
500 <      else if(currentObject == "jet-jet pairs")             currentObject = "dijetPairs";
501 <      else if(currentObject == "electron-jet pairs")        currentObject = "electronJetPairs";
502 <      else if(currentObject == "muon-jet pairs")            currentObject = "muonJetPairs";
503 <      else if(currentObject == "track-event pairs")         currentObject = "trackEventPairs";
504 <      else if(currentObject == "electron-track pairs")      currentObject = "electronTrackPairs";
505 <      else if(currentObject == "muon-track pairs")          currentObject = "muonTrackPairs";
506 <      else if(currentObject == "muon-tau pairs")            currentObject = "muonTauPairs";
507 <      else if(currentObject == "tau-tau pairs")             currentObject = "ditauPairs";
508 <      else if(currentObject == "tau-track pairs")           currentObject = "tauTrackPairs";
509 <      else if(currentObject == "muon-secondary muon pairs") currentObject = "muonSecondaryMuonPairs";
510 <      else if(currentObject == "secondary muons")           currentObject = "secondaryMuons";
511 <      else if(currentObject == "electron-secondary electron pairs") currentObject = "electronSecondaryElectronPairs";
512 <      else if(currentObject == "secondary electrons")       currentObject = "secondaryElectrons";
513 <      else if(currentObject == "electron-trigobj pairs")    currentObject = "electronTrigobjPairs";
514 <      else if(currentObject == "muon-trigobj pairs")        currentObject = "muonTrigobjPairs";
515 <
516 <      currentObject.at(0) = toupper(currentObject.at(0));
517 <      string histoName = "num" + currentObject;
518 <
519 <      if(histoName == "numPrimaryvertexs"){
520 <        string newHistoName = histoName + "BeforePileupCorrection";
521 <        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);
522 <        newHistoName = histoName + "AfterPileupCorrection";
523 <        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);
559 >      // Book a histogram for the number of each object type to be plotted.
560 >      // Name of objectToPlot here must match the name specified in OSUAnalysis::analyze().
561 >      for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
562 >        string currentObject = objectsToPlot.at(currentObjectIndex);
563 >        int maxNum = 10;
564 >        if(currentObject == "mcparticles") maxNum = 50;
565 >        else if(currentObject == "primaryvertexs") maxNum = 50;
566 >
567 >        if(currentObject == "muon-muon pairs")                currentObject = "dimuonPairs";
568 >        else if(currentObject == "electron-electron pairs")   currentObject = "dielectronPairs";
569 >        else if(currentObject == "electron-muon pairs")       currentObject = "electronMuonPairs";
570 >        else if(currentObject == "electron-photon pairs")     currentObject = "electronPhotonPairs";
571 >        else if(currentObject == "muon-photon pairs")         currentObject = "muonPhotonPairs";
572 >        else if(currentObject == "secondary jets")            currentObject = "secondaryJets";
573 >        else if(currentObject == "jet-jet pairs")             currentObject = "dijetPairs";
574 >        else if(currentObject == "jet-secondary jet pairs")   currentObject = "jetSecondaryJetPairs";
575 >        else if(currentObject == "electron-jet pairs")        currentObject = "electronJetPairs";
576 >        else if(currentObject == "muon-jet pairs")            currentObject = "muonJetPairs";
577 >        else if(currentObject == "photon-jet pairs")          currentObject = "photonJetPairs";
578 >        else if(currentObject == "met-jet pairs")             currentObject = "metJetPairs";
579 >        else if(currentObject == "muon-secondary jet pairs")  currentObject = "muonSecondaryJetPairs";
580 >        else if(currentObject == "photon-secondary jet pairs")  currentObject = "photonSecondaryJetPairs";
581 >        else if(currentObject == "electron-secondary jet pairs")  currentObject = "electronSecondaryJetPairs";
582 >        else if(currentObject == "track-event pairs")         currentObject = "trackEventPairs";
583 >        else if(currentObject == "electron-track pairs")      currentObject = "electronTrackPairs";
584 >        else if(currentObject == "muon-track pairs")          currentObject = "muonTrackPairs";
585 >        else if(currentObject == "muon-tau pairs")            currentObject = "muonTauPairs";
586 >        else if(currentObject == "tau-tau pairs")             currentObject = "ditauPairs";
587 >        else if(currentObject == "tau-track pairs")           currentObject = "tauTrackPairs";
588 >        else if(currentObject == "muon-secondary muon pairs") currentObject = "muonSecondaryMuonPairs";
589 >        else if(currentObject == "secondary muons")           currentObject = "secondaryMuons";
590 >        else if(currentObject == "electron-secondary electron pairs") currentObject = "electronSecondaryElectronPairs";
591 >        else if(currentObject == "secondary electrons")       currentObject = "secondaryElectrons";
592 >        else if(currentObject == "electron-trigobj pairs")    currentObject = "electronTrigobjPairs";
593 >        else if(currentObject == "muon-trigobj pairs")        currentObject = "muonTrigobjPairs";
594 >
595 >        currentObject.at(0) = toupper(currentObject.at(0));
596 >        string histoName = "num" + currentObject;
597 >
598 >        if(histoName == "numPrimaryvertexs"){
599 >          string newHistoName = histoName + "BeforePileupCorrection";
600 >          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);
601 >          newHistoName = histoName + "AfterPileupCorrection";
602 >          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);
603 >        }
604 >        else
605 >          oneDHists_.at(currentChannel).at(currentDir)[histoName] = directories.at(currentDir).make<TH1D> (TString(histoName),channelLabel+" channel: Number of Selected "+currentObject+"; # "+currentObject, maxNum, 0, maxNum);
606        }
607 <      else
526 <        oneDHists_.at(currentChannel).at(currentDir)[histoName] = directories.at(currentDir).make<TH1D> (TString(histoName),channelLabel+" channel: Number of Selected "+currentObject+"; # "+currentObject, maxNum, 0, maxNum);
527 <    }
528 <   }//end of loop over directories
607 >    }//end of loop over directories
608      channels.push_back(tempChannel);
609      tempChannel.cuts.clear();
610    }//end loop over channels
# Line 538 | Line 617 | OSUAnalysis::OSUAnalysis (const edm::Par
617    sort( objectsToCut.begin(), objectsToCut.end() );
618    objectsToCut.erase( unique( objectsToCut.begin(), objectsToCut.end() ), objectsToCut.end() );
619  
620 +  produces<map<string, bool> > ("channelDecisions");
621 +
622 + } // end constructor OSUAnalysis::OSUAnalysis()
623  
542 – }
624  
625   OSUAnalysis::~OSUAnalysis ()
626   {
627 +
628    // Destroying the CutFlow objects causes the cut flow numbers and time
629    // information to be printed to standard output.
630    for(uint currentChannel = 0; currentChannel != channels_.size(); currentChannel++){
# Line 551 | Line 633 | OSUAnalysis::~OSUAnalysis ()
633   }
634  
635   void
636 < OSUAnalysis::analyze (const edm::Event &event, const edm::EventSetup &setup)
636 > OSUAnalysis::produce (edm::Event &event, const edm::EventSetup &setup)
637   {
556 –
638    // Retrieve necessary collections from the event.
639  
640    if (find(objectsToGet.begin(), objectsToGet.end(), "triggers") != objectsToGet.end())
# Line 619 | Line 700 | OSUAnalysis::analyze (const edm::Event &
700    //get pile-up event weight
701    if (doPileupReweighting_ && datasetType_ != "data") {
702      //for "data" datasets, the numTruePV is always set to -1
703 <    if (events->at(0).numTruePV < 0) cout << "WARNING[OSUAnalysis::analyze]: Event has numTruePV<0.  Turning off pile-up reweighting." << endl;  
704 <    else masterScaleFactor *= puWeight_->at (events->at (0).numTruePV);  
703 >    if (events->at(0).numTruePV < 0) cout << "WARNING[OSUAnalysis::analyze]: Event has numTruePV<0.  Turning off pile-up reweighting." << endl;
704 >    else masterScaleFactor *= puWeight_->at (events->at (0).numTruePV);
705    }
706  
707    stopCTauScaleFactor_ = 1.0;
# Line 630 | Line 711 | OSUAnalysis::analyze (const edm::Event &
711  
712    //loop over all channels
713  
714 +  auto_ptr<map<string, bool> > channelDecisions (new map<string, bool>);
715    for(uint currentChannelIndex = 0; currentChannelIndex != channels.size(); currentChannelIndex++){
716      channel currentChannel = channels.at(currentChannelIndex);
717  
# Line 637 | Line 719 | OSUAnalysis::analyze (const edm::Event &
719      counterMap passingCounter;
720      cumulativeFlags.clear ();
721  
722 +    for (map<string, vector<float>>::iterator iter = BNTreeBranchVals_.begin();
723 +         iter != BNTreeBranchVals_.end(); iter++) {
724 +      iter->second.clear();  // clear array
725 +    }
726 +
727      bool triggerDecision = true;
728      if(currentChannel.triggers.size() != 0 || currentChannel.triggersToVeto.size() != 0){  //triggers specified
729        triggerDecision = evaluateTriggers(currentChannel.triggers, currentChannel.triggersToVeto, triggers.product());
# Line 650 | Line 737 | OSUAnalysis::analyze (const edm::Event &
737          string currentObject = objectsToCut.at(currentObjectIndex);
738  
739          //initialize maps to get ready to set cuts
740 <        individualFlags[currentObject].push_back (vector<bool> ());
741 <        cumulativeFlags[currentObject].push_back (vector<bool> ());
740 >        individualFlags[currentObject].push_back (vector<pair<bool,bool> > ());
741 >        cumulativeFlags[currentObject].push_back (vector<pair<bool,bool> > ());
742  
743        }
744        for(uint currentObjectIndex = 0; currentObjectIndex != objectsToCut.size(); currentObjectIndex++){
# Line 686 | Line 773 | OSUAnalysis::analyze (const edm::Event &
773                                                                     "muon-muon pairs");
774  
775          else if(currentObject == "muon-secondary muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
776 <                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
777 <                                                                   cumulativeFlags.at("secondary muons").at(flagsForPairCutsIndex), \
778 <                                                                   "muon-secondary muon pairs");
776 >                                                                             cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
777 >                                                                             cumulativeFlags.at("secondary muons").at(flagsForPairCutsIndex), \
778 >                                                                             "muon-secondary muon pairs");
779 >
780 >        else if(currentObject == "muon-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), \
781 >                                                                             cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
782 >                                                                             cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex), \
783 >                                                                             "muon-secondary jet pairs");
784 >        else if(currentObject == "photon-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), \
785 >                                                                             cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
786 >                                                                             cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex), \
787 >                                                                             "photon-secondary jet pairs");
788 >
789 >        else if(currentObject == "electron-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), \
790 >                                                                             cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
791 >                                                                             cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex), \
792 >                                                                             "electron-secondary jet pairs");
793  
794          else if(currentObject == "electron-secondary electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
795 <                                                                   cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
796 <                                                                   cumulativeFlags.at("secondary electrons").at(flagsForPairCutsIndex), \
797 <                                                                   "electron-secondary electron pairs");
795 >                                                                                     cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
796 >                                                                                     cumulativeFlags.at("secondary electrons").at(flagsForPairCutsIndex), \
797 >                                                                                     "electron-secondary electron pairs");
798  
799          else if(currentObject == "electron-electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
800                                                                             cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
# Line 704 | Line 805 | OSUAnalysis::analyze (const edm::Event &
805                                                                         cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
806                                                                         "electron-muon pairs");
807          else if(currentObject == "jet-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), \
808 <                                                                           cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
809 <                                                                           cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
810 <                                                                           "jet-jet pairs");
808 >                                                                 cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
809 >                                                                 cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
810 >                                                                 "jet-jet pairs");
811 >        else if(currentObject == "jet-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), \
812 >                                                                 cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
813 >                                                                 cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex),\
814 >                                                                 "jet-secondary jet pairs");
815          else if(currentObject == "electron-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), \
816 <                                                                       cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
817 <                                                                       cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
818 <                                                                       "electron-jet pairs");
816 >                                                                      cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
817 >                                                                      cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
818 >                                                                      "electron-jet pairs");
819 >        else if(currentObject == "electron-photon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),photons.product(), \
820 >                                                                      cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
821 >                                                                      cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
822 >                                                                      "electron-photon pairs");
823 >        else if(currentObject == "photon-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), \
824 >                                                                      cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
825 >                                                                      cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
826 >                                                                      "photon-jet pairs");
827          else if(currentObject == "muon-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), \
828 <                                                                       cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
829 <                                                                       cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
830 <                                                                       "muon-jet pairs");
828 >                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
829 >                                                                  cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
830 >                                                                  "muon-jet pairs");
831 >        else if(currentObject == "met-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), \
832 >                                                                  cumulativeFlags.at("mets").at(flagsForPairCutsIndex), \
833 >                                                                  cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
834 >                                                                  "met-jet pairs");
835 >        else if(currentObject == "muon-photon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),photons.product(), \
836 >                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
837 >                                                                  cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
838 >                                                                  "muon-photon pairs");
839          else if(currentObject == "track-event pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(),
840                                                                       cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
841                                                                       cumulativeFlags.at("events").at(flagsForPairCutsIndex),
# Line 736 | Line 857 | OSUAnalysis::analyze (const edm::Event &
857                                                                   cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
858                                                                   "tau-tau pairs");
859          else if(currentObject == "tau-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),
860 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
861 <                                                                 cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
862 <                                                                 "tau-track pairs");
860 >                                                                   cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
861 >                                                                   cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
862 >                                                                   "tau-track pairs");
863          else if(currentObject == "electron-trigobj pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),trigobjs.product(),
864                                                                            cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
865                                                                            cumulativeFlags.at("trigobjs").at(flagsForPairCutsIndex),
# Line 756 | Line 877 | OSUAnalysis::analyze (const edm::Event &
877      }//end loop over all cuts
878      //use cumulative flags to apply cuts at event level
879  
759 –    bool eventPassedAllCuts = true;
880      //a vector to store cumulative cut descisions after each cut.
881      vector<bool> eventPassedPreviousCuts;
882 +    bool eventPassedAllCuts = true;
883      //apply trigger (true if none were specified)
884      eventPassedAllCuts = eventPassedAllCuts && triggerDecision;
885  
765 –
886      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
887  
888        //loop over all objects and count how many passed the cumulative selection up to this point
# Line 770 | Line 890 | OSUAnalysis::analyze (const edm::Event &
890        int numberPassing = 0;
891  
892        for (uint object = 0; object != cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).size() ; object++){
893 <        if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object)) numberPassing++;
893 >        if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object).first) numberPassing++;
894        }
895        bool cutDecision = evaluateComparison(numberPassing,currentCut.eventComparativeOperator,currentCut.numberRequired);
896        cutFlows_.at(currentChannelIndex)->at (currentCut.name) = cutDecision;
# Line 779 | Line 899 | OSUAnalysis::analyze (const edm::Event &
899      }
900      double scaleFactor = masterScaleFactor;
901  
902 <    muonScaleFactor_ = electronScaleFactor_ = 1.0;
902 >    muonScaleFactor_ = electronScaleFactor_ = bTagScaleFactor_ = 1.0;
903      if(applyLeptonSF_ && datasetType_ != "data"){
904        if(cumulativeFlags.find ("muons") != cumulativeFlags.end ()){
905 <        vector<bool> muonFlags;
905 >        flagPair muonFlags;
906          for (int i = cumulativeFlags.at("muons").size() - 1; i >= 0; i--){
907            if (cumulativeFlags.at("muons").at(i).size()){
908              muonFlags = cumulativeFlags.at("muons").at(i);
# Line 790 | Line 910 | OSUAnalysis::analyze (const edm::Event &
910            }
911          }
912          for (uint muonIndex = 0; muonIndex != muonFlags.size(); muonIndex++){
913 <          if(!muonFlags.at(muonIndex)) continue;
913 >          if(!muonFlags.at(muonIndex).second) continue;
914            muonScaleFactor_ *= muonSFWeight_->at (muons->at(muonIndex).eta);
915          }
916        }
917        if(cumulativeFlags.find ("electrons") != cumulativeFlags.end ()){
918 <        vector<bool> electronFlags;
918 >        flagPair electronFlags;
919          for (int i = cumulativeFlags.at("electrons").size() - 1; i >= 0; i--){
920            if (cumulativeFlags.at("electrons").at(i).size()){
921              electronFlags = cumulativeFlags.at("electrons").at(i);
# Line 803 | Line 923 | OSUAnalysis::analyze (const edm::Event &
923            }
924          }
925          for (uint electronIndex = 0; electronIndex != electronFlags.size(); electronIndex++){
926 <          if(!electronFlags.at(electronIndex)) continue;
926 >          if(!electronFlags.at(electronIndex).second) continue;
927            electronScaleFactor_ *= electronSFWeight_->at (electrons->at(electronIndex).eta, electrons->at(electronIndex).pt);
928          }
929        }
930      }
931 +    if(applyBtagSF_ && datasetType_ != "data"){
932 +     if(cumulativeFlags.find ("jets") != cumulativeFlags.end ()){
933 +       flagPair jetFlags;
934 +        vector<double> jetSFs;
935 +        for (int i = cumulativeFlags.at("jets").size() - 1; i >= 0; i--){
936 +          if (cumulativeFlags.at("jets").at(i).size()){
937 +            jetFlags = cumulativeFlags.at("jets").at(i);
938 +            break;
939 +          }
940 +        }
941 +        for (uint jetIndex = 0; jetIndex != jetFlags.size(); jetIndex++){
942 +          if(!jetFlags.at(jetIndex).second) continue;
943 +          double jetSFTmp = bTagSFWeight_->sflookup(jets->at(jetIndex).btagCombinedSecVertex, jets->at(jetIndex).pt, jets->at(jetIndex).flavour);
944 +          jetSFs.push_back(jetSFTmp);
945 +        }
946 +        bTagScaleFactor_ *= bTagSFWeight_->weight( jetSFs, minBtag_, maxBtag_ );
947 +      }
948 +    }
949      scaleFactor *= muonScaleFactor_;
950      scaleFactor *= electronScaleFactor_;
951 <
951 >    scaleFactor *= bTagScaleFactor_;
952      cutFlows_.at(currentChannelIndex)->fillCutFlow(scaleFactor);
953  
816 –
954      if (printEventInfo_) {
955        // Write information about event to screen, for testing purposes.
956        cout << "Event passed all cuts in channel " <<  currentChannel.name
# Line 824 | Line 961 | OSUAnalysis::analyze (const edm::Event &
961      }
962  
963  
827 –
964      //filling histograms
965      for(uint currentCut = 0; currentCut != oneDHists_.at(currentChannelIndex).size(); currentCut++){//loop over all the directories in each channel.
830 –
966        uint currentDir;
967 <      if(!GetPlotsAfterEachCut_){ currentDir =  currentChannel.cuts.size() - oneDHists_.at(currentChannelIndex).size();}//if GetPlotsAfterEachCut_ is true, set currentDir point to the last cut.
968 <      else currentDir = currentCut;
967 >      if (!GetPlotsAfterEachCut_) { currentDir =  currentChannel.cuts.size() - oneDHists_.at(currentChannelIndex).size(); } //if GetPlotsAfterEachCut_ is false, set currentDir point to the last cut.
968 >      else{
969 >        currentDir = currentCut;
970 >      }
971  
835 –      if(!eventPassedPreviousCuts.at(currentDir)) continue;
972  
973 +      if(eventPassedPreviousCuts.at(currentDir)){
974  
975 <      for (uint histogramIndex = 0; histogramIndex != histograms.size(); histogramIndex++){
976 <        histogram currentHistogram = histograms.at(histogramIndex);
975 >        for (uint histogramIndex = 0; histogramIndex != histograms.size(); histogramIndex++){
976 >          histogram currentHistogram = histograms.at(histogramIndex);
977  
978 <        if(currentHistogram.inputVariables.size() == 1){
979 <          TH1D* histo;
980 <          histo = oneDHists_.at(currentChannelIndex).at(currentCut).at(currentHistogram.name);
981 <
982 <          if     (currentHistogram.inputCollection == "jets")            fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
983 <          else if(currentHistogram.inputCollection == "secondary jets")  fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
984 <          else if(currentHistogram.inputCollection == "muons")           fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
985 <          else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
986 <          else if(currentHistogram.inputCollection == "secondary electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
987 <          else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
988 <                                                                                         cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
989 <                                                                                         cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
990 <          else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
991 <                                                                                                   cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary muons").at(currentDir), \
992 <                                                                                                   cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
993 <          else if(currentHistogram.inputCollection == "electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
994 <          else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
995 <                                                                                                 cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("electrons").at(currentDir), \
996 <                                                                                                 cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
997 <          else if(currentHistogram.inputCollection == "jet-jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
998 <                                                                                       cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
999 <                                                                                       cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1000 <          else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1001 <                                                                                                           cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary electrons").at(currentDir), \
1002 <                                                                                                           cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1003 <          else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(), \
1004 <                                                                                             cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("muons").at(currentDir),
1005 <                                                                                             cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1006 <          else if(currentHistogram.inputCollection == "electron-jet pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),jets.product(), \
1007 <                                                                                            cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1008 <                                                                                            cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1009 <          else if(currentHistogram.inputCollection == "muon-jet pairs") fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(), \
1010 <                                                                                        cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1011 <                                                                                        cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1012 <          else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),
1013 <                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1014 <                                                                                              cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1015 <          else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),
1016 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1017 <                                                                                          cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1018 <          else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),
1019 <                                                                                        cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1020 <                                                                                        cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1021 <          else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),
1022 <                                                                                       cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1023 <                                                                                       cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1024 <          else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
1025 <                                                                                         cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1026 <                                                                                         cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1027 <          else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),trigobjs.product(),
1028 <                                                                                                cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1029 <                                                                                                cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1030 <          else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill1DHistogram(histo,currentHistogram, muons.product(),trigobjs.product(),
1031 <                                                                                            cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1032 <                                                                                            cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1033 <          
1034 <          else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
1035 <          else if(currentHistogram.inputCollection == "taus") fill1DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").at(currentDir),scaleFactor);
1036 <          else if(currentHistogram.inputCollection == "mets") fill1DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").at(currentDir),scaleFactor);
1037 <          else if(currentHistogram.inputCollection == "tracks") fill1DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").at(currentDir),scaleFactor);
1038 <          else if(currentHistogram.inputCollection == "genjets") fill1DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").at(currentDir),scaleFactor);
1039 <          else if(currentHistogram.inputCollection == "mcparticles") fill1DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").at(currentDir),scaleFactor);
1040 <          else if(currentHistogram.inputCollection == "primaryvertexs") fill1DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").at(currentDir),scaleFactor);
1041 <          else if(currentHistogram.inputCollection == "bxlumis") fill1DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").at(currentDir),scaleFactor);
1042 <          else if(currentHistogram.inputCollection == "photons") fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").at(currentDir),scaleFactor);
1043 <          else if(currentHistogram.inputCollection == "superclusters") fill1DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").at(currentDir),scaleFactor);
1044 <          else if(currentHistogram.inputCollection == "trigobjs") fill1DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").at(currentDir),scaleFactor);
1045 <          else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill1DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").at(currentDir),scaleFactor);
1046 <        }
1047 <        else if(currentHistogram.inputVariables.size() == 2){
1048 <          TH2D* histo;
1049 <          histo = twoDHists_.at(currentChannelIndex).at(currentCut).at(currentHistogram.name);
1050 <
1051 <          if     (currentHistogram.inputCollection == "jets")            fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
1052 <          else if(currentHistogram.inputCollection == "secondary jets")  fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
1053 <          else if(currentHistogram.inputCollection == "muons")           fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
1054 <          else if(currentHistogram.inputCollection == "secondary muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1055 <          else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1056 <                                                                                         cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
1057 <                                                                                         cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
1058 <          else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1059 <                                                                                                   cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary muons").at(currentDir), \
1060 <                                                                                                   cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
1061 <          else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
1062 <          else if(currentHistogram.inputCollection == "secondary electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
1063 <          else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1064 <                                                                                                 cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("electrons").at(currentDir), \
1065 <                                                                                                 cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
1066 <          else if(currentHistogram.inputCollection == "jet-jet pairs") fill2DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
1067 <                                                                                       cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1068 <                                                                                       cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1069 <          else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1070 <                                                                                                           cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary electrons").at(currentDir), \
1071 <                                                                                                           cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1072 <          else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(), \
1073 <                                                                                             cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
1074 <                                                                                             cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1075 <          else if(currentHistogram.inputCollection == "electron-jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
1076 <                                                                                            cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1077 <                                                                                            cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1078 <          else if(currentHistogram.inputCollection == "muon-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
1079 <                                                                                        cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1080 <                                                                                        cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1081 <          else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),
1082 <                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1083 <                                                                                              cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1084 <          else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),
1085 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1086 <                                                                                          cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1087 <          else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),
1088 <                                                                                        cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1089 <                                                                                        cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1090 <          else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),
1091 <                                                                                       cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1092 <                                                                                       cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1093 <          else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
1094 <                                                                                         cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1095 <                                                                                         cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1096 <          else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),trigobjs.product(),
1097 <                                                                                                cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1098 <                                                                                                cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1099 <          else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill2DHistogram(histo,currentHistogram,muons.product(),trigobjs.product(),
1100 <                                                                                            cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1101 <                                                                                            cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1102 <          else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
1103 <          else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").at(currentDir),scaleFactor);
1104 <          else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").at(currentDir),scaleFactor);
1105 <          else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").at(currentDir),scaleFactor);
1106 <          else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
1107 <                                                                                           cumulativeFlags.at("tracks").at(currentDir),cumulativeFlags.at("events").at(currentDir),
1108 <                                                                                           cumulativeFlags.at("track-event pairs").at(currentDir),scaleFactor);
1109 <          else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").at(currentDir),scaleFactor);
1110 <          else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").at(currentDir),scaleFactor);
1111 <          else if(currentHistogram.inputCollection == "primaryvertexs") fill2DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").at(currentDir),scaleFactor);
1112 <          else if(currentHistogram.inputCollection == "bxlumis") fill2DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").at(currentDir),scaleFactor);
1113 <          else if(currentHistogram.inputCollection == "photons") fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").at(currentDir),scaleFactor);
1114 <          else if(currentHistogram.inputCollection == "superclusters") fill2DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").at(currentDir),scaleFactor);
1115 <          else if(currentHistogram.inputCollection == "trigobjs") fill2DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").at(currentDir),scaleFactor);
1116 <          else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill2DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").at(currentDir),scaleFactor);
1117 <        }
1118 <      }
978 >          if (cumulativeFlags.count(currentHistogram.inputCollection) == 0) cout << "Error: no flags found for collection:  " << currentHistogram.inputCollection << ", will cause a seg fault" << endl;
979 >
980 >          if(currentHistogram.inputVariables.size() == 1){
981 >            TH1D* histo;
982 >            histo = oneDHists_.at(currentChannelIndex).at(currentCut).at(currentHistogram.name);
983 >            if     (currentHistogram.inputCollection == "jets")            fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
984 >            else if(currentHistogram.inputCollection == "secondary jets")  fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
985 >            else if(currentHistogram.inputCollection == "muons")           fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
986 >            else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
987 >            else if(currentHistogram.inputCollection == "secondary electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
988 >            else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
989 >                                                                                           cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
990 >                                                                                           cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
991 >            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
992 >                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary muons").at(currentDir), \
993 >                                                                                                     cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
994 >             else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
995 >                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
996 >                                                                                                     cumulativeFlags.at("muon-secondary jet pairs").at(currentDir),scaleFactor);
997 >             else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,photons.product(),jets.product(), \
998 >                                                                                                     cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
999 >                                                                                                     cumulativeFlags.at("photon-secondary jet pairs").at(currentDir),scaleFactor);
1000 >             else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
1001 >                                                                                                     cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1002 >                                                                                                     cumulativeFlags.at("electron-secondary jet pairs").at(currentDir),scaleFactor);
1003 >
1004 >            else if(currentHistogram.inputCollection == "electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
1005 >            else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),\
1006 >                                                                                                   cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("electrons").at(currentDir),\
1007 >                                                                                                   cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
1008 >            else if(currentHistogram.inputCollection == "jet-jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),\
1009 >                                                                                         cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("jets").at(currentDir),\
1010 >                                                                                         cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1011 >             else if(currentHistogram.inputCollection == "jet-secondary jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
1012 >                                                                                                     cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1013 >                                                                                                     cumulativeFlags.at("jet-secondary jet pairs").at(currentDir),scaleFactor);
1014 >
1015 >            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1016 >                                                                                                             cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary electrons").at(currentDir), \
1017 >                                                                                                             cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1018 >            else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(), \
1019 >                                                                                               cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("muons").at(currentDir),
1020 >                                                                                               cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1021 >            else if(currentHistogram.inputCollection == "electron-jet pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),jets.product(), \
1022 >                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1023 >                                                                                              cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1024 >            else if(currentHistogram.inputCollection == "photon-jet pairs") fill1DHistogram(histo,currentHistogram, photons.product(),jets.product(), \
1025 >                                                                                              cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1026 >                                                                                              cumulativeFlags.at("photon-jet pairs").at(currentDir),scaleFactor);
1027 >            else if(currentHistogram.inputCollection == "muon-jet pairs") fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(), \
1028 >                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1029 >                                                                                          cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1030 >            else if(currentHistogram.inputCollection == "met-jet pairs")  fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(), \
1031 >                                                                                          cumulativeFlags.at("mets").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1032 >                                                                                          cumulativeFlags.at("met-jet pairs").at(currentDir),scaleFactor);
1033 >            else if(currentHistogram.inputCollection == "muon-photon pairs") fill1DHistogram(histo,currentHistogram, muons.product(),photons.product(), \
1034 >                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("photons").at(currentDir),
1035 >                                                                                          cumulativeFlags.at("muon-photon pairs").at(currentDir),scaleFactor);
1036 >            else if(currentHistogram.inputCollection == "electron-photon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),photons.product(), \
1037 >                                                                                          cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("photons").at(currentDir),
1038 >                                                                                          cumulativeFlags.at("electron-photon pairs").at(currentDir),scaleFactor);
1039 >            else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),
1040 >                                                                                                cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1041 >                                                                                                cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1042 >            else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),
1043 >                                                                                            cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1044 >                                                                                            cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1045 >            else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),
1046 >                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1047 >                                                                                          cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1048 >            else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),
1049 >                                                                                         cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1050 >                                                                                         cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1051 >            else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
1052 >                                                                                           cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1053 >                                                                                           cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1054 >            else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),trigobjs.product(),
1055 >                                                                                                  cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1056 >                                                                                                  cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1057 >            else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill1DHistogram(histo,currentHistogram, muons.product(),trigobjs.product(),
1058 >                                                                                              cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1059 >                                                                                              cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1060 >
1061 >            else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
1062 >            else if(currentHistogram.inputCollection == "taus") fill1DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").at(currentDir),scaleFactor);
1063 >            else if(currentHistogram.inputCollection == "mets") fill1DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").at(currentDir),scaleFactor);
1064 >            else if(currentHistogram.inputCollection == "tracks") fill1DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").at(currentDir),scaleFactor);
1065 >            else if(currentHistogram.inputCollection == "genjets") fill1DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").at(currentDir),scaleFactor);
1066 >            else if(currentHistogram.inputCollection == "mcparticles") fill1DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").at(currentDir),scaleFactor);
1067 >            else if(currentHistogram.inputCollection == "primaryvertexs") fill1DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").at(currentDir),scaleFactor);
1068 >            else if(currentHistogram.inputCollection == "bxlumis") fill1DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").at(currentDir),scaleFactor);
1069 >            else if(currentHistogram.inputCollection == "photons") fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").at(currentDir),scaleFactor);
1070 >            else if(currentHistogram.inputCollection == "superclusters") fill1DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").at(currentDir),scaleFactor);
1071 >            else if(currentHistogram.inputCollection == "trigobjs") fill1DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").at(currentDir),scaleFactor);
1072 >            else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill1DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").at(currentDir),scaleFactor);
1073 >          }
1074 >          else if(currentHistogram.inputVariables.size() == 2){
1075 >            TH2D* histo;
1076 >            histo = twoDHists_.at(currentChannelIndex).at(currentCut).at(currentHistogram.name);
1077 >            if     (currentHistogram.inputCollection == "jets")            fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
1078 >            else if(currentHistogram.inputCollection == "secondary jets")  fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
1079 >            else if(currentHistogram.inputCollection == "muons")           fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
1080 >            else if(currentHistogram.inputCollection == "secondary muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1081 >            else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1082 >                                                                                           cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
1083 >                                                                                           cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
1084 >            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1085 >                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary muons").at(currentDir), \
1086 >                                                                                                     cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
1087 >            else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
1088 >                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1089 >                                                                                                     cumulativeFlags.at("muon-secondary jet pairs").at(currentDir),scaleFactor);
1090 >            else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
1091 >                                                                                                     cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1092 >                                                                                                     cumulativeFlags.at("electron-secondary jet pairs").at(currentDir),scaleFactor);
1093 >            else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(), \
1094 >                                                                                                     cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1095 >                                                                                                     cumulativeFlags.at("photon-secondary jet pairs").at(currentDir),scaleFactor);
1096 >            else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
1097 >            else if(currentHistogram.inputCollection == "secondary electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
1098 >            else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1099 >                                                                                                   cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("electrons").at(currentDir), \
1100 >                                                                                                   cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
1101 >            else if(currentHistogram.inputCollection == "jet-jet pairs") fill2DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
1102 >                                                                                         cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1103 >                                                                                         cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1104 >            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1105 >                                                                                                             cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary electrons").at(currentDir), \
1106 >                                                                                                             cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1107 >            else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(), \
1108 >                                                                                               cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
1109 >                                                                                               cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1110 >            else if(currentHistogram.inputCollection == "electron-jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
1111 >                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1112 >                                                                                              cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1113 >            else if(currentHistogram.inputCollection == "electron-photon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),photons.product(), \
1114 >                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("photons").at(currentDir), \
1115 >                                                                                              cumulativeFlags.at("electron-photon pairs").at(currentDir),scaleFactor);
1116 >            else if(currentHistogram.inputCollection == "muon-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
1117 >                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1118 >                                                                                          cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1119 >            else if(currentHistogram.inputCollection == "met-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
1120 >                                                                                         cumulativeFlags.at("mets").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1121 >                                                                                         cumulativeFlags.at("met-jet pairs").at(currentDir),scaleFactor);
1122 >            else if(currentHistogram.inputCollection == "photon-jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(), \
1123 >                                                                                          cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1124 >                                                                                          cumulativeFlags.at("photon-jet pairs").at(currentDir),scaleFactor);
1125 >            else if(currentHistogram.inputCollection == "muon-photon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),photons.product(), \
1126 >                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("photons").at(currentDir), \
1127 >                                                                                          cumulativeFlags.at("muon-photon pairs").at(currentDir),scaleFactor);
1128 >            else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),
1129 >                                                                                                cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1130 >                                                                                                cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1131 >            else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),
1132 >                                                                                            cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1133 >                                                                                            cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1134 >            else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),
1135 >                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1136 >                                                                                          cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1137 >            else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),
1138 >                                                                                         cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1139 >                                                                                         cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1140 >            else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
1141 >                                                                                           cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1142 >                                                                                           cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1143 >            else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),trigobjs.product(),
1144 >                                                                                                  cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1145 >                                                                                                  cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1146 >            else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill2DHistogram(histo,currentHistogram,muons.product(),trigobjs.product(),
1147 >                                                                                              cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1148 >                                                                                              cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1149 >            else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
1150 >            else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").at(currentDir),scaleFactor);
1151 >            else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").at(currentDir),scaleFactor);
1152 >            else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").at(currentDir),scaleFactor);
1153 >            else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
1154 >                                                                                             cumulativeFlags.at("tracks").at(currentDir),cumulativeFlags.at("events").at(currentDir),
1155 >                                                                                             cumulativeFlags.at("track-event pairs").at(currentDir),scaleFactor);
1156 >            else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").at(currentDir),scaleFactor);
1157 >            else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").at(currentDir),scaleFactor);
1158 >            else if(currentHistogram.inputCollection == "primaryvertexs") fill2DHistogram(histo,currentHistogram,primaryvertexs.product(),cumulativeFlags.at("primaryvertexs").at(currentDir),scaleFactor);
1159 >            else if(currentHistogram.inputCollection == "bxlumis") fill2DHistogram(histo,currentHistogram,bxlumis.product(),cumulativeFlags.at("bxlumis").at(currentDir),scaleFactor);
1160 >            else if(currentHistogram.inputCollection == "photons") fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("photons").at(currentDir),scaleFactor);
1161 >            else if(currentHistogram.inputCollection == "superclusters") fill2DHistogram(histo,currentHistogram,superclusters.product(),cumulativeFlags.at("superclusters").at(currentDir),scaleFactor);
1162 >            else if(currentHistogram.inputCollection == "trigobjs") fill2DHistogram(histo,currentHistogram,trigobjs.product(),cumulativeFlags.at("trigobjs").at(currentDir),scaleFactor);
1163 >            else if(currentHistogram.inputCollection == "stops" && datasetType_ == "signalMC") fill2DHistogram(histo,currentHistogram,stops.product(),cumulativeFlags.at("stops").at(currentDir),scaleFactor);
1164 >          }
1165  
1166 <      //fills histograms with the sizes of collections
1166 >        }
1167  
1168 <      for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
1169 <        
1170 <        string currentObject = objectsToPlot.at(currentObjectIndex);
1171 <        string objectToPlot = "";
1172 <        
1173 <        // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().
1174 <        if(currentObject == "muon-muon pairs")                         objectToPlot = "dimuonPairs";
1175 <        else if(currentObject == "electron-electron pairs")            objectToPlot = "dielectronPairs";
1176 <        else if(currentObject == "electron-muon pairs")                objectToPlot = "electronMuonPairs";
1177 <        else if(currentObject == "electron-jet pairs")                 objectToPlot = "electronJetPairs";
1178 <        else if(currentObject == "muon-jet pairs")                     objectToPlot = "muonJetPairs";
1179 <        else if(currentObject == "jet-jet pairs")                      objectToPlot = "dijetPairs";
1180 <        else if(currentObject == "secondary jets")                     objectToPlot = "secondaryJets";
1181 <        else if(currentObject == "electron-track pairs")               objectToPlot = "electronTrackPairs";
1182 <        else if(currentObject == "muon-track pairs")                   objectToPlot = "muonTrackPairs";
1183 <        else if(currentObject == "muon-tau pairs")                     objectToPlot = "muonTauPairs";
1184 <        else if(currentObject == "tau-tau pairs")                      objectToPlot = "ditauPairs";
1185 <        else if(currentObject == "tau-track pairs")                    objectToPlot = "tauTrackPairs";
1186 <        else if(currentObject == "track-event pairs")                  objectToPlot = "trackEventPairs";
1187 <        else if(currentObject == "muon-secondary muon pairs")          objectToPlot = "muonSecondaryMuonPairs";
1188 <        else if(currentObject == "secondary muons")                    objectToPlot = "secondaryMuons";
1189 <        else if(currentObject == "electron-secondary electron pairs")  objectToPlot = "electronSecondaryElectronPairs";
1190 <        else if(currentObject == "secondary electrons")                objectToPlot = "secondaryElectrons";
1191 <        else if(currentObject == "electron-trigobj pairs")             objectToPlot = "electronTrigobjPairs";
1192 <        else if(currentObject == "muon-trigobj pairs")                 objectToPlot = "muonTrigobjPairs";
1193 <        else objectToPlot = currentObject;
1194 <        
1195 <        string tempCurrentObject = objectToPlot;
1196 <        tempCurrentObject.at(0) = toupper(tempCurrentObject.at(0));
1197 <        string histoName = "num" + tempCurrentObject;
1198 <        
1199 <
1200 <        vector<bool> lastCutFlags = cumulativeFlags.at(currentObject).at(currentDir);
1201 <
1202 <        //count the number of objects passing all cuts
1203 <        int numToPlot = 0;
1204 <        for (uint currentFlag = 0; currentFlag != lastCutFlags.size(); currentFlag++){
1205 <          if(lastCutFlags.at(currentFlag)) numToPlot++;
1206 <        }
1207 <
1208 <        if(objectToPlot == "primaryvertexs"){
1209 <          oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
1210 <          oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
1211 <        }
1212 <        else {
1213 <          oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName)->Fill(numToPlot,scaleFactor);
1214 <        }
1215 <      } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++)
1168 >
1169 >        //fills histograms with the sizes of collections
1170 >        for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
1171 >
1172 >          string currentObject = objectsToPlot.at(currentObjectIndex);
1173 >          string objectToPlot = "";
1174 >
1175 >          // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().
1176 >          if(currentObject == "muon-muon pairs")                         objectToPlot = "dimuonPairs";
1177 >          else if(currentObject == "electron-electron pairs")            objectToPlot = "dielectronPairs";
1178 >          else if(currentObject == "electron-muon pairs")                objectToPlot = "electronMuonPairs";
1179 >          else if(currentObject == "electron-photon pairs")              objectToPlot = "electronPhotonPairs";
1180 >          else if(currentObject == "electron-jet pairs")                 objectToPlot = "electronJetPairs";
1181 >          else if(currentObject == "muon-jet pairs")                     objectToPlot = "muonJetPairs";
1182 >          else if(currentObject == "met-jet pairs")                      objectToPlot = "metJetPairs";
1183 >          else if(currentObject == "muon-photon pairs")                  objectToPlot = "muonPhotonPairs";
1184 >          else if(currentObject == "photon-jet pairs")                   objectToPlot = "photonJetPairs";
1185 >          else if(currentObject == "jet-jet pairs")                      objectToPlot = "dijetPairs";
1186 >          else if(currentObject == "jet-secondary jet pairs")            objectToPlot = "jetSecondaryJetPairs";
1187 >          else if(currentObject == "secondary jets")                     objectToPlot = "secondaryJets";
1188 >          else if(currentObject == "electron-track pairs")               objectToPlot = "electronTrackPairs";
1189 >          else if(currentObject == "muon-track pairs")                   objectToPlot = "muonTrackPairs";
1190 >          else if(currentObject == "muon-tau pairs")                     objectToPlot = "muonTauPairs";
1191 >          else if(currentObject == "tau-tau pairs")                      objectToPlot = "ditauPairs";
1192 >          else if(currentObject == "tau-track pairs")                    objectToPlot = "tauTrackPairs";
1193 >          else if(currentObject == "track-event pairs")                  objectToPlot = "trackEventPairs";
1194 >          else if(currentObject == "muon-secondary muon pairs")          objectToPlot = "muonSecondaryMuonPairs";
1195 >          else if(currentObject == "secondary muons")                    objectToPlot = "secondaryMuons";
1196 >          else if(currentObject == "muon-secondary jet pairs")           objectToPlot = "muonSecondaryJetPairs";
1197 >          else if(currentObject == "electron-secondary jet pairs")       objectToPlot = "electronSecondaryJetPairs";
1198 >          else if(currentObject == "photon-secondary jet pairs")         objectToPlot = "photonSecondaryJetPairs";
1199 >          else if(currentObject == "electron-secondary electron pairs")  objectToPlot = "electronSecondaryElectronPairs";
1200 >          else if(currentObject == "secondary electrons")                objectToPlot = "secondaryElectrons";
1201 >          else if(currentObject == "electron-trigobj pairs")             objectToPlot = "electronTrigobjPairs";
1202 >          else if(currentObject == "muon-trigobj pairs")                 objectToPlot = "muonTrigobjPairs";
1203 >          else objectToPlot = currentObject;
1204 >
1205 >          string tempCurrentObject = objectToPlot;
1206 >          tempCurrentObject.at(0) = toupper(tempCurrentObject.at(0));
1207 >          string histoName = "num" + tempCurrentObject;
1208 >
1209 >
1210 >          if(find(objectsToCut.begin(), objectsToCut.end(), currentObject) != objectsToCut.end()) {
1211 >            flagPair lastCutFlags = cumulativeFlags.at(currentObject).at(currentDir);
1212 >            int numToPlot = 0;
1213 >            for (uint currentFlag = 0; currentFlag != lastCutFlags.size(); currentFlag++){
1214 >              if(lastCutFlags.at(currentFlag).second) numToPlot++;
1215 >            }
1216 >
1217 >            if(objectToPlot == "primaryvertexs"){
1218 >              oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName+"BeforePileupCorrection")->Fill(primaryvertexs->size());
1219 >              oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
1220 >            }
1221 >            else {
1222 >              oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName)->Fill(numToPlot,scaleFactor);
1223 >            }
1224 >          }
1225 >        } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++)
1226 >
1227 >
1228 >      } // end if(eventPassedPreviousCuts.at(currentDir))
1229 >    } // end loop over cuts
1230 >
1231 >    if (!useEDMFormat_ && eventPassedAllCuts){
1232 >      // Assign BNTree variables
1233 >      for (uint iBranch = 0; iBranch != treeBranches_.size(); iBranch++) {
1234 >        BranchSpecs brSpecs = treeBranches_.at(iBranch);
1235 >        string coll = brSpecs.inputCollection;
1236 >        if (cumulativeFlags.count(coll) == 0) cout << "Error: no flags found for collection:  " << coll << ", will cause a seg fault" << endl;
1237 >
1238 >        if     (coll == "jets")                assignTreeBranch(brSpecs,jets.product(),          cumulativeFlags.at(coll).back());
1239 >        else if(coll == "secondary jets")      assignTreeBranch(brSpecs,jets.product(),          cumulativeFlags.at(coll).back());
1240 >        else if(coll == "muons")               assignTreeBranch(brSpecs,muons.product(),         cumulativeFlags.at(coll).back());
1241 >        else if(coll == "secondary muons")     assignTreeBranch(brSpecs,muons.product(),         cumulativeFlags.at(coll).back());
1242 >        else if(coll == "electrons")           assignTreeBranch(brSpecs,electrons.product(),     cumulativeFlags.at(coll).back());
1243 >        else if(coll == "secondary electrons") assignTreeBranch(brSpecs,electrons.product(),     cumulativeFlags.at(coll).back());
1244 >        else if(coll == "events")              assignTreeBranch(brSpecs,events.product(),        cumulativeFlags.at(coll).back());
1245 >        else if(coll == "taus")                assignTreeBranch(brSpecs,taus.product(),          cumulativeFlags.at(coll).back());
1246 >        else if(coll == "mets")                assignTreeBranch(brSpecs,mets.product(),          cumulativeFlags.at(coll).back());
1247 >        else if(coll == "tracks")              assignTreeBranch(brSpecs,tracks.product(),        cumulativeFlags.at(coll).back());
1248 >        else if(coll == "genjets")             assignTreeBranch(brSpecs,genjets.product(),       cumulativeFlags.at(coll).back());
1249 >        else if(coll == "mcparticles")         assignTreeBranch(brSpecs,mcparticles.product(),   cumulativeFlags.at(coll).back());
1250 >        else if(coll == "primaryvertexs")      assignTreeBranch(brSpecs,primaryvertexs.product(),cumulativeFlags.at(coll).back());
1251 >        else if(coll == "bxlumis")             assignTreeBranch(brSpecs,bxlumis.product(),       cumulativeFlags.at(coll).back());
1252 >        else if(coll == "photons")             assignTreeBranch(brSpecs,photons.product(),       cumulativeFlags.at(coll).back());
1253 >        else if(coll == "superclusters")       assignTreeBranch(brSpecs,superclusters.product(), cumulativeFlags.at(coll).back());
1254 >        else if(coll == "trigobjs")            assignTreeBranch(brSpecs,trigobjs.product(),      cumulativeFlags.at(coll).back());
1255 >        else if(coll == "stops"
1256 >                && datasetType_ == "signalMC") assignTreeBranch(brSpecs,stops.product(),         cumulativeFlags.at(coll).back());
1257 >      } // end loop over branches
1258 >
1259 >      if (!BNTrees_.at(currentChannelIndex)) { cout << "ERROR:  Undefined BNTree.  Will likely seg fault." << endl; }
1260 >      BNTrees_.at(currentChannelIndex)->Fill();  // only fill if event has passed cuts
1261      }
1262  
1263 <  } //end loop over channel
1263 >    (*channelDecisions)[currentChannel.name] = eventPassedAllCuts;
1264 >
1265 >  } // end loop over channel
1266  
1267    masterCutFlow_->fillCutFlow(masterScaleFactor);
1268  
1269 +  event.put (channelDecisions, "channelDecisions");
1270 +
1271   } // end void OSUAnalysis::analyze (const edm::Event &event, const edm::EventSetup &setup)
1272  
1273  
# Line 1076 | Line 1308 | OSUAnalysis::evaluateTriggers (vector<st
1308    //initialize to false until a chosen trigger is passed
1309    bool triggerDecision = false;
1310  
1311 +  if (printAllTriggers_) cout << "Printing list of all available triggers (which this event may or may not pass):" << endl;
1312    //loop over all triggers defined in the event
1313    for (BNtriggerCollection::const_iterator trigger = triggerCollection->begin (); trigger != triggerCollection->end (); trigger++){
1314  
1315 +    if (printAllTriggers_) cout << "   " << trigger->name << endl;
1316 +
1317      //we're only interested in triggers that actually passed
1318      if(trigger->pass != 1) continue;
1319  
# Line 1089 | Line 1324 | OSUAnalysis::evaluateTriggers (vector<st
1324      //if the event passes one of the chosen triggers, set triggerDecision to true
1325      for(uint triggerName = 0; triggerName != triggersToTest.size(); triggerName++){
1326        if(trigger->name.find(triggersToTest.at(triggerName))!=string::npos) triggerDecision = true;
1327 <    }  
1327 >    }
1328    }
1329 <  //if none of the veto triggers fired:
1329 >
1330 >  printAllTriggers_ = false;  // only print triggers once, not every event
1331 >
1332 >  //if none of the veto triggers fired:
1333    //return the OR of all the chosen triggers
1334    if (triggersToTest.size() != 0) return triggerDecision;
1335    //or if no triggers were defined return true
# Line 1260 | Line 1498 | OSUAnalysis::valueLookup (const BNjet* o
1498    else if(variable == "puJetId_loose_simple") value = object->puJetId_loose_simple;
1499    else if(variable == "puJetId_loose_cutbased") value = object->puJetId_loose_cutbased;
1500  
1501 +  //user defined variable
1502 +  else if(variable == "disappTrkLeadingJetID") {
1503 +    value = object->pt > 110
1504 +      && fabs(object->eta) < 2.4
1505 +      && object->chargedHadronEnergyFraction > 0.2
1506 +      && object->neutralHadronEnergyFraction < 0.7
1507 +      && object->chargedEmEnergyFraction < 0.5
1508 +      && object->neutralEmEnergyFraction < 0.7;
1509 +  }
1510 +
1511 +  else if(variable == "disappTrkSubLeadingJetID") {
1512 +    value = object->pt > 30
1513 +      && fabs(object->eta) < 4.5
1514 +      && object->neutralHadronEnergyFraction < 0.7
1515 +      && object->chargedEmEnergyFraction < 0.5;
1516 +  }
1517 +
1518 +  else if(variable == "dPhiMet") {
1519 +    if (const BNmet *met = chosenMET ()) {
1520 +      value = deltaPhi (object->phi, met->phi);
1521 +    } else value = -999;
1522 +  }
1523 +
1524  
1525    else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
1526  
1527    value = applyFunction(function, value);
1528  
1529    return value;
1530 < }
1530 > } // end jet valueLookup
1531  
1532  
1533   //!muon valueLookup
# Line 1426 | Line 1687 | OSUAnalysis::valueLookup (const BNmuon*
1687    else if(variable == "time_ndof") value = object->time_ndof;
1688  
1689    //user-defined variables
1690 +  else if(variable == "looseID") {
1691 +    value = object->pt > 10 &&
1692 +      (object->isGlobalMuon  > 0 ||
1693 +       object->isTrackerMuon > 0);
1694 +  }
1695    else if(variable == "correctedD0VertexErr") value =  hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1696    else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1697    else if(variable == "detIso") value = (object->trackIsoDR03) / object->pt;
# Line 1553 | Line 1819 | OSUAnalysis::valueLookup (const BNmuon*
1819      value = object->isGlobalMuon > 0                \
1820        && object->isPFMuon > 0                        \
1821        && object->normalizedChi2 < 10                \
1822 <                                  && object->numberOfValidMuonHits > 0        \
1822 >      && object->numberOfValidMuonHits > 0        \
1823        && object->numberOfMatchedStations > 1        \
1824        && fabs(object->correctedD0Vertex) < 0.2        \
1825        && fabs(object->correctedDZ) < 0.5        \
# Line 1564 | Line 1830 | OSUAnalysis::valueLookup (const BNmuon*
1830      value = object->isGlobalMuon > 0                \
1831        && object->isPFMuon > 0                        \
1832        && object->normalizedChi2 < 10                \
1833 <                                  && object->numberOfValidMuonHits > 0        \
1833 >      && object->numberOfValidMuonHits > 0        \
1834        && object->numberOfMatchedStations > 1        \
1835        && object->numberOfValidPixelHits > 0        \
1836        && object->numberOfLayersWithMeasurement > 5;
# Line 1619 | Line 1885 | OSUAnalysis::valueLookup (const BNmuon*
1885      d0Error = hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1886      dzError = hypot (object->tkDZerr, chosenVertex ()->zError);
1887      value = fabs (object->correctedD0Vertex) > 0.2 || fabs (object->correctedDZ) > 0.5
1888 <         || fabs (object->correctedD0Vertex / d0Error) > 99.0
1889 <         || fabs (object->correctedDZ / dzError) > 99.0;
1888 >      || fabs (object->correctedD0Vertex / d0Error) > 99.0
1889 >      || fabs (object->correctedDZ / dzError) > 99.0;
1890      value = (object->isStandAloneMuon && !object->isTrackerMuon && !object->isGlobalMuon) || !value;
1891    }
1892  
# Line 1631 | Line 1897 | OSUAnalysis::valueLookup (const BNmuon*
1897    value = applyFunction(function, value);
1898  
1899    return value;
1900 < }
1900 > } // end muon valueLookup
1901 >
1902  
1903   //!electron valueLookup
1904   double
# Line 1896 | Line 2163 | OSUAnalysis::valueLookup (const BNelectr
2163        }
2164    }
2165  
2166 +  else if(variable == "looseID"){
2167 +    value = object->pt > 10
2168 +      && object->mvaNonTrigV0 > 0;
2169 +      }
2170    else if(variable == "correctedD0VertexInEBPositiveCharge"){
2171      if(fabs(object->eta) < 0.8 && object->charge > 0) value = object->correctedD0Vertex;
2172      else value = -999;
# Line 2019 | Line 2290 | OSUAnalysis::valueLookup (const BNelectr
2290      d0Error = hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
2291      dzError = hypot (object->tkDZerr, chosenVertex ()->zError);
2292      value = fabs (object->correctedD0Vertex) > 0.2 || fabs (object->correctedDZ) > 0.5
2293 <         || fabs (object->correctedD0Vertex / d0Error) > 99.0
2294 <         || fabs (object->correctedDZ / dzError) > 99.0;
2293 >      || fabs (object->correctedD0Vertex / d0Error) > 99.0
2294 >      || fabs (object->correctedDZ / dzError) > 99.0;
2295      value = !value;
2296    }
2297  
# Line 2031 | Line 2302 | OSUAnalysis::valueLookup (const BNelectr
2302    value = applyFunction(function, value);
2303  
2304    return value;
2305 < }
2305 > } // end electron valueLookup
2306 >
2307  
2308   //!event valueLookup
2309   double
# Line 2112 | Line 2384 | OSUAnalysis::valueLookup (const BNevent*
2384    else if(variable == "muonScaleFactor") value = muonScaleFactor_;
2385    else if(variable == "electronScaleFactor") value = electronScaleFactor_;
2386    else if(variable == "stopCTauScaleFactor") value = stopCTauScaleFactor_;
2387 <
2387 >  else if(variable == "bTagScaleFactor") value = bTagScaleFactor_;
2388    else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
2389  
2390    value = applyFunction(function, value);
2391  
2392    return value;
2393 < }
2393 > } // end event valueLookup
2394 >
2395  
2396   //!tau valueLookup
2397   double
# Line 2166 | Line 2439 | OSUAnalysis::valueLookup (const BNtau* o
2439    else if(variable == "HPSdecayModeFinding") value = object->HPSdecayModeFinding;
2440    else if(variable == "leadingTrackValid") value = object->leadingTrackValid;
2441  
2442 <
2442 >  else if (variable == "looseHadronicID") {
2443 >    value = object->pt > 10
2444 >      && object->eta < 2.3
2445 >      && object->HPSbyLooseCombinedIsolationDeltaBetaCorr > 0
2446 >      && object->HPSdecayModeFinding > 0
2447 >      && object->HPSagainstElectronLoose > 0
2448 >      && object->HPSagainstMuonTight > 0;
2449 >  }
2450  
2451    else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2452  
# Line 2218 | Line 2498 | OSUAnalysis::valueLookup (const BNtau* o
2498    value = applyFunction(function, value);
2499  
2500    return value;
2501 < }
2501 > } // end tau valueLookup
2502 >
2503  
2504   //!met valueLookup
2505   double
# Line 2291 | Line 2572 | OSUAnalysis::valueLookup (const BNmet* o
2572    value = applyFunction(function, value);
2573  
2574    return value;
2575 < }
2575 > } // end met valueLookup
2576 >
2577  
2578   //!track valueLookup
2579   double
# Line 2319 | Line 2601 | OSUAnalysis::valueLookup (const BNtrack*
2601    else if(variable == "numValidHits") value = object->numValidHits;
2602    else if(variable == "isHighPurity") value = object->isHighPurity;
2603  
2322 –
2604    //additional BNs info for disappTrks
2605 <  else if(variable == "caloEMDeltaRp3") value = object->caloEMDeltaRp3;
2606 <  else if(variable == "caloHadDeltaRp3") value = object->caloHadDeltaRp3;
2607 <  else if(variable == "caloEMDeltaRp4") value = object->caloEMDeltaRp4;
2608 <  else if(variable == "caloHadDeltaRp4") value = object->caloHadDeltaRp4;
2609 <  else if(variable == "caloEMDeltaRp5") value = object->caloEMDeltaRp5;
2610 <  else if(variable == "caloHadDeltaRp5") value = object->caloHadDeltaRp5;
2611 <  else if(variable == "nTracksRp5") value = object->nTracksRp5;
2612 <  else if(variable == "nHitsMissingOuter") value = object->nHitsMissingOuter;
2332 <  else if(variable == "nHitsMissingInner") value = object->nHitsMissingInner;
2605 >  else if(variable == "caloEMDeltaRp3")     value = object->caloEMDeltaRp3;
2606 >  else if(variable == "caloHadDeltaRp3")    value = object->caloHadDeltaRp3;
2607 >  else if(variable == "caloEMDeltaRp4")     value = object->caloEMDeltaRp4;
2608 >  else if(variable == "caloHadDeltaRp4")    value = object->caloHadDeltaRp4;
2609 >  else if(variable == "caloEMDeltaRp5")     value = object->caloEMDeltaRp5;
2610 >  else if(variable == "caloHadDeltaRp5")    value = object->caloHadDeltaRp5;
2611 >  else if(variable == "nHitsMissingOuter")  value = object->nHitsMissingOuter;
2612 >  else if(variable == "nHitsMissingInner")  value = object->nHitsMissingInner;
2613    else if(variable == "nHitsMissingMiddle") value = object->nHitsMissingMiddle;
2614 <  else if(variable == "depTrkRp5") value = object->depTrkRp5;
2614 >  else if(variable == "depTrkRp3")          value = object->depTrkRp3;
2615 >  else if(variable == "depEcalRp3")         value = object->depEcalRp3;
2616 >  else if(variable == "depHcalRp3")         value = object->depHcalRp3;
2617 >  else if(variable == "depHoRp3")           value = object->depHoRp3;
2618 >  else if(variable == "nTracksRp3")         value = object->nTracksRp3;
2619 >  else if(variable == "trackerVetoPtRp3")   value = object->trackerVetoPtRp3;
2620 >  else if(variable == "emVetoEtRp3")        value = object->emVetoEtRp3;
2621 >  else if(variable == "hadVetoEtRp3")       value = object->hadVetoEtRp3;
2622 >  else if(variable == "hoVetoEtRp3")        value = object->hoVetoEtRp3;
2623 >  else if(variable == "depTrkRp5")          value = object->depTrkRp5;
2624 >  else if(variable == "depEcalRp5")         value = object->depEcalRp5;
2625 >  else if(variable == "depHcalRp5")         value = object->depHcalRp5;
2626 >  else if(variable == "depHoRp5")           value = object->depHoRp5;
2627 >  else if(variable == "nTracksRp5")         value = object->nTracksRp5;
2628 >  else if(variable == "trackerVetoPtRp5")   value = object->trackerVetoPtRp5;
2629 >  else if(variable == "emVetoEtRp5")        value = object->emVetoEtRp5;
2630 >  else if(variable == "hadVetoEtRp5")       value = object->hadVetoEtRp5;
2631 >  else if(variable == "hoVetoEtRp5")        value = object->hoVetoEtRp5;
2632  
2633    //user defined variables
2634    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;
# Line 2364 | Line 2661 | OSUAnalysis::valueLookup (const BNtrack*
2661        pt = object->pt;
2662      value = vz - (vx * px + vy * py)/pt * (pz/pt);
2663    }
2664 +
2665 +
2666    else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
2667  
2668    else if(variable == "genMatchedPdgId"){
# Line 2416 | Line 2715 | OSUAnalysis::valueLookup (const BNtrack*
2715    value = applyFunction(function, value);
2716  
2717    return value;
2718 < }
2718 > } // end track valueLookup
2719 >
2720  
2721   //!genjet valueLookup
2722   double
# Line 2579 | Line 2879 | OSUAnalysis::valueLookup (const BNmcpart
2879    value = applyFunction(function, value);
2880  
2881    return value;
2882 < }
2882 > } // end mcparticle valueLookup
2883 >
2884  
2885   //!primaryvertex valueLookup
2886   double
# Line 2758 | Line 3059 | OSUAnalysis::valueLookup (const BNphoton
3059    value = applyFunction(function, value);
3060  
3061    return value;
3062 < }
3062 > } // end photon valueLookup
3063 >
3064  
3065   //!supercluster valueLookup
3066   double
# Line 2886 | Line 3188 | OSUAnalysis::valueLookup (const BNmuon*
3188    value = applyFunction(function, value);
3189  
3190    return value;
3191 + } // end muon-muon pair valueLookup
3192 +
3193 +
3194 + //!muon-photon pair valueLookup
3195 + double
3196 + OSUAnalysis::valueLookup (const BNmuon* object1, const BNphoton* object2, string variable, string function, string &stringValue){
3197 +
3198 +  double value = 0.0;
3199 +
3200 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3201 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3202 +  else if(variable == "photonEta") value = object2->eta;
3203 +  else if(variable == "muonEta") value = object1->eta;
3204 +  else if(variable == "photonPhi") value = object2->phi;
3205 +  else if(variable == "muonPhi") value = object1->phi;
3206 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3207 +  else if(variable == "photonGenMotherId") value = object2->genMotherId;
3208 +  else if(variable == "muonRelPFdBetaIso") value = (object1->pfIsoR04SumChargedHadronPt + max(0.0, object1->pfIsoR04SumNeutralHadronEt + object1->pfIsoR04SumPhotonEt - 0.5*object1->pfIsoR04SumPUPt)) / object1->pt;
3209 +  else if(variable == "invMass"){
3210 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3211 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3212 +    value = (fourVector1 + fourVector2).M();
3213 +  }
3214 +  else if(variable == "pt"){
3215 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3216 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3217 +    value = (fourVector1 + fourVector2).Pt();
3218 +  }
3219 +  else if(variable == "threeDAngle")
3220 +    {
3221 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3222 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3223 +      value = (threeVector1.Angle(threeVector2));
3224 +    }
3225 +  else if(variable == "alpha")
3226 +    {
3227 +      static const double pi = 3.1415926535897932384626433832795028841971693993751058;
3228 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3229 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3230 +      value = (pi-threeVector1.Angle(threeVector2));
3231 +    }
3232 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3233 +
3234 +  value = applyFunction(function, value);
3235 +
3236 +  return value;
3237 + }
3238 +
3239 + //!electron-photon pair valueLookup
3240 + double
3241 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNphoton* object2, string variable, string function, string &stringValue){
3242 +
3243 +  double value = 0.0;
3244 +
3245 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3246 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3247 +  else if(variable == "photonEta") value = object2->eta;
3248 +  else if(variable == "electronEta") value = object1->eta;
3249 +  else if(variable == "photonPhi") value = object2->phi;
3250 +  else if(variable == "electronPhi") value = object1->phi;
3251 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3252 +  else if(variable == "photonGenMotherId") value = object2->genMotherId;
3253 +  else if(variable == "electronRelPFrhoIso") value = ( object1->chargedHadronIsoDR03 + max(0.0, object1->neutralHadronIsoDR03 + object1->photonIsoDR03 - object1->AEffDr03*object1->rhoPrime) ) / object1->pt;
3254 +  else if(variable == "invMass"){
3255 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3256 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3257 +    value = (fourVector1 + fourVector2).M();
3258 +  }
3259 +  else if(variable == "pt"){
3260 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3261 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3262 +    value = (fourVector1 + fourVector2).Pt();
3263 +  }
3264 +  else if(variable == "threeDAngle")
3265 +    {
3266 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3267 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3268 +      value = (threeVector1.Angle(threeVector2));
3269 +    }
3270 +  else if(variable == "alpha")
3271 +    {
3272 +      static const double pi = 3.1415926535897932384626433832795028841971693993751058;
3273 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3274 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3275 +      value = (pi-threeVector1.Angle(threeVector2));
3276 +    }
3277 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3278 +
3279 +  value = applyFunction(function, value);
3280 +
3281 +  return value;
3282   }
3283  
3284   //!electron-electron pair valueLookup
# Line 2943 | Line 3336 | OSUAnalysis::valueLookup (const BNelectr
3336  
3337    return value;
3338   }
3339 +
3340   //!electron-muon pair valueLookup
3341   double
3342   OSUAnalysis::valueLookup (const BNelectron* object1, const BNmuon* object2, string variable, string function, string &stringValue){
# Line 3007 | Line 3401 | OSUAnalysis::valueLookup (const BNelectr
3401    value = applyFunction(function, value);
3402  
3403    return value;
3404 < }
3404 > } // end electron-muon pair valueLookup
3405 >
3406  
3407   //!electron-jet pair valueLookup
3408   double
# Line 3017 | Line 3412 | OSUAnalysis::valueLookup (const BNelectr
3412  
3413    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3414    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3415 +  else if(variable == "jetEta") value = object2->eta;
3416 +  else if(variable == "jetPhi") value = object2->phi;
3417 +  else if(variable == "electronEta") value = object1->eta;
3418 +  else if(variable == "electronPhi") value = object1->phi;
3419    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3420    else if(variable == "invMass"){
3421      TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
# Line 3044 | Line 3443 | OSUAnalysis::valueLookup (const BNelectr
3443    return value;
3444   }
3445  
3446 + //!photon-jet pair valueLookup
3447 + double
3448 + OSUAnalysis::valueLookup (const BNphoton* object1, const BNjet* object2, string variable, string function, string &stringValue){
3449 +
3450 +  double value = 0.0;
3451 +
3452 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3453 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3454 +  else if(variable == "jetEta") value = object2->eta;
3455 +  else if(variable == "jetPhi") value = object2->phi;
3456 +  else if(variable == "photonEta") value = object1->eta;
3457 +  else if(variable == "photonPhi") value = object1->phi;
3458 +  else if(variable == "photonGenMotherId") value = object1->genMotherId;
3459 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3460 +  else if(variable == "invMass"){
3461 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3462 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3463 +    value = (fourVector1 + fourVector2).M();
3464 +  }
3465 +  else if(variable == "pt"){
3466 +    TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
3467 +    TLorentzVector fourVector2(object2->px, object2->py, object2->pz, object2->energy);
3468 +    value = (fourVector1 + fourVector2).Pt();
3469 +  }
3470 +  else if(variable == "threeDAngle")
3471 +    {
3472 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3473 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3474 +      value = (threeVector1.Angle(threeVector2));
3475 +    }
3476 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3477 +  value = applyFunction(function, value);
3478 +
3479 +  return value;
3480 + }
3481 +
3482 + // met-jet pair valueLookup
3483 + double
3484 + OSUAnalysis::valueLookup (const BNmet* object1, const BNjet* object2, string variable, string function, string &stringValue){
3485 +
3486 +  double value = 0.0;
3487 +
3488 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3489 +
3490 +  else{cout << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3491 +  value = applyFunction(function, value);
3492 +
3493 +  return value;
3494 +
3495 + }  
3496 +
3497 +
3498 +
3499   //!muon-jet pair valueLookup
3500   double
3501   OSUAnalysis::valueLookup (const BNmuon* object1, const BNjet* object2, string variable, string function, string &stringValue){
# Line 3051 | Line 3503 | OSUAnalysis::valueLookup (const BNmuon*
3503    double value = 0.0;
3504  
3505    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3506 <  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3506 >  else if(variable == "jetEta") value = object2->eta;
3507 >  else if(variable == "jetPhi") value = object2->phi;
3508 >  else if(variable == "muonEta") value = object1->eta;
3509 >  else if(variable == "muonPhi") value = object1->phi;
3510 >  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);          
3511    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3512    else if(variable == "invMass"){
3513      TLorentzVector fourVector1(object1->px, object1->py, object1->pz, object1->energy);
# Line 3078 | Line 3534 | OSUAnalysis::valueLookup (const BNmuon*
3534  
3535    return value;
3536   }
3081 –
3537   //!jet-jet pair valueLookup
3538   double
3539   OSUAnalysis::valueLookup (const BNjet* object1, const BNjet* object2, string variable, string function, string &stringValue){
# Line 3114 | Line 3569 | OSUAnalysis::valueLookup (const BNjet* o
3569  
3570    return value;
3571   }
3572 +
3573   //!electron-track pair valueLookup
3574   double
3575   OSUAnalysis::valueLookup (const BNelectron* object1, const BNtrack* object2, string variable, string function, string &stringValue){
# Line 3381 | Line 3837 | OSUAnalysis::valueLookup (const BNstop*
3837      for(BNprimaryvertexCollection::const_iterator vertex = primaryvertexs->begin (); vertex != primaryvertexs->end (); vertex++){
3838        vertex_rank++;
3839        int dist = sqrt((object->vx-vertex->x)*(object->vx-vertex->x) + \
3840 <                   (object->vy-vertex->y)*(object->vy-vertex->y) + \
3841 <                   (object->vz-vertex->z)*(object->vz-vertex->z));
3840 >                      (object->vy-vertex->y)*(object->vy-vertex->y) + \
3841 >                      (object->vz-vertex->z)*(object->vz-vertex->z));
3842  
3843        if(abs(dist) < abs(minDistToVertex)){
3844          value = vertex_rank;
# Line 3400 | Line 3856 | OSUAnalysis::valueLookup (const BNstop*
3856  
3857    return value;
3858  
3859 < }
3859 > } // end stop valueLookup
3860 >
3861  
3862  
3863  
# Line 3546 | Line 4003 | void OSUAnalysis::setObjectFlags(cut &cu
4003      string obj1, obj2;
4004      getTwoObjs(currentCut.inputCollection, obj1, obj2);
4005      if (inputType==obj1 ||
4006 <          inputType==obj2) {
4006 >        inputType==obj2) {
4007        // Do not add a cut to individualFlags or cumulativeFlags, if the cut is on a paired collection,
4008        // and the inputType is a member of the pair.
4009        // The cut will instead be applied when the setObjectFlags() is called for the paired collection.
# Line 3558 | Line 4015 | void OSUAnalysis::setObjectFlags(cut &cu
4015  
4016    for (uint object = 0; object != inputCollection->size(); object++){
4017  
4018 <    bool decision = true;//object passes if this cut doesn't cut on that type of object
4018 >    bool cutDecision = true;//object passes if this cut doesn't cut on that type of object
4019 >    bool plotDecision = true;
4020  
4021      if(currentCut.inputCollection == inputType){
4022  
# Line 3570 | Line 4028 | void OSUAnalysis::setObjectFlags(cut &cu
4028          else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
4029  
4030        }
4031 <      if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
4031 >      if(currentCut.numSubcuts == 1) cutDecision = subcutDecisions.at(0);
4032        else{
4033          bool tempDecision = true;
4034          for( int subcutIndex = 0;subcutIndex != currentCut.numSubcuts-1; subcutIndex++){
# Line 3579 | Line 4037 | void OSUAnalysis::setObjectFlags(cut &cu
4037            else if(currentCut.logicalOperators.at(subcutIndex) == "|"|| currentCut.logicalOperators.at(subcutIndex) == "||")
4038              tempDecision = subcutDecisions.at(subcutIndex) || subcutDecisions.at(subcutIndex+1);
4039          }
4040 <        decision = tempDecision;
4040 >        cutDecision = tempDecision;
4041        }
4042 +      //invert the cut for plotting if this cut is a veto
4043 +      if(currentCut.isVeto) plotDecision = !cutDecision;
4044 +      else plotDecision = cutDecision;
4045      }
4046  
4047 <    individualFlags.at(inputType).at(currentCutIndex).push_back(decision);
4047 >    individualFlags.at(inputType).at(currentCutIndex).push_back(make_pair(cutDecision,plotDecision));
4048  
4049 <    //set flags for objects that pass each cut AND all the previous cuts
4050 <    bool previousCumulativeFlag = true;
4049 >    //set flags for objects that pass this cut AND all the previous cuts
4050 >    bool previousCumulativeCutFlag = true;
4051      for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4052 <      if(previousCumulativeFlag && individualFlags.at(inputType).at(previousCutIndex).at(object)) previousCumulativeFlag = true;
4053 <      else{ previousCumulativeFlag = false; break;}
4052 >      if(previousCumulativeCutFlag && individualFlags.at(inputType).at(previousCutIndex).at(object).first) previousCumulativeCutFlag = true;
4053 >      else{ previousCumulativeCutFlag = false; break;}
4054      }
4055 <    cumulativeFlags.at(inputType).at(currentCutIndex).push_back(previousCumulativeFlag && decision);
4055 >    previousCumulativeCutFlag = previousCumulativeCutFlag && cutDecision;
4056 >    bool previousCumulativePlotFlag = true;
4057 >    for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4058 >      if(previousCumulativePlotFlag && individualFlags.at(inputType).at(previousCutIndex).at(object).second) previousCumulativePlotFlag = true;
4059 >      else{ previousCumulativePlotFlag = false; break;}
4060 >    }
4061 >    previousCumulativePlotFlag = previousCumulativePlotFlag && plotDecision;
4062 >
4063 >    cumulativeFlags.at(inputType).at(currentCutIndex).push_back(make_pair(previousCumulativeCutFlag,previousCumulativePlotFlag));
4064  
4065    }
4066  
# Line 3600 | Line 4069 | void OSUAnalysis::setObjectFlags(cut &cu
4069  
4070   template <class InputCollection1, class InputCollection2>
4071   void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, \
4072 <                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, string inputType){
4072 >                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, flagPair flags1, flagPair flags2, string inputType){
4073  
4074  
4075    bool sameObjects = false;
# Line 3616 | Line 4085 | void OSUAnalysis::setObjectFlags(cut &cu
4085    // Set them to true later, if any paired object passes (in which case both of its constituents should pass).
4086    if (currentCut.inputCollection == inputType) {
4087      for (uint object1 = 0; object1 != inputCollection1->size(); object1++) {
4088 <      individualFlags.at(obj1Type).at(currentCutIndex).push_back(false);
4089 <      cumulativeFlags.at(obj1Type).at(currentCutIndex).push_back(false);
4088 >      individualFlags.at(obj1Type).at(currentCutIndex).push_back(make_pair(false,false));
4089 >      cumulativeFlags.at(obj1Type).at(currentCutIndex).push_back(make_pair(false,false));
4090      }
4091      if (isTwoTypesOfObject) { // Only initialize the second object if it is different from the first.
4092        for (uint object2 = 0; object2 != inputCollection2->size(); object2++)  {
4093 <        individualFlags.at(obj2Type).at(currentCutIndex).push_back(false);
4094 <        cumulativeFlags.at(obj2Type).at(currentCutIndex).push_back(false);
4093 >        individualFlags.at(obj2Type).at(currentCutIndex).push_back(make_pair(false,false));
4094 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).push_back(make_pair(false,false));
4095        }
4096      }
4097    }
# Line 3635 | Line 4104 | void OSUAnalysis::setObjectFlags(cut &cu
4104        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
4105  
4106  
4107 <      bool decision = true;//object passes if this cut doesn't cut on that type of object
4107 >      bool cutDecision = true;//object passes if this cut doesn't cut on that type of object
4108 >      bool plotDecision = true;
4109  
4110        if(currentCut.inputCollection == inputType){
4111  
# Line 3647 | Line 4117 | void OSUAnalysis::setObjectFlags(cut &cu
4117            else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
4118          }
4119  
4120 <        if(currentCut.numSubcuts == 1) decision = subcutDecisions.at(0);
4120 >        if(currentCut.numSubcuts == 1) cutDecision = subcutDecisions.at(0);
4121          else{
4122            bool tempDecision = subcutDecisions.at(0);
4123            for( int subcutIndex = 1; subcutIndex < currentCut.numSubcuts; subcutIndex++){
# Line 3656 | Line 4126 | void OSUAnalysis::setObjectFlags(cut &cu
4126              else if(currentCut.logicalOperators.at(subcutIndex-1) == "|"|| currentCut.logicalOperators.at(subcutIndex-1) == "||")
4127                tempDecision = tempDecision || subcutDecisions.at(subcutIndex);
4128            }
4129 <          decision = tempDecision;
4129 >          cutDecision = tempDecision;
4130          }
4131 +        //invert the cut for plotting if this cut is a veto
4132 +        if(currentCut.isVeto) plotDecision = !cutDecision;
4133 +        else plotDecision = cutDecision;
4134 +      }
4135 +      individualFlags.at(inputType).at(currentCutIndex).push_back(make_pair(cutDecision,plotDecision));
4136 +      if (cutDecision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4137 +        individualFlags.at(obj1Type).at(currentCutIndex).at(object1).first = true;
4138 +        individualFlags.at(obj2Type).at(currentCutIndex).at(object2).first = true;
4139 +      }
4140 +      if (plotDecision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4141 +        individualFlags.at(obj1Type).at(currentCutIndex).at(object1).second = true;
4142 +        individualFlags.at(obj2Type).at(currentCutIndex).at(object2).second = true;
4143        }
4144 <      // if (decision) isPassObj1.at(object1) = true;
4145 <      // if (decision) isPassObj2.at(object2) = true;
4146 <      individualFlags.at(inputType).at(currentCutIndex).push_back(decision);
4147 <      if (decision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4148 <        individualFlags.at(obj1Type).at(currentCutIndex).at(object1) = true;
4149 <        individualFlags.at(obj2Type).at(currentCutIndex).at(object2) = true;
4144 >
4145 >      //set flags for objects that pass this cut AND all the previous cuts
4146 >      bool previousCumulativeCutFlag = true;
4147 >      for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4148 >        if(previousCumulativeCutFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter).first) previousCumulativeCutFlag = true;
4149 >        else{ previousCumulativeCutFlag = false; break;}
4150        }
4151 +      previousCumulativeCutFlag = previousCumulativeCutFlag && cutDecision;
4152  
4153 <      //set flags for objects that pass each cut AND all the previous cuts
3671 <      bool previousCumulativeFlag = true;
4153 >      bool previousCumulativePlotFlag = true;
4154        for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4155 <        if(previousCumulativeFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter)) previousCumulativeFlag = true;
4156 <        else{ previousCumulativeFlag = false; break;}
4155 >        if(previousCumulativePlotFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter).second) previousCumulativePlotFlag = true;
4156 >        else{ previousCumulativePlotFlag = false; break;}
4157        }
4158 +      previousCumulativePlotFlag = previousCumulativePlotFlag && plotDecision;
4159 +      
4160        //apply flags for the components of the composite object as well
4161 <      bool currentCumulativeFlag = true;
4162 <      if(flags1.size() == 0 && flags2.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision;
4163 <      else if(flags1.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision && flags2.at(object2);
4164 <      else if(flags2.size() == 0) currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1);
4165 <      else currentCumulativeFlag = previousCumulativeFlag && decision && flags1.at(object1) && flags2.at(object2);
4166 <      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(currentCumulativeFlag);
4167 <      if (currentCumulativeFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4168 <        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1);
4169 <        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2) = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2);
4161 >      bool currentCumulativeCutFlag = true;
4162 >      bool currentCumulativePlotFlag = true;
4163 >
4164 >      if(flags1.size() == 0 && flags2.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag;
4165 >      else if(flags1.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag && flags2.at(object2).first;
4166 >      else if(flags2.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag && flags1.at(object1).first;
4167 >      else currentCumulativeCutFlag = previousCumulativeCutFlag && flags1.at(object1).first && flags2.at(object2).first;
4168 >
4169 >      if(flags1.size() == 0 && flags2.size() == 0) currentCumulativePlotFlag = previousCumulativePlotFlag;
4170 >      else if(flags1.size() == 0) currentCumulativePlotFlag = previousCumulativePlotFlag && flags2.at(object2).second;
4171 >      else if(flags2.size() == 0) currentCumulativePlotFlag = previousCumulativePlotFlag && flags1.at(object1).second;
4172 >      else currentCumulativePlotFlag = previousCumulativePlotFlag && flags1.at(object1).first && flags2.at(object2).second;
4173 >
4174 >      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(make_pair(currentCumulativeCutFlag,currentCumulativePlotFlag));
4175 >
4176 >      if (currentCumulativeCutFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4177 >        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1).first = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1, "cut");
4178 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2).first = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "cut");
4179        }
4180 +
4181 +      if (currentCumulativePlotFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4182 +        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1).second = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1, "plot");
4183 +        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2).second = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "plot");
4184 +      }
4185 +
4186        counter++;
4187  
4188      } // end   for (uint object2 = 0; object2 != inputCollection2->size(); object2++)
# Line 3692 | Line 4191 | void OSUAnalysis::setObjectFlags(cut &cu
4191   }
4192  
4193  
4194 < bool OSUAnalysis::getPreviousCumulativeFlags(uint currentCutIndex, flagMap &individualFlags, string obj1Type, uint object1) {
4194 > bool OSUAnalysis::getPreviousCumulativeFlags(uint currentCutIndex, flagMap &individualFlags, string obj1Type, uint object1, string flagType) {
4195    // Return true iff for the collection obj1Type, the element with index object1 has individal flags set to true for
4196    // all cuts up to currentCutIndex
4197    bool previousCumulativeFlag = true;
4198    for (uint previousCutIndex = 0; previousCutIndex < currentCutIndex; previousCutIndex++) {
4199 <    if (previousCumulativeFlag && individualFlags.at(obj1Type).at(previousCutIndex).at(object1)) previousCumulativeFlag = true;
4199 >    bool tempFlag = false;
4200 >    if(flagType == "cut") tempFlag = individualFlags.at(obj1Type).at(previousCutIndex).at(object1).first;
4201 >    else if(flagType == "plot") tempFlag = individualFlags.at(obj1Type).at(previousCutIndex).at(object1).second;
4202 >
4203 >    if (previousCumulativeFlag && tempFlag) previousCumulativeFlag = true;
4204      else {
4205        previousCumulativeFlag = false; break;
4206      }
# Line 3706 | Line 4209 | bool OSUAnalysis::getPreviousCumulativeF
4209   }
4210  
4211  
4212 +
4213 +
4214   template <class InputCollection>
4215 < void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double scaleFactor){
4215 > void OSUAnalysis::assignTreeBranch(BranchSpecs parameters, InputCollection inputCollection, flagPair flags){
4216 >  // This function is similar to fill1DHistogram(), but instead of filling a histogram it assigns a value to a variable for the BNTree
4217 >
4218 >  if (BNTreeBranchVals_.count(parameters.name)==0) cout << "Error[assignTreeBranch]:  trying to assign value to " << parameters.name << " that does not have a branch set up.  Will likely seg fault." << endl;
4219 >  for (uint object = 0; object != inputCollection->size(); object++) {
4220 >
4221 >    if (!plotAllObjectsInPassingEvents_ && !flags.at(object).second) continue;
4222 >
4223 >    string inputVariable = parameters.inputVariable;
4224 >    string function = "";
4225 >    string stringValue = "";
4226 >    double value = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
4227 >    BNTreeBranchVals_.at(parameters.name).push_back(value);
4228 >
4229 >  }
4230 > }
4231 >
4232 >
4233 > template <class InputCollection>
4234 > void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection inputCollection, flagPair flags, double scaleFactor){
4235 >
4236  
4237    for (uint object = 0; object != inputCollection->size(); object++){
4238  
4239 <    if(!plotAllObjectsInPassingEvents_ && !flags.at(object)) continue;
4239 >    if(!plotAllObjectsInPassingEvents_ && !flags.at(object).second) continue;
4240  
4241      string currentString = parameters.inputVariables.at(0);
4242      string inputVariable = "";
# Line 3728 | Line 4253 | void OSUAnalysis::fill1DHistogram(TH1* h
4253      string stringValue = "";
4254      double value = valueLookup(&inputCollection->at(object), inputVariable, function, stringValue);
4255      histo->Fill(value,scaleFactor);
4256 +
4257      if (printEventInfo_) {
4258        // Write information about event to screen, for testing purposes.
4259        cout << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << endl;
# Line 3737 | Line 4263 | void OSUAnalysis::fill1DHistogram(TH1* h
4263   }
4264  
4265   template <class InputCollection1, class InputCollection2>
4266 < void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double scaleFactor){
4266 > void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, flagPair flags1, flagPair flags2, flagPair pairFlags, double scaleFactor){
4267  
4268    bool sameObjects = false;
4269    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
# Line 3750 | Line 4276 | void OSUAnalysis::fill1DHistogram(TH1* h
4276  
4277        pairCounter++;
4278        //only take objects which have passed all cuts and pairs which have passed all cuts
4279 <      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1)) continue;
4280 <      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2)) continue;
4281 <      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter)) continue;
4279 >      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1).second) continue;
4280 >      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2).second) continue;
4281 >      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter).second) continue;
4282  
4283        string currentString = parameters.inputVariables.at(0);
4284        string inputVariable = "";
# Line 3777 | Line 4303 | void OSUAnalysis::fill1DHistogram(TH1* h
4303  
4304  
4305   template <class InputCollection>
4306 < void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection inputCollection,vector<bool> flags, double scaleFactor){
4306 > void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection inputCollection, flagPair flags, double scaleFactor){
4307  
4308    for (uint object = 0; object != inputCollection->size(); object++){
4309  
4310 <    if(!plotAllObjectsInPassingEvents_ && !flags.at(object)) continue;
4310 >    if(!plotAllObjectsInPassingEvents_ && !flags.at(object).second) continue;
4311  
4312      string stringValue = "";
4313      string currentString = parameters.inputVariables.at(0);
# Line 3818 | Line 4344 | void OSUAnalysis::fill2DHistogram(TH2* h
4344   }
4345  
4346   template <class InputCollection1, class InputCollection2>
4347 < void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, vector<bool> flags1, vector<bool> flags2, vector<bool> pairFlags, double scaleFactor){
4347 > void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, flagPair flags1, flagPair flags2, flagPair pairFlags, double scaleFactor){
4348  
4349    bool sameObjects = false;
4350    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
# Line 3832 | Line 4358 | void OSUAnalysis::fill2DHistogram(TH2* h
4358        pairCounter++;
4359  
4360        //only take objects which have passed all cuts and pairs which have passed all cuts
4361 <      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1)) continue;
4362 <      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2)) continue;
4363 <      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter)) continue;
4361 >      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1).second) continue;
4362 >      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2).second) continue;
4363 >      if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter).second) continue;
4364  
4365        string stringValue = "";
4366        string currentString = parameters.inputVariables.at(0);
# Line 3994 | Line 4520 | OSUAnalysis::chosenVertex ()
4520   {
4521    const BNprimaryvertex *chosenVertex = 0;
4522    if(cumulativeFlags.find ("primaryvertexs") != cumulativeFlags.end ()){
4523 <    vector<bool> vertexFlags;
4523 >    flagPair vertexFlags;
4524      for (int i = cumulativeFlags.at("primaryvertexs").size() - 1; i >= 0; i--){
4525        if (cumulativeFlags.at("primaryvertexs").at(i).size()){
4526          vertexFlags = cumulativeFlags.at("primaryvertexs").at(i);
# Line 4002 | Line 4528 | OSUAnalysis::chosenVertex ()
4528        }
4529      }
4530      for (uint vertexIndex = 0; vertexIndex != vertexFlags.size(); vertexIndex++){
4531 <      if(!vertexFlags.at(vertexIndex)) continue;
4531 >      if(!vertexFlags.at(vertexIndex).first) continue;
4532        chosenVertex = & primaryvertexs->at(vertexIndex);
4533        break;
4534      }
# Line 4018 | Line 4544 | OSUAnalysis::chosenMET ()
4544   {
4545    const BNmet *chosenMET = 0;
4546    if(cumulativeFlags.find ("mets") != cumulativeFlags.end ()){
4547 <    vector<bool> metFlags;
4547 >    flagPair metFlags;
4548      for (int i = cumulativeFlags.at("mets").size() - 1; i >= 0; i--){
4549        if (cumulativeFlags.at("mets").at(i).size()){
4550          metFlags = cumulativeFlags.at("mets").at(i);
# Line 4026 | Line 4552 | OSUAnalysis::chosenMET ()
4552        }
4553      }
4554      for (uint metIndex = 0; metIndex != metFlags.size(); metIndex++){
4555 <      if(!metFlags.at(metIndex)) continue;
4555 >      if(!metFlags.at(metIndex).first) continue;
4556        chosenMET = & mets->at(metIndex);
4557        break;
4558      }
# Line 4042 | Line 4568 | OSUAnalysis::chosenElectron ()
4568   {
4569    const BNelectron *chosenElectron = 0;
4570    if(cumulativeFlags.find ("electrons") != cumulativeFlags.end ()){
4571 <    vector<bool> electronFlags;
4571 >    flagPair electronFlags;
4572      for (int i = cumulativeFlags.at("electrons").size() - 1; i >= 0; i--){
4573        if (cumulativeFlags.at("electrons").at(i).size()){
4574          electronFlags = cumulativeFlags.at("electrons").at(i);
# Line 4050 | Line 4576 | OSUAnalysis::chosenElectron ()
4576        }
4577      }
4578      for (uint electronIndex = 0; electronIndex != electronFlags.size(); electronIndex++){
4579 <      if(!electronFlags.at(electronIndex)) continue;
4579 >      if(!electronFlags.at(electronIndex).first) continue;
4580        chosenElectron = & electrons->at(electronIndex);
4581        break;
4582      }
# Line 4061 | Line 4587 | OSUAnalysis::chosenElectron ()
4587    return chosenElectron;
4588   }
4589  
4590 +
4591   const BNmuon *
4592   OSUAnalysis::chosenMuon ()
4593   {
4594    const BNmuon *chosenMuon = 0;
4595    if(cumulativeFlags.find ("muons") != cumulativeFlags.end ()){
4596 <    vector<bool> muonFlags;
4596 >    flagPair muonFlags;
4597      for (int i = cumulativeFlags.at("muons").size() - 1; i >= 0; i--){
4598        if (cumulativeFlags.at("muons").at(i).size()){
4599          muonFlags = cumulativeFlags.at("muons").at(i);
# Line 4074 | Line 4601 | OSUAnalysis::chosenMuon ()
4601        }
4602      }
4603      for (uint muonIndex = 0; muonIndex != muonFlags.size(); muonIndex++){
4604 <      if(!muonFlags.at(muonIndex)) continue;
4604 >      if(!muonFlags.at(muonIndex).first) continue;
4605        chosenMuon = & muons->at(muonIndex);
4606        break;
4607      }

Diff Legend

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