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.103 by wulsin, Mon Jul 22 15:27:58 2013 UTC vs.
Revision 1.118 by wulsin, Mon Aug 5 22:00:12 2013 UTC

# Line 3 | Line 3 | OSUAnalysis::OSUAnalysis (const edm::Par
3    // Retrieve parameters from the configuration file.
4    jets_ (cfg.getParameter<edm::InputTag> ("jets")),
5    muons_ (cfg.getParameter<edm::InputTag> ("muons")),
6 +  secMuons_ (cfg.getParameter<edm::InputTag> ("secMuons")),
7    electrons_ (cfg.getParameter<edm::InputTag> ("electrons")),
8    events_ (cfg.getParameter<edm::InputTag> ("events")),
9    taus_ (cfg.getParameter<edm::InputTag> ("taus")),
# Line 38 | Line 39 | OSUAnalysis::OSUAnalysis (const edm::Par
39    printAllTriggers_    (cfg.getParameter<bool> ("printAllTriggers")),
40    useTrackCaloRhoCorr_ (cfg.getParameter<bool> ("useTrackCaloRhoCorr")),
41    stopCTau_ (cfg.getParameter<vector<double> > ("stopCTau")),
42 <  GetPlotsAfterEachCut_ (cfg.getParameter<bool> ("GetPlotsAfterEachCut"))
42 >  GetPlotsAfterEachCut_ (cfg.getParameter<bool> ("GetPlotsAfterEachCut")),
43 >  verbose_ (cfg.getParameter<int> ("verbose"))
44   {
45  
46 <  TH1::SetDefaultSumw2 ();
46 >  if (verbose_) printEventInfo_ = true;  
47 >  if (verbose_) clog << "Beginning OSUAnalysis::OSUAnalysis constructor." << endl;  
48 >
49 >  TH1::SetDefaultSumw2();
50  
51    //create pile-up reweighting object, if necessary
52    if(datasetType_ != "data") {
# Line 55 | Line 60 | OSUAnalysis::OSUAnalysis (const edm::Par
60      }
61    }
62    if (datasetType_ == "signalMC" && regex_match (dataset_, regex ("stop.*to.*_.*mm.*")))
63 <    stopCTauWeight_ = new StopCTauWeight (stopCTau_.at (0), stopCTau_.at (1), stops_);
63 >    stopCTauWeight_ = new StopCTauWeight (stopCTau_.at(0), stopCTau_.at(1), stops_);
64  
65  
66    // Construct Cutflow Objects. These store the results of cut decisions and
# Line 91 | Line 96 | OSUAnalysis::OSUAnalysis (const edm::Par
96        TString newName = TString(br.inputCollection) + "_" + TString(br.inputVariable);
97        br.name = string(newName.Data());
98        treeBranches_.push_back(br);
99 +      if (verbose_>3) clog << "   Adding branch to BNTree: " << br.name << endl;  
100      }
101  
102    } // end   for (uint iBranchSet = 0; iBranchSet<treeBranchSets_.size(); iBranchSet++)
# Line 121 | Line 127 | OSUAnalysis::OSUAnalysis (const edm::Par
127      if(tempInputCollection == "trigobj-muon pairs")   tempInputCollection = "muon-trigobj pairs";
128      if(tempInputCollection.find("pairs")==string::npos){ //just a single object
129        if(tempInputCollection.find("secondary")!=string::npos){//secondary object
130 <        int spaceIndex = tempInputCollection.find(" ");
131 <        int secondWordLength = tempInputCollection.size() - spaceIndex;
132 <        objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
133 <      }
134 <      else{
130 >        if(tempInputCollection.find("secondary muons")!=string::npos){//treat secondary muons differently; allow for a different input collection
131 >          objectsToGet.push_back("secondary muons");  
132 >        } else {
133 >          int spaceIndex = tempInputCollection.find(" ");
134 >          int secondWordLength = tempInputCollection.size() - spaceIndex;
135 >          objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
136 >        }
137 >      } else{
138          objectsToGet.push_back(tempInputCollection);
139        }
140        objectsToPlot.push_back(tempInputCollection);
# Line 145 | Line 154 | OSUAnalysis::OSUAnalysis (const edm::Par
154        objectsToGet.push_back(obj1);
155        objectsToGet.push_back(obj2ToGet);
156      } // end else
157 <      if (find(objectsToPlot.begin(), objectsToPlot.end(), "events") != objectsToPlot.end())
158 <        objectsToGet.push_back("jets");
159 <
160 <
157 >    if (find(objectsToPlot.begin(), objectsToPlot.end(), "events") != objectsToPlot.end())
158 >      objectsToGet.push_back("jets");
159 >    
160 >    
161      vector<edm::ParameterSet> histogramList_  (histogramSets_.at(currentHistogramSet).getParameter<vector<edm::ParameterSet> >("histograms"));
162  
163      for(uint currentHistogram = 0; currentHistogram != histogramList_.size(); currentHistogram++){
# Line 180 | Line 189 | OSUAnalysis::OSUAnalysis (const edm::Par
189    for(uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++){
190  
191      string currentObject = objectsToPlot.at(currentObjectIndex);
192 <    if(currentObject != "muons" && currentObject != "secondary muons" && currentObject != "secondary electrons" && currentObject != "electrons" && currentObject != "taus" && currentObject != "tracks" && currentObject != "photons" && currentObject != "secondary photons"&& currentObject != "superclusters") continue;
192 >    if(currentObject != "muons" &&
193 >       currentObject != "secondary muons" &&
194 >       currentObject != "secondary electrons" &&
195 >       currentObject != "electrons" &&
196 >       currentObject != "taus" &&
197 >       currentObject != "tracks" &&
198 >       currentObject != "photons" &&
199 >       currentObject != "secondary photons"&&
200 >       currentObject != "superclusters")
201 >      continue;
202  
203      histogram tempIdHisto;
204      histogram tempMomIdHisto;
# Line 251 | Line 269 | OSUAnalysis::OSUAnalysis (const edm::Par
269      string channelName  (channels_.at(currentChannel).getParameter<string>("name"));
270      tempChannel.name = channelName;
271      TString channelLabel = channelName;
272 +    if (verbose_) clog << "Processing channel:  " << channelName << endl;  
273  
274      //set triggers for this channel
275      vector<string> triggerNames;
# Line 311 | Line 330 | OSUAnalysis::OSUAnalysis (const edm::Par
330        tempCut.inputCollection = tempInputCollection;
331        if(tempInputCollection.find("pairs")==string::npos){ //just a single object
332          if(tempInputCollection.find("secondary")!=string::npos){//secondary object
333 <          int spaceIndex = tempInputCollection.find(" ");
334 <          int secondWordLength = tempInputCollection.size() - spaceIndex;
335 <          objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
333 >          if(tempInputCollection.find("secondary muons")!=string::npos){//treat secondary muons differently; allow for a different input collection
334 >            objectsToGet.push_back("secondary muons");  
335 >          } else {
336 >            int spaceIndex = tempInputCollection.find(" ");
337 >            int secondWordLength = tempInputCollection.size() - spaceIndex;
338 >            objectsToGet.push_back(tempInputCollection.substr(spaceIndex+1,secondWordLength));
339 >          }
340          }
341          else{
342            objectsToGet.push_back(tempInputCollection);
# Line 401 | Line 424 | OSUAnalysis::OSUAnalysis (const edm::Par
424        }
425        subSubDirNames.push_back(subSubDirName);
426        tempCut.name = tempCutName;
427 +      if (verbose_) clog << "Setting up cut, index: " << currentCut << ", input collection: " << tempInputCollection<< ", name: " << tempCut.name << endl;  
428  
429        tempChannel.cuts.push_back(tempCut);
430  
# Line 441 | Line 465 | OSUAnalysis::OSUAnalysis (const edm::Par
465      for(uint currentDir = 0; !useEDMFormat_ && currentDir != treeDirectories.size(); currentDir++){
466        TTree* newTree = treeDirectories.at(currentDir).make<TTree> (TString("BNTree_"+channelLabel), TString("BNTree_"+channelLabel));
467        BNTrees_.push_back(newTree);
468 +      BNTrees_.back()->Branch("event_runInt",  &BNTreeBranchVals_runInt_,  "event_runInt/I");      
469 +      BNTrees_.back()->Branch("event_lumiInt", &BNTreeBranchVals_lumiInt_, "event_lumiInt/I");      
470 +      BNTrees_.back()->Branch("event_evtLong", &BNTreeBranchVals_evtLong_, "event_evtLong/L");      
471        for (uint iBranch = 0; iBranch < treeBranches_.size(); iBranch++){
472          BranchSpecs currentVar = treeBranches_.at(iBranch);
473          vector<float> newVec;
# Line 596 | Line 623 | OSUAnalysis::OSUAnalysis (const edm::Par
623          else if(currentObject == "track-event pairs")         currentObject = "trackEventPairs";
624          else if(currentObject == "electron-track pairs")      currentObject = "electronTrackPairs";
625          else if(currentObject == "muon-track pairs")          currentObject = "muonTrackPairs";
626 +        else if(currentObject == "secondary muon-track pairs") currentObject = "secondaryMuonTrackPairs";
627          else if(currentObject == "muon-tau pairs")            currentObject = "muonTauPairs";
628          else if(currentObject == "tau-tau pairs")             currentObject = "ditauPairs";
629          else if(currentObject == "tau-track pairs")           currentObject = "tauTrackPairs";
# Line 605 | Line 633 | OSUAnalysis::OSUAnalysis (const edm::Par
633          else if(currentObject == "secondary electrons")       currentObject = "secondaryElectrons";
634          else if(currentObject == "electron-trigobj pairs")    currentObject = "electronTrigobjPairs";
635          else if(currentObject == "muon-trigobj pairs")        currentObject = "muonTrigobjPairs";
636 +        else if(currentObject == "electron-mcparticle pairs")   currentObject = "electronMCparticlePairs";
637 +
638  
639          currentObject.at(0) = toupper(currentObject.at(0));
640          string histoName = "num" + currentObject;
# Line 618 | Line 648 | OSUAnalysis::OSUAnalysis (const edm::Par
648          else
649            oneDHists_.at(currentChannel).at(currentDir)[histoName] = directories.at(currentDir).make<TH1D> (TString(histoName),channelLabel+" channel: Number of Selected "+currentObject+"; # "+currentObject, maxNum, 0, maxNum);
650        }
651 +
652 +      if (verbose_) {
653 +        clog << "List of 1D histograms booked for channel " << channelName << " and directory " << currentDir << ":" << endl;
654 +        for(map<string, TH1D*>::iterator
655 +              iter = oneDHists_.at(currentChannel).at(currentDir).begin();
656 +            iter  != oneDHists_.at(currentChannel).at(currentDir).end();
657 +            iter++) {
658 +          clog << " " << iter->first
659 +               << ":  name=" << iter->second->GetName()
660 +               << ", title=" << iter->second->GetTitle()
661 +               << ", bins=(" << iter->second->GetNbinsX()
662 +               << "," << iter->second->GetXaxis()->GetXmin()
663 +               << "," << iter->second->GetXaxis()->GetXmax()
664 +               << ")" << endl;
665 +        }  
666 +        clog << "List of 2D histograms booked for channel " << channelName << " and directory " << currentDir << ":" << endl;
667 +        for(map<string, TH2D*>::iterator
668 +              iter = twoDHists_.at(currentChannel).at(currentDir).begin();
669 +            iter  != twoDHists_.at(currentChannel).at(currentDir).end();
670 +            iter++) {
671 +          clog << " " << iter->first
672 +               << ":  name=" << iter->second->GetName()
673 +               << ", title=" << iter->second->GetTitle()
674 +               << ", binsX=(" << iter->second->GetNbinsX()
675 +               << "," << iter->second->GetXaxis()->GetXmin()
676 +               << "," << iter->second->GetXaxis()->GetXmax()
677 +               << ")"
678 +               << ", binsY=(" << iter->second->GetNbinsY()
679 +               << "," << iter->second->GetYaxis()->GetXmin()
680 +               << "," << iter->second->GetYaxis()->GetXmax()
681 +               << ")"
682 +               << endl;
683 +        }  
684 +      }
685 +
686      }//end of loop over directories
687      channels.push_back(tempChannel);
688      tempChannel.cuts.clear();
689    }//end loop over channels
690  
691  
692 +  // Create the cutflow histogram and fill with 0 weight, in case no events are found in the input file.  
693 +  for(uint currentChannelIndex = 0; currentChannelIndex != channels.size(); currentChannelIndex++){
694 +    channel currentChannel = channels.at(currentChannelIndex);
695 +    if(currentChannel.triggers.size() != 0 || currentChannel.triggersToVeto.size() != 0){  //triggers specified
696 +      cutFlows_.at(currentChannelIndex)->at("trigger") = true;  
697 +    }
698 +    for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
699 +      cut currentCut = currentChannel.cuts.at(currentCutIndex);
700 +      cutFlows_.at(currentChannelIndex)->at (currentCut.name) = true;
701 +    }
702 +    cutFlows_.at(currentChannelIndex)->fillCutFlow(0);  // fill cutflow with 0 weight, just to create the cutflow histograms  
703 +  }
704 +
705    //make unique vector of objects we need to get from the event
706    sort( objectsToGet.begin(), objectsToGet.end() );
707    objectsToGet.erase( unique( objectsToGet.begin(), objectsToGet.end() ), objectsToGet.end() );
# Line 634 | Line 712 | OSUAnalysis::OSUAnalysis (const edm::Par
712    sort( objectsToFlag.begin(), objectsToFlag.end() );
713    objectsToFlag.erase( unique( objectsToFlag.begin(), objectsToFlag.end() ), objectsToFlag.end() );
714  
715 +  // Move all paired objects to the end of the list, so that the flags for single objects are always set before those of paired objects.  
716 +  for (uint i=0; i<objectsToFlag.size(); i++) {
717 +    if (objectsToFlag.at(i).find("pairs")!=string::npos) { // if it contains "pairs"
718 +      objectsToFlag.push_back(objectsToFlag.at(i));  
719 +      objectsToFlag.erase(objectsToFlag.begin()+i);  
720 +    }
721 +  }
722 +
723 +  if (verbose_) {
724 +    clog << "List of channels:" << endl;
725 +    for (uint i=0; i<channels.size(); i++) {
726 +      clog << " " << channels.at(i).name << endl;
727 +    }
728 +    clog << "List of objects to get:" << endl;
729 +    for (uint i=0; i<objectsToGet.size(); i++) {
730 +      clog << " " << objectsToGet.at(i) << endl;
731 +    }
732 +    clog << "List of objects to plot:" << endl;
733 +    for (uint i=0; i<objectsToPlot.size(); i++) {
734 +      clog << " " << objectsToPlot.at(i) << endl;
735 +    }
736 +    clog << "List of objects to cut:" << endl;
737 +    for (uint i=0; i<objectsToCut.size(); i++) {
738 +      clog << " " << objectsToCut.at(i) << endl;
739 +    }
740 +    clog << "List of objects to flag:" << endl;
741 +    for (uint i=0; i<objectsToFlag.size(); i++) {
742 +      clog << " " << objectsToFlag.at(i) << endl;
743 +    }
744 +  }
745 +
746    produces<map<string, bool> > ("channelDecisions");
747  
748    if (printEventInfo_) {
749      findEventsLog = new ofstream();  
750      findEventsLog->open("findEvents.txt");  
751      clog << "Listing run:lumi:event in file findEvents.txt for events that pass full selection (of any channel)." << endl;  
752 <  }
752 >  } else {
753 >    findEventsLog = 0;
754 >  }  
755 >
756 >  isFirstEvent_ = true;  
757  
758 < } // end constructor OSUAnalysis::OSUAnalysis()
758 >  if (verbose_) clog << "Finished OSUAnalysis::OSUAnalysis constructor." << endl;  
759 >
760 >
761 >  } // end constructor OSUAnalysis::OSUAnalysis()
762  
763  
764   OSUAnalysis::~OSUAnalysis ()
765   {
766  
767 +  if (verbose_) clog << "Beginning OSUAnalysis::OSUAnalysis destructor." << endl;  
768 +
769    // Destroying the CutFlow objects causes the cut flow numbers and time
770    // information to be printed to standard output.
771    for(uint currentChannel = 0; currentChannel != channels_.size(); currentChannel++){
772      delete cutFlows_.at(currentChannel);
773    }
774  
775 <  if (findEventsLog) findEventsLog->close();  
775 >  if (printEventInfo_ && findEventsLog) findEventsLog->close();  
776  
777    clog << "=============================================" << endl;  
778    clog << "Successfully completed OSUAnalysis." << endl;  
779    clog << "=============================================" << endl;  
780  
781 +  if (verbose_) clog << "Finished OSUAnalysis::OSUAnalysis destructor." << endl;  
782 +
783   }
784  
785   void
# Line 667 | Line 787 | OSUAnalysis::produce (edm::Event &event,
787   {
788    // Retrieve necessary collections from the event.
789  
790 <  if (find(objectsToGet.begin(), objectsToGet.end(), "triggers") != objectsToGet.end())
790 >  if (verbose_) clog << "Beginning OSUAnalysis::produce." << endl;  
791 >
792 >  if (find(objectsToGet.begin(), objectsToGet.end(), "triggers") != objectsToGet.end()) {
793      event.getByLabel (triggers_, triggers);
794 +    if (!triggers.product()) cout << "ERROR:  could not get triggers input collection" << endl;  
795 +  }
796  
797 <  if (find(objectsToGet.begin(), objectsToGet.end(), "trigobjs") != objectsToGet.end())
797 >  if (find(objectsToGet.begin(), objectsToGet.end(), "trigobjs") != objectsToGet.end()) {
798      event.getByLabel (trigobjs_, trigobjs);
799 +    if (!trigobjs.product()) cout << "ERROR:  could not get trigobjs input collection" << endl;  
800 +  }
801  
802 <  if (find(objectsToGet.begin(), objectsToGet.end(), "jets") != objectsToGet.end())
802 >  if (find(objectsToGet.begin(), objectsToGet.end(), "jets") != objectsToGet.end()) {
803      event.getByLabel (jets_, jets);
804 +    if (!jets.product()) cout << "ERROR:  could not get jets input collection" << endl;  
805 +  }
806  
807 <  if (find(objectsToGet.begin(), objectsToGet.end(), "muons") != objectsToGet.end())
807 >  if (find(objectsToGet.begin(), objectsToGet.end(), "muons") != objectsToGet.end()) {
808      event.getByLabel (muons_, muons);
809 +    if (!muons.product()) cout << "ERROR:  could not get muons input collection" << endl;  
810 +  }
811 +
812 +  if (find(objectsToGet.begin(), objectsToGet.end(), "secondary muons") != objectsToGet.end()) {
813 +    event.getByLabel (secMuons_, secMuons);
814 +    if (!secMuons.product()) cout << "ERROR:  could not get secMuons input collection" << endl;  
815 +  }
816  
817 <  if (find(objectsToGet.begin(), objectsToGet.end(), "electrons") != objectsToGet.end())
817 >  if (find(objectsToGet.begin(), objectsToGet.end(), "electrons") != objectsToGet.end()) {
818      event.getByLabel (electrons_, electrons);
819 +    if (!electrons.product()) cout << "ERROR:  could not get electrons input collection" << endl;  
820 +  }
821  
822 <  if (find(objectsToGet.begin(), objectsToGet.end(), "events") != objectsToGet.end())
822 >  if (find(objectsToGet.begin(), objectsToGet.end(), "events") != objectsToGet.end()) {
823      event.getByLabel (events_, events);
824 +    if (!events.product()) cout << "ERROR:  could not get events input collection" << endl;  
825 +  }
826  
827 <  if (find(objectsToGet.begin(), objectsToGet.end(), "taus") != objectsToGet.end())
827 >  if (find(objectsToGet.begin(), objectsToGet.end(), "taus") != objectsToGet.end()) {
828      event.getByLabel (taus_, taus);
829 +    if (!taus.product()) cout << "ERROR:  could not get taus input collection" << endl;  
830 +  }
831  
832 <  if (find(objectsToGet.begin(), objectsToGet.end(), "mets") != objectsToGet.end())
832 >  if (find(objectsToGet.begin(), objectsToGet.end(), "mets") != objectsToGet.end()) {
833      event.getByLabel (mets_, mets);
834 +    if (!mets.product()) cout << "ERROR:  could not get mets input collection" << endl;  
835 +  }
836  
837 <  if (find(objectsToGet.begin(), objectsToGet.end(), "tracks") != objectsToGet.end())
837 >  if (find(objectsToGet.begin(), objectsToGet.end(), "tracks") != objectsToGet.end()) {
838      event.getByLabel (tracks_, tracks);
839 +    if (!tracks.product()) cout << "ERROR:  could not get tracks input collection" << endl;  
840 +  }
841  
842 <  if (find(objectsToGet.begin(), objectsToGet.end(), "genjets") != objectsToGet.end())
842 >  if (find(objectsToGet.begin(), objectsToGet.end(), "genjets") != objectsToGet.end()) {
843      event.getByLabel (genjets_, genjets);
844 +    if (!genjets.product()) cout << "ERROR:  could not get genjets input collection" << endl;  
845 +  }
846  
847 <  if (find(objectsToGet.begin(), objectsToGet.end(), "mcparticles") != objectsToGet.end())
847 >  if (find(objectsToGet.begin(), objectsToGet.end(), "mcparticles") != objectsToGet.end()) {
848      event.getByLabel (mcparticles_, mcparticles);
849 +    if (!mcparticles.product()) cout << "ERROR:  could not get mcparticles input collection" << endl;  
850 +  }
851  
852 <  if (find(objectsToGet.begin(), objectsToGet.end(), "primaryvertexs") != objectsToGet.end())
852 >  if (find(objectsToGet.begin(), objectsToGet.end(), "primaryvertexs") != objectsToGet.end()) {
853      event.getByLabel (primaryvertexs_, primaryvertexs);
854 +    if (!primaryvertexs.product()) cout << "ERROR:  could not get primaryvertexs input collection" << endl;  
855 +  }
856  
857 <  if (find(objectsToGet.begin(), objectsToGet.end(), "bxlumis") != objectsToGet.end())
857 >  if (find(objectsToGet.begin(), objectsToGet.end(), "bxlumis") != objectsToGet.end()) {
858      event.getByLabel (bxlumis_, bxlumis);
859 +    if (!bxlumis.product()) cout << "ERROR:  could not get bxlumis input collection" << endl;  
860 +  }
861  
862 <  if (find(objectsToGet.begin(), objectsToGet.end(), "photons") != objectsToGet.end())
862 >  if (find(objectsToGet.begin(), objectsToGet.end(), "photons") != objectsToGet.end()) {
863      event.getByLabel (photons_, photons);
864 +    if (!photons.product()) cout << "ERROR:  could not get photons input collection" << endl;  
865 +  }
866  
867 <  if (find(objectsToGet.begin(), objectsToGet.end(), "superclusters") != objectsToGet.end())
867 >  if (find(objectsToGet.begin(), objectsToGet.end(), "superclusters") != objectsToGet.end()) {
868      event.getByLabel (superclusters_, superclusters);
869 +    if (!superclusters.product()) cout << "ERROR:  could not get superclusters input collection" << endl;  
870 +  }
871  
872    if (datasetType_ == "signalMC"){
873 <    if (find(objectsToGet.begin(), objectsToGet.end(), "stops") != objectsToGet.end())
873 >    if (find(objectsToGet.begin(), objectsToGet.end(), "stops") != objectsToGet.end()) {
874        event.getByLabel (stops_, stops);
875 +      if (!stops.product()) cout << "ERROR:  could not get stops input collection" << endl;  
876 +    }
877    }
878  
879    if (useTrackCaloRhoCorr_) {
# Line 723 | Line 882 | OSUAnalysis::produce (edm::Event &event,
882      // For description of rho values for different jet reconstruction algorithms, see
883      // https://twiki.cern.ch/twiki/bin/view/CMS/JetAlgorithms#Algorithms
884      event.getByLabel ("kt6CaloJets","rho", rhokt6CaloJetsHandle_);
885 +    if (!rhokt6CaloJetsHandle_.product()) cout << "ERROR:  could not get kt6CaloJets input collection" << endl;  
886    }
887  
888    double masterScaleFactor = 1.0;
# Line 730 | Line 890 | OSUAnalysis::produce (edm::Event &event,
890    //get pile-up event weight
891    if (doPileupReweighting_ && datasetType_ != "data") {
892      //for "data" datasets, the numTruePV is always set to -1
893 <    if (events->at(0).numTruePV < 0) clog << "WARNING[OSUAnalysis::analyze]: Event has numTruePV<0.  Turning off pile-up reweighting." << endl;
893 >    if (events->at(0).numTruePV < 0 && isFirstEvent_) clog << "WARNING[OSUAnalysis::analyze]: Event has numTruePV<0.  Turning off pile-up reweighting." << endl;
894      else masterScaleFactor *= puWeight_->at (events->at (0).numTruePV);
895    }
896  
# Line 744 | Line 904 | OSUAnalysis::produce (edm::Event &event,
904    auto_ptr<map<string, bool> > channelDecisions (new map<string, bool>);
905    for(uint currentChannelIndex = 0; currentChannelIndex != channels.size(); currentChannelIndex++){
906      channel currentChannel = channels.at(currentChannelIndex);
907 +    if (verbose_>1) clog << " Processing channel " << currentChannel.name << endl;
908  
909      flagMap individualFlags;
910      counterMap passingCounter;
# Line 763 | Line 924 | OSUAnalysis::produce (edm::Event &event,
924      //loop over all cuts
925      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
926        cut currentCut = currentChannel.cuts.at(currentCutIndex);
927 +      if (verbose_>2) clog << "  Processing cut, index: " << currentCutIndex << ", input collection: " << currentCut.inputCollection << ", name: " << currentCut.name << endl;  
928  
929        for(uint currentObjectIndex = 0; currentObjectIndex != objectsToFlag.size(); currentObjectIndex++){
930          string currentObject = objectsToFlag.at(currentObjectIndex);
# Line 774 | Line 936 | OSUAnalysis::produce (edm::Event &event,
936        }
937  
938        //set flags for all relevant objects
939 <      for(uint currentObjectIndex = 0; currentObjectIndex != objectsToFlag.size(); currentObjectIndex++){
940 <        string currentObject = objectsToFlag.at(currentObjectIndex);
941 <
942 <        int flagsForPairCutsIndex = max(int(currentCutIndex-1),0);
943 <
944 <
945 <        if     (currentObject == "jets")            setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"jets");
946 <        else if(currentObject == "secondary jets")  setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"secondary jets");
947 <        else if(currentObject == "secondary photons")  setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"secondary photons");
948 <        else if(currentObject == "muons")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"muons");
949 <        else if(currentObject == "secondary muons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"secondary muons");
939 >      for(int currentObjectIndex = -1; currentObjectIndex != int(objectsToFlag.size()); currentObjectIndex++){
940 >        string currentObject;  
941 >        if (currentObjectIndex < 0) currentObject = currentCut.inputCollection;  // In the first loop, set the flags for the collection that the cut is acting on.  That way other paired collections can access the correct flag for the current cut.  
942 >        else currentObject = objectsToFlag.at(currentObjectIndex);
943 >        if (currentObjectIndex >= 0 && currentObject == currentCut.inputCollection) continue;  // Flags have already been set for the inputCollection object, so should not be set again.  
944 >
945 >        // single object collections
946 >        if     (currentObject == "jets")                setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"jets");
947 >        else if(currentObject == "secondary jets")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),"secondary jets");
948 >        else if(currentObject == "secondary photons")   setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"secondary photons");
949 >        else if(currentObject == "muons")               setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),"muons");
950 >        else if(currentObject == "secondary muons")     setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,secMuons.product(),"secondary muons");
951          else if(currentObject == "secondary electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"secondary electrons");
952 <        else if(currentObject == "electrons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"electrons");
953 <        else if(currentObject == "events") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,events.product(),"events");
954 <        else if(currentObject == "taus") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),"taus");
955 <        else if(currentObject == "mets") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mets.product(),"mets");
956 <        else if(currentObject == "tracks") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),"tracks");
957 <        else if(currentObject == "genjets") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,genjets.product(),"genjets");
958 <        else if(currentObject == "mcparticles") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mcparticles.product(),"mcparticles");
959 <        else if(currentObject == "primaryvertexs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,primaryvertexs.product(),"primaryvertexs");
960 <        else if(currentObject == "bxlumis") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,bxlumis.product(),"bxlumis");
961 <        else if(currentObject == "photons") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"photons");
962 <        else if(currentObject == "superclusters") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,superclusters.product(),"superclusters");
963 <        else if(currentObject == "trigobjs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,trigobjs.product(),"trigobjs");
964 <
965 <
966 <
967 <        else if(currentObject == "muon-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
968 <                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
969 <                                                                   cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
970 <                                                                   "muon-muon pairs");
971 <
972 <        else if(currentObject == "muon-secondary muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), \
973 <                                                                             cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
974 <                                                                             cumulativeFlags.at("secondary muons").at(flagsForPairCutsIndex), \
975 <                                                                             "muon-secondary muon pairs");
976 <
977 <        else if(currentObject == "muon-secondary photon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),photons.product(), \
978 <                                                                             cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
979 <                                                                             cumulativeFlags.at("secondary photons").at(flagsForPairCutsIndex), \
980 <                                                                             "muon-secondary photon pairs");
981 <        else if(currentObject == "muon-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), \
982 <                                                                             cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
983 <                                                                             cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex), \
984 <                                                                             "muon-secondary jet pairs");
985 <        else if(currentObject == "photon-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), \
986 <                                                                             cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
987 <                                                                             cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex), \
988 <                                                                             "photon-secondary jet pairs");
989 <
990 <        else if(currentObject == "electron-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), \
991 <                                                                             cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
992 <                                                                             cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex), \
993 <                                                                             "electron-secondary jet pairs");
994 <
995 <        else if(currentObject == "electron-secondary electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
996 <                                                                                     cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
997 <                                                                                     cumulativeFlags.at("secondary electrons").at(flagsForPairCutsIndex), \
835 <                                                                                     "electron-secondary electron pairs");
836 <
837 <        else if(currentObject == "electron-electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), \
838 <                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
839 <                                                                           cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
840 <                                                                           "electron-electron pairs");
841 <        else if(currentObject == "electron-muon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),muons.product(), \
842 <                                                                       cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
843 <                                                                       cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
844 <                                                                       "electron-muon pairs");
845 <        else if(currentObject == "jet-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), \
846 <                                                                 cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
847 <                                                                 cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
848 <                                                                 "jet-jet pairs");
849 <        else if(currentObject == "jet-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), \
850 <                                                                 cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
851 <                                                                 cumulativeFlags.at("secondary jets").at(flagsForPairCutsIndex),\
852 <                                                                 "jet-secondary jet pairs");
853 <        else if(currentObject == "electron-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), \
854 <                                                                      cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
855 <                                                                      cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
856 <                                                                      "electron-jet pairs");
857 <        else if(currentObject == "electron-photon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),photons.product(), \
858 <                                                                      cumulativeFlags.at("electrons").at(flagsForPairCutsIndex), \
859 <                                                                      cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
860 <                                                                      "electron-photon pairs");
861 <        else if(currentObject == "photon-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), \
862 <                                                                      cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
863 <                                                                      cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
864 <                                                                      "photon-jet pairs");
865 <        else if(currentObject == "muon-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), \
866 <                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
867 <                                                                  cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
868 <                                                                  "muon-jet pairs");
869 <        else if(currentObject == "muon-event pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),events.product(), \
870 <                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
871 <                                                                  cumulativeFlags.at("events").at(flagsForPairCutsIndex), \
872 <                                                                  "muon-event pairs");
873 <        else if(currentObject == "met-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mets.product(),jets.product(), \
874 <                                                                  cumulativeFlags.at("mets").at(flagsForPairCutsIndex), \
875 <                                                                  cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
876 <                                                                  "met-jet pairs");
877 <        else if(currentObject == "track-jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),jets.product(), \
878 <                                                                 cumulativeFlags.at("tracks").at(flagsForPairCutsIndex), \
879 <                                                                 cumulativeFlags.at("jets").at(flagsForPairCutsIndex), \
880 <                                                                 "track-jet pairs");
881 <        else if(currentObject == "muon-photon pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),photons.product(), \
882 <                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex), \
883 <                                                                  cumulativeFlags.at("photons").at(flagsForPairCutsIndex), \
884 <                                                                  "muon-photon pairs");
885 <        else if(currentObject == "track-event pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(),
886 <                                                                     cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
887 <                                                                     cumulativeFlags.at("events").at(flagsForPairCutsIndex),
888 <                                                                     "track-event pairs");
889 <        else if(currentObject == "electron-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),
890 <                                                                        cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
891 <                                                                        cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
892 <                                                                        "electron-track pairs");
893 <        else if(currentObject == "muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),
894 <                                                                    cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
895 <                                                                    cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
896 <                                                                    "muon-track pairs");
897 <        else if(currentObject == "muon-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),
898 <                                                                  cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
899 <                                                                  cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
900 <                                                                  "muon-tau pairs");
901 <        else if(currentObject == "tau-tau pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),
902 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
903 <                                                                 cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
904 <                                                                 "tau-tau pairs");
905 <        else if(currentObject == "tau-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),
906 <                                                                   cumulativeFlags.at("taus").at(flagsForPairCutsIndex),
907 <                                                                   cumulativeFlags.at("tracks").at(flagsForPairCutsIndex),
908 <                                                                   "tau-track pairs");
909 <        else if(currentObject == "electron-trigobj pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),trigobjs.product(),
910 <                                                                          cumulativeFlags.at("electrons").at(flagsForPairCutsIndex),
911 <                                                                          cumulativeFlags.at("trigobjs").at(flagsForPairCutsIndex),
912 <                                                                          "electron-trigobj pairs");
913 <        else if(currentObject == "muon-trigobj pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),trigobjs.product(),
914 <                                                                      cumulativeFlags.at("muons").at(flagsForPairCutsIndex),
915 <                                                                      cumulativeFlags.at("trigobjs").at(flagsForPairCutsIndex),
916 <                                                                      "muon-trigobj pairs");
952 >        else if(currentObject == "electrons")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),"electrons");
953 >        else if(currentObject == "events")              setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,events.product(),"events");
954 >        else if(currentObject == "taus")                setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),"taus");
955 >        else if(currentObject == "mets")                setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mets.product(),"mets");
956 >        else if(currentObject == "tracks")              setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),"tracks");
957 >        else if(currentObject == "genjets")             setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,genjets.product(),"genjets");
958 >        else if(currentObject == "mcparticles")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mcparticles.product(),"mcparticles");
959 >        else if(currentObject == "primaryvertexs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,primaryvertexs.product(),"primaryvertexs");
960 >        else if(currentObject == "bxlumis")             setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,bxlumis.product(),"bxlumis");
961 >        else if(currentObject == "photons")             setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),"photons");
962 >        else if(currentObject == "superclusters")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,superclusters.product(),"superclusters");
963 >        else if(currentObject == "trigobjs")            setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,trigobjs.product(),"trigobjs");
964 >
965 >
966 >        // paired object collections  
967 >        else if(currentObject == "muon-muon pairs")                   setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),muons.product(), "muon-muon pairs");
968 >        else if(currentObject == "muon-secondary muon pairs")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),secMuons.product(), "muon-secondary muon pairs");
969 >
970 >        else if(currentObject == "muon-secondary photon pairs")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),photons.product(), "muon-secondary photon pairs");
971 >        else if(currentObject == "muon-secondary jet pairs")          setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), "muon-secondary jet pairs");
972 >        else if(currentObject == "photon-secondary jet pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), "photon-secondary jet pairs");
973 >        else if(currentObject == "electron-secondary jet pairs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), "electron-secondary jet pairs");
974 >        else if(currentObject == "electron-secondary electron pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), "electron-secondary electron pairs");
975 >
976 >        else if(currentObject == "electron-electron pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),electrons.product(), "electron-electron pairs");
977 >        else if(currentObject == "electron-muon pairs")     setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),muons.product(), "electron-muon pairs");
978 >        else if(currentObject == "jet-jet pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), "jet-jet pairs");
979 >        else if(currentObject == "jet-secondary jet pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,jets.product(),jets.product(), "jet-secondary jet pairs");
980 >        else if(currentObject == "electron-jet pairs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),jets.product(), "electron-jet pairs");
981 >        else if(currentObject == "electron-photon pairs")   setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),photons.product(), "electron-photon pairs");
982 >        else if(currentObject == "photon-jet pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,photons.product(),jets.product(), "photon-jet pairs");
983 >        else if(currentObject == "muon-jet pairs")          setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),jets.product(), "muon-jet pairs");
984 >        else if(currentObject == "muon-event pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),events.product(), "muon-event pairs");
985 >        else if(currentObject == "met-jet pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,mets.product(),jets.product(), "met-jet pairs");
986 >        else if(currentObject == "track-jet pairs")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),jets.product(), "track-jet pairs");
987 >        else if(currentObject == "muon-photon pairs")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),photons.product(), "muon-photon pairs");
988 >        else if(currentObject == "track-event pairs")       setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,tracks.product(),events.product(), "track-event pairs");
989 >        else if(currentObject == "electron-track pairs")    setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),tracks.product(),"electron-track pairs");
990 >        else if(currentObject == "muon-track pairs")        setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),tracks.product(),"muon-track pairs");
991 >        else if(currentObject == "secondary muon-track pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,secMuons.product(),tracks.product(),"secondary muon-track pairs");
992 >        else if(currentObject == "muon-tau pairs")          setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),taus.product(),"muon-tau pairs");
993 >        else if(currentObject == "tau-tau pairs")           setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus.product(),taus.product(),"tau-tau pairs");
994 >        else if(currentObject == "tau-track pairs")         setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,taus .product(),tracks.product(),"tau-track pairs");
995 >        else if(currentObject == "electron-trigobj pairs")  setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),trigobjs.product(),"electron-trigobj pairs");
996 >        else if(currentObject == "muon-trigobj pairs")      setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,muons.product(),trigobjs.product(),"muon-trigobj pairs");
997 >        else if(currentObject == "electron-mcparticle pairs") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,electrons.product(),mcparticles.product(),"electron-mcparticle pairs");
998  
999          if(currentObject == "stops" && datasetType_ == "signalMC") setObjectFlags(currentCut,currentCutIndex,individualFlags,cumulativeFlags,stops.product(),"stops");
1000        }
1001  
1002 +    }//end loop over all cuts
1003  
1004  
923 –    }//end loop over all cuts
924 –    //use cumulative flags to apply cuts at event level
1005  
1006 <    //a vector to store cumulative cut descisions after each cut.
1007 <    vector<bool> eventPassedPreviousCuts;
1006 >    //use cumulative flags to apply cuts at event level
1007 >    vector<bool> eventPassedPreviousCuts;    //a vector to store cumulative cut descisions after each cut.
1008      bool eventPassedAllCuts = true;
1009 <    //apply trigger (true if none were specified)
930 <    eventPassedAllCuts = eventPassedAllCuts && triggerDecision;
1009 >    eventPassedAllCuts = eventPassedAllCuts && triggerDecision;    //apply trigger (true if none were specified)
1010  
1011      for(uint currentCutIndex = 0; currentCutIndex != currentChannel.cuts.size(); currentCutIndex++){
1012  
1013        //loop over all objects and count how many passed the cumulative selection up to this point
1014        cut currentCut = currentChannel.cuts.at(currentCutIndex);
1015        int numberPassing = 0;
1016 +      int numberPassingPrev = 0;  // number of objects that pass cuts up to the previous one
1017  
1018        for (uint object = 0; object != cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).size() ; object++){
1019          if(cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).at(object).first) numberPassing++;
1020        }
1021 <      bool cutDecision = evaluateComparison(numberPassing,currentCut.eventComparativeOperator,currentCut.numberRequired);
1021 >      bool cutDecision;
1022 >      if (!currentCut.isVeto) {
1023 >        cutDecision = evaluateComparison(numberPassing,currentCut.eventComparativeOperator,currentCut.numberRequired);
1024 >      } else {
1025 >        int prevCutIndex = currentCutIndex - 1;
1026 >        if (prevCutIndex<0) {
1027 >          numberPassingPrev = cumulativeFlags.at(currentCut.inputCollection).at(currentCutIndex).size();  // count all objects in collection if cut is the first
1028 >        } else {
1029 >          for (uint object = 0; object != cumulativeFlags.at(currentCut.inputCollection).at(prevCutIndex).size() ; object++){
1030 >            if (cumulativeFlags.at(currentCut.inputCollection).at(prevCutIndex).at(object).first) {
1031 >              numberPassingPrev++;
1032 >              if (verbose_>1) clog << " object passed previous cut" << endl;  
1033 >            }
1034 >          }  
1035 >        }  
1036 >        int numberFailCut = numberPassingPrev - numberPassing;
1037 >        cutDecision = evaluateComparison(numberFailCut,currentCut.eventComparativeOperator,currentCut.numberRequired);  
1038 >      }
1039 >
1040        cutFlows_.at(currentChannelIndex)->at (currentCut.name) = cutDecision;
1041        eventPassedAllCuts = eventPassedAllCuts && cutDecision;
1042        eventPassedPreviousCuts.push_back(eventPassedAllCuts);
1043 +      if (verbose_>1) clog << " Event passed cuts up to cut index " << currentCutIndex << endl;  
1044 +
1045      }
1046      //applying all appropriate scale factors
1047      double scaleFactor = masterScaleFactor;
# Line 1006 | Line 1106 | OSUAnalysis::produce (edm::Event &event,
1106      scaleFactor *= electronScaleFactor_;
1107      scaleFactor *= bTagScaleFactor_;
1108      cutFlows_.at(currentChannelIndex)->fillCutFlow(scaleFactor);
1109 +    if (verbose_>1) clog << " Scale factors applied:  "
1110 +                         << " muonScaleFactor_ = " << muonScaleFactor_
1111 +                         << ", electronScaleFactor_ = " << electronScaleFactor_
1112 +                         << ", bTagScaleFactor_ = " << bTagScaleFactor_
1113 +                         << ", total scale factor = " << scaleFactor
1114 +                         << endl;  
1115 +
1116  
1117      if (printEventInfo_ && eventPassedAllCuts) {
1118        // Write information about event to screen, for testing purposes.
# Line 1024 | Line 1131 | OSUAnalysis::produce (edm::Event &event,
1131  
1132  
1133      //filling histograms
1134 <    for(uint currentCut = 0; currentCut != oneDHists_.at(currentChannelIndex).size(); currentCut++){//loop over all the directories in each channel.
1134 >    for(uint currentCut = 0; currentCut != oneDHists_.at(currentChannelIndex).size(); currentCut++){//loop over all the cuts in each channel; if GetPlotsAfterEachCut_ is false, only the last cut will be used.
1135 >
1136 >      if (verbose_>2) clog << "  Filling histograms for currentcut = " << currentCut << endl;  
1137 >
1138        uint currentDir;
1139        if (!GetPlotsAfterEachCut_) { currentDir =  currentChannel.cuts.size() - oneDHists_.at(currentChannelIndex).size(); } //if GetPlotsAfterEachCut_ is false, set currentDir point to the last cut.
1140        else{
# Line 1039 | Line 1149 | OSUAnalysis::produce (edm::Event &event,
1149  
1150            if (cumulativeFlags.count(currentHistogram.inputCollection) == 0) clog << "Error: no flags found for collection:  " << currentHistogram.inputCollection << ", will cause a seg fault" << endl;
1151  
1152 +          if (verbose_>1) clog << " Filling histogram " << currentHistogram.name << " for collection " << currentHistogram.inputCollection << endl;  
1153 +
1154            if(currentHistogram.inputVariables.size() == 1){
1155              TH1D* histo;
1156              histo = oneDHists_.at(currentChannelIndex).at(currentCut).at(currentHistogram.name);
1157 <            if     (currentHistogram.inputCollection == "jets")            fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
1157 >            if     (currentHistogram.inputCollection == "jets")            fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("jets").at(currentDir),scaleFactor);
1158              else if(currentHistogram.inputCollection == "secondary jets")  fill1DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
1159              else if(currentHistogram.inputCollection == "secondary photons")  fill1DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("secondary photons").at(currentDir),scaleFactor);
1160              else if(currentHistogram.inputCollection == "muons")           fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
1161 <            else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1161 >            else if(currentHistogram.inputCollection == "secondary muons") fill1DHistogram(histo,currentHistogram,secMuons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1162              else if(currentHistogram.inputCollection == "secondary electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
1163 <            else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1052 <                                                                                           cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
1163 >            else if(currentHistogram.inputCollection == "muon-muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(),
1164                                                                                             cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
1165 <            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1055 <                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary muons").at(currentDir), \
1165 >            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),secMuons.product(),
1166                                                                                                       cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
1167 <             else if(currentHistogram.inputCollection == "muon-secondary photon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),photons.product(), \
1058 <                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary photons").at(currentDir), \
1167 >             else if(currentHistogram.inputCollection == "muon-secondary photon pairs") fill1DHistogram(histo,currentHistogram,muons.product(),photons.product(),
1168                                                                                                       cumulativeFlags.at("muon-secondary photon pairs").at(currentDir),scaleFactor);
1169 <             else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
1061 <                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1169 >             else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,muons.product(),jets.product(),
1170                                                                                                       cumulativeFlags.at("muon-secondary jet pairs").at(currentDir),scaleFactor);
1171 <             else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,photons.product(),jets.product(), \
1064 <                                                                                                     cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1171 >             else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill1DHistogram(histo,currentHistogram,photons.product(),jets.product(),
1172                                                                                                       cumulativeFlags.at("photon-secondary jet pairs").at(currentDir),scaleFactor);
1173 <             else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
1067 <                                                                                                     cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1173 >             else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),jets.product(),
1174                                                                                                       cumulativeFlags.at("electron-secondary jet pairs").at(currentDir),scaleFactor);
1175  
1176              else if(currentHistogram.inputCollection == "electrons") fill1DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
1177 <            else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),\
1072 <                                                                                                   cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("electrons").at(currentDir),\
1177 >            else if(currentHistogram.inputCollection == "electron-electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1178                                                                                                     cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
1179 <            else if(currentHistogram.inputCollection == "jet-jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),\
1075 <                                                                                         cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("jets").at(currentDir),\
1179 >            else if(currentHistogram.inputCollection == "jet-jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),
1180                                                                                           cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1181 <             else if(currentHistogram.inputCollection == "jet-secondary jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
1078 <                                                                                                     cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1181 >             else if(currentHistogram.inputCollection == "jet-secondary jet pairs") fill1DHistogram(histo,currentHistogram,jets.product(),jets.product(),
1182                                                                                                       cumulativeFlags.at("jet-secondary jet pairs").at(currentDir),scaleFactor);
1183  
1184 <            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1082 <                                                                                                             cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary electrons").at(currentDir), \
1184 >            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill1DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1185                                                                                                               cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1186 <            else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(), \
1085 <                                                                                               cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("muons").at(currentDir),
1186 >            else if(currentHistogram.inputCollection == "electron-muon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),muons.product(),
1187                                                                                                 cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1188 <            else if(currentHistogram.inputCollection == "electron-jet pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),jets.product(), \
1088 <                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1188 >            else if(currentHistogram.inputCollection == "electron-jet pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),jets.product(),
1189                                                                                                cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1190 <            else if(currentHistogram.inputCollection == "photon-jet pairs") fill1DHistogram(histo,currentHistogram, photons.product(),jets.product(), \
1091 <                                                                                              cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1190 >            else if(currentHistogram.inputCollection == "photon-jet pairs") fill1DHistogram(histo,currentHistogram, photons.product(),jets.product(),
1191                                                                                                cumulativeFlags.at("photon-jet pairs").at(currentDir),scaleFactor);
1192 <            else if(currentHistogram.inputCollection == "muon-jet pairs") fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(), \
1094 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1192 >            else if(currentHistogram.inputCollection == "muon-jet pairs") fill1DHistogram(histo,currentHistogram, muons.product(),jets.product(),
1193                                                                                            cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1194 <            else if(currentHistogram.inputCollection == "muon-event pairs") fill1DHistogram(histo,currentHistogram, muons.product(),events.product(), \
1097 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("events").at(currentDir),
1194 >            else if(currentHistogram.inputCollection == "muon-event pairs") fill1DHistogram(histo,currentHistogram, muons.product(),events.product(),
1195                                                                                            cumulativeFlags.at("muon-event pairs").at(currentDir),scaleFactor);
1196 <            else if(currentHistogram.inputCollection == "met-jet pairs")  fill1DHistogram(histo,currentHistogram, mets.product(),jets.product(), \
1100 <                                                                                          cumulativeFlags.at("mets").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1196 >            else if(currentHistogram.inputCollection == "met-jet pairs")  fill1DHistogram(histo,currentHistogram, mets.product(),jets.product(),
1197                                                                                            cumulativeFlags.at("met-jet pairs").at(currentDir),scaleFactor);
1198 <            else if(currentHistogram.inputCollection == "track-jet pairs")  fill1DHistogram(histo,currentHistogram,tracks.product(),jets.product(), \
1103 <                                                                                          cumulativeFlags.at("tracks").at(currentDir),cumulativeFlags.at("jets").at(currentDir),
1198 >            else if(currentHistogram.inputCollection == "track-jet pairs")  fill1DHistogram(histo,currentHistogram,tracks.product(),jets.product(),
1199                                                                                            cumulativeFlags.at("track-jet pairs").at(currentDir),scaleFactor);
1200 <            else if(currentHistogram.inputCollection == "muon-photon pairs") fill1DHistogram(histo,currentHistogram, muons.product(),photons.product(), \
1106 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("photons").at(currentDir),
1200 >            else if(currentHistogram.inputCollection == "muon-photon pairs") fill1DHistogram(histo,currentHistogram, muons.product(),photons.product(),
1201                                                                                            cumulativeFlags.at("muon-photon pairs").at(currentDir),scaleFactor);
1202 <            else if(currentHistogram.inputCollection == "electron-photon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),photons.product(), \
1109 <                                                                                          cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("photons").at(currentDir),
1202 >            else if(currentHistogram.inputCollection == "electron-photon pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),photons.product(),
1203                                                                                            cumulativeFlags.at("electron-photon pairs").at(currentDir),scaleFactor);
1204              else if(currentHistogram.inputCollection == "electron-track pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),tracks.product(),
1112 –                                                                                                cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1205                                                                                                  cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1206              else if(currentHistogram.inputCollection == "muon-track pairs") fill1DHistogram(histo,currentHistogram, muons.product(),tracks.product(),
1115 –                                                                                            cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1207                                                                                              cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1208 +            else if(currentHistogram.inputCollection == "secondary muon-track pairs") fill1DHistogram(histo,currentHistogram, secMuons.product(),tracks.product(),
1209 +                                                                                            cumulativeFlags.at("secondary muon-track pairs").at(currentDir),scaleFactor);
1210              else if(currentHistogram.inputCollection == "muon-tau pairs") fill1DHistogram(histo,currentHistogram, muons.product(),taus.product(),
1118 –                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1211                                                                                            cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1212              else if(currentHistogram.inputCollection == "tau-tau pairs") fill1DHistogram(histo,currentHistogram, taus.product(),taus.product(),
1121 –                                                                                         cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1213                                                                                           cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1214              else if(currentHistogram.inputCollection == "tau-track pairs") fill1DHistogram(histo,currentHistogram, taus.product(),tracks.product(),
1124 –                                                                                           cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1215                                                                                             cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1216              else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill1DHistogram(histo,currentHistogram, electrons.product(),trigobjs.product(),
1127 –                                                                                                  cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1217                                                                                                    cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1218              else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill1DHistogram(histo,currentHistogram, muons.product(),trigobjs.product(),
1130 –                                                                                              cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1219                                                                                                cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1220  
1221              else if(currentHistogram.inputCollection == "events") fill1DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
# Line 1150 | Line 1238 | OSUAnalysis::produce (edm::Event &event,
1238              else if(currentHistogram.inputCollection == "secondary jets")  fill2DHistogram(histo,currentHistogram,jets.product(),cumulativeFlags.at("secondary jets").at(currentDir),scaleFactor);
1239              else if(currentHistogram.inputCollection == "secondary photons")  fill2DHistogram(histo,currentHistogram,photons.product(),cumulativeFlags.at("secondary photons").at(currentDir),scaleFactor);
1240              else if(currentHistogram.inputCollection == "muons")           fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("muons").at(currentDir),scaleFactor);
1241 <            else if(currentHistogram.inputCollection == "secondary muons") fill2DHistogram(histo,currentHistogram,muons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1242 <            else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1155 <                                                                                           cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
1241 >            else if(currentHistogram.inputCollection == "secondary muons") fill2DHistogram(histo,currentHistogram,secMuons.product(),cumulativeFlags.at("secondary muons").at(currentDir),scaleFactor);
1242 >            else if(currentHistogram.inputCollection == "muon-muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(),
1243                                                                                             cumulativeFlags.at("muon-muon pairs").at(currentDir),scaleFactor);
1244 <            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),muons.product(), \
1158 <                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary muons").at(currentDir), \
1244 >            else if(currentHistogram.inputCollection == "muon-secondary muon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),secMuons.product(),
1245                                                                                                       cumulativeFlags.at("muon-secondary muon pairs").at(currentDir),scaleFactor);
1246 <            else if(currentHistogram.inputCollection == "muon-secondary photon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),photons.product(), \
1161 <                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary photons").at(currentDir), \
1246 >            else if(currentHistogram.inputCollection == "muon-secondary photon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),photons.product(),
1247                                                                                                       cumulativeFlags.at("muon-secondary photon pairs").at(currentDir),scaleFactor);
1248 <            else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
1164 <                                                                                                     cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1248 >            else if(currentHistogram.inputCollection == "muon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(),
1249                                                                                                       cumulativeFlags.at("muon-secondary jet pairs").at(currentDir),scaleFactor);
1250 <            else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
1167 <                                                                                                     cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1250 >            else if(currentHistogram.inputCollection == "electron-secondary jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(),
1251                                                                                                       cumulativeFlags.at("electron-secondary jet pairs").at(currentDir),scaleFactor);
1252 <            else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(), \
1170 <                                                                                                     cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("secondary jets").at(currentDir), \
1252 >            else if(currentHistogram.inputCollection == "photon-secondary jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(),
1253                                                                                                       cumulativeFlags.at("photon-secondary jet pairs").at(currentDir),scaleFactor);
1254              else if(currentHistogram.inputCollection == "electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("electrons").at(currentDir),scaleFactor);
1255              else if(currentHistogram.inputCollection == "secondary electrons") fill2DHistogram(histo,currentHistogram,electrons.product(),cumulativeFlags.at("secondary electrons").at(currentDir),scaleFactor);
1256 <            else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1175 <                                                                                                   cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("electrons").at(currentDir), \
1256 >            else if(currentHistogram.inputCollection == "electron-electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1257                                                                                                     cumulativeFlags.at("electron-electron pairs").at(currentDir),scaleFactor);
1258 <            else if(currentHistogram.inputCollection == "jet-jet pairs") fill2DHistogram(histo,currentHistogram,jets.product(),jets.product(), \
1178 <                                                                                         cumulativeFlags.at("jets").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1258 >            else if(currentHistogram.inputCollection == "jet-jet pairs") fill2DHistogram(histo,currentHistogram,jets.product(),jets.product(),
1259                                                                                           cumulativeFlags.at("jet-jet pairs").at(currentDir),scaleFactor);
1260 <            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(), \
1181 <                                                                                                             cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("secondary electrons").at(currentDir), \
1260 >            else if(currentHistogram.inputCollection == "electron-secondary electron pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),electrons.product(),
1261                                                                                                               cumulativeFlags.at("electron-secondary electron pairs").at(currentDir),scaleFactor);
1262 <            else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(), \
1184 <                                                                                               cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("muons").at(currentDir), \
1262 >            else if(currentHistogram.inputCollection == "electron-muon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),muons.product(),
1263                                                                                                 cumulativeFlags.at("electron-muon pairs").at(currentDir),scaleFactor);
1264 <            else if(currentHistogram.inputCollection == "electron-jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(), \
1187 <                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1264 >            else if(currentHistogram.inputCollection == "electron-jet pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),jets.product(),
1265                                                                                                cumulativeFlags.at("electron-jet pairs").at(currentDir),scaleFactor);
1266 <            else if(currentHistogram.inputCollection == "electron-photon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),photons.product(), \
1190 <                                                                                              cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("photons").at(currentDir), \
1266 >            else if(currentHistogram.inputCollection == "electron-photon pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),photons.product(),
1267                                                                                                cumulativeFlags.at("electron-photon pairs").at(currentDir),scaleFactor);
1268 <            else if(currentHistogram.inputCollection == "muon-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(), \
1193 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1268 >            else if(currentHistogram.inputCollection == "muon-jet pairs") fill2DHistogram(histo,currentHistogram,muons.product(),jets.product(),
1269                                                                                            cumulativeFlags.at("muon-jet pairs").at(currentDir),scaleFactor);
1270 <            else if(currentHistogram.inputCollection == "muon-event pairs") fill2DHistogram(histo,currentHistogram,muons.product(),events.product(), \
1196 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("events").at(currentDir), \
1270 >            else if(currentHistogram.inputCollection == "muon-event pairs") fill2DHistogram(histo,currentHistogram,muons.product(),events.product(),
1271                                                                                            cumulativeFlags.at("muon-event pairs").at(currentDir),scaleFactor);
1272 <            else if(currentHistogram.inputCollection == "met-jet pairs") fill2DHistogram(histo,currentHistogram,mets.product(),jets.product(), \
1199 <                                                                                         cumulativeFlags.at("mets").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1272 >            else if(currentHistogram.inputCollection == "met-jet pairs") fill2DHistogram(histo,currentHistogram,mets.product(),jets.product(),
1273                                                                                           cumulativeFlags.at("met-jet pairs").at(currentDir),scaleFactor);
1274              else if(currentHistogram.inputCollection == "track-jet pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),jets.product(),
1202 –                                                                                         cumulativeFlags.at("tracks").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1275                                                                                           cumulativeFlags.at("track-jet pairs").at(currentDir),scaleFactor);
1276 <            else if(currentHistogram.inputCollection == "photon-jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(), \
1205 <                                                                                          cumulativeFlags.at("photons").at(currentDir),cumulativeFlags.at("jets").at(currentDir), \
1276 >            else if(currentHistogram.inputCollection == "photon-jet pairs") fill2DHistogram(histo,currentHistogram,photons.product(),jets.product(),
1277                                                                                            cumulativeFlags.at("photon-jet pairs").at(currentDir),scaleFactor);
1278 <            else if(currentHistogram.inputCollection == "muon-photon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),photons.product(), \
1208 <                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("photons").at(currentDir), \
1278 >            else if(currentHistogram.inputCollection == "muon-photon pairs") fill2DHistogram(histo,currentHistogram,muons.product(),photons.product(),
1279                                                                                            cumulativeFlags.at("muon-photon pairs").at(currentDir),scaleFactor);
1280              else if(currentHistogram.inputCollection == "electron-track pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),tracks.product(),
1211 –                                                                                                cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1281                                                                                                  cumulativeFlags.at("electron-track pairs").at(currentDir),scaleFactor);
1282              else if(currentHistogram.inputCollection == "muon-track pairs") fill2DHistogram(histo,currentHistogram,muons.product(),tracks.product(),
1283 <                                                                                            cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1283 >                                                                                            cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1284 >            else if(currentHistogram.inputCollection == "secondary muon-track pairs") fill2DHistogram(histo,currentHistogram,secMuons.product(),tracks.product(),
1285                                                                                              cumulativeFlags.at("muon-track pairs").at(currentDir),scaleFactor);
1286              else if(currentHistogram.inputCollection == "muon-tau pairs") fill2DHistogram(histo,currentHistogram,muons.product(),taus.product(),
1217 –                                                                                          cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1287                                                                                            cumulativeFlags.at("muon-tau pairs").at(currentDir),scaleFactor);
1288              else if(currentHistogram.inputCollection == "tau-tau pairs") fill2DHistogram(histo,currentHistogram,taus.product(),taus.product(),
1220 –                                                                                         cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("taus").at(currentDir),
1289                                                                                           cumulativeFlags.at("tau-tau pairs").at(currentDir),scaleFactor);
1290              else if(currentHistogram.inputCollection == "tau-track pairs") fill2DHistogram(histo,currentHistogram,taus.product(),tracks.product(),
1223 –                                                                                           cumulativeFlags.at("taus").at(currentDir),cumulativeFlags.at("tracks").at(currentDir),
1291                                                                                             cumulativeFlags.at("tau-track pairs").at(currentDir),scaleFactor);
1292              else if(currentHistogram.inputCollection == "electron-trigobj pairs") fill2DHistogram(histo,currentHistogram,electrons.product(),trigobjs.product(),
1226 –                                                                                                  cumulativeFlags.at("electrons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1293                                                                                                    cumulativeFlags.at("electron-trigobj pairs").at(currentDir),scaleFactor);
1294              else if(currentHistogram.inputCollection == "muon-trigobj pairs") fill2DHistogram(histo,currentHistogram,muons.product(),trigobjs.product(),
1229 –                                                                                              cumulativeFlags.at("muons").at(currentDir),cumulativeFlags.at("trigobjs").at(currentDir),
1295                                                                                                cumulativeFlags.at("muon-trigobj pairs").at(currentDir),scaleFactor);
1296              else if(currentHistogram.inputCollection == "events") fill2DHistogram(histo,currentHistogram,events.product(),cumulativeFlags.at("events").at(currentDir),scaleFactor);
1297              else if(currentHistogram.inputCollection == "taus") fill2DHistogram(histo,currentHistogram,taus.product(),cumulativeFlags.at("taus").at(currentDir),scaleFactor);
1298              else if(currentHistogram.inputCollection == "mets") fill2DHistogram(histo,currentHistogram,mets.product(),cumulativeFlags.at("mets").at(currentDir),scaleFactor);
1299              else if(currentHistogram.inputCollection == "tracks") fill2DHistogram(histo,currentHistogram,tracks.product(),cumulativeFlags.at("tracks").at(currentDir),scaleFactor);
1300              else if(currentHistogram.inputCollection == "track-event pairs") fill2DHistogram(histo,currentHistogram,tracks.product(),events.product(),
1236 –                                                                                             cumulativeFlags.at("tracks").at(currentDir),cumulativeFlags.at("events").at(currentDir),
1301                                                                                               cumulativeFlags.at("track-event pairs").at(currentDir),scaleFactor);
1302              else if(currentHistogram.inputCollection == "genjets") fill2DHistogram(histo,currentHistogram,genjets.product(),cumulativeFlags.at("genjets").at(currentDir),scaleFactor);
1303              else if(currentHistogram.inputCollection == "mcparticles") fill2DHistogram(histo,currentHistogram,mcparticles.product(),cumulativeFlags.at("mcparticles").at(currentDir),scaleFactor);
# Line 1254 | Line 1318 | OSUAnalysis::produce (edm::Event &event,
1318            string currentObject = objectsToPlot.at(currentObjectIndex);
1319            string objectToPlot = "";
1320  
1321 +          if (verbose_) clog << "Filling histogram of number of selected objects in collection: " << currentObject << endl;  
1322 +
1323            // Name of objectToPlot here must match the name specified in OSUAnalysis::OSUAnalysis().
1324            if(currentObject == "muon-muon pairs")                         objectToPlot = "dimuonPairs";
1325            else if(currentObject == "electron-electron pairs")            objectToPlot = "dielectronPairs";
# Line 1261 | Line 1327 | OSUAnalysis::produce (edm::Event &event,
1327            else if(currentObject == "electron-photon pairs")              objectToPlot = "electronPhotonPairs";
1328            else if(currentObject == "electron-jet pairs")                 objectToPlot = "electronJetPairs";
1329            else if(currentObject == "muon-jet pairs")                     objectToPlot = "muonJetPairs";
1330 <          else if(currentObject == "muon-event pairs")                     objectToPlot = "muonEventPairs";
1331 <          else if(currentObject == "muon-photon pairs")                     objectToPlot = "muonPhotonPairs";
1332 <          else if(currentObject == "photon-jet pairs")                     objectToPlot = "photonJetPairs";
1330 >          else if(currentObject == "muon-event pairs")                   objectToPlot = "muonEventPairs";
1331 >          else if(currentObject == "muon-photon pairs")                  objectToPlot = "muonPhotonPairs";
1332 >          else if(currentObject == "photon-jet pairs")                   objectToPlot = "photonJetPairs";
1333            else if(currentObject == "met-jet pairs")                      objectToPlot = "metJetPairs";
1334            else if(currentObject == "track-jet pairs")                    objectToPlot = "trackJetPairs";
1335            else if(currentObject == "jet-jet pairs")                      objectToPlot = "dijetPairs";
1336            else if(currentObject == "jet-secondary jet pairs")            objectToPlot = "jetSecondaryJetPairs";
1337            else if(currentObject == "secondary jets")                     objectToPlot = "secondaryJets";
1338 <          else if(currentObject == "secondary photons")                     objectToPlot = "secondaryPhotons";
1338 >          else if(currentObject == "secondary photons")                  objectToPlot = "secondaryPhotons";
1339            else if(currentObject == "electron-track pairs")               objectToPlot = "electronTrackPairs";
1340            else if(currentObject == "muon-track pairs")                   objectToPlot = "muonTrackPairs";
1341 +          else if(currentObject == "secondary muon-track pairs")         objectToPlot = "secondaryMuonTrackPairs";
1342            else if(currentObject == "muon-tau pairs")                     objectToPlot = "muonTauPairs";
1343            else if(currentObject == "tau-tau pairs")                      objectToPlot = "ditauPairs";
1344            else if(currentObject == "tau-track pairs")                    objectToPlot = "tauTrackPairs";
# Line 1279 | Line 1346 | OSUAnalysis::produce (edm::Event &event,
1346            else if(currentObject == "muon-secondary muon pairs")          objectToPlot = "muonSecondaryMuonPairs";
1347            else if(currentObject == "secondary muons")                    objectToPlot = "secondaryMuons";
1348            else if(currentObject == "muon-secondary jet pairs")           objectToPlot = "muonSecondaryJetPairs";
1349 <          else if(currentObject == "muon-secondary photon pairs")           objectToPlot = "muonSecondaryJetPairs";
1349 >          else if(currentObject == "muon-secondary photon pairs")        objectToPlot = "muonSecondaryJetPairs";
1350            else if(currentObject == "electron-secondary jet pairs")       objectToPlot = "electronSecondaryJetPairs";
1351            else if(currentObject == "photon-secondary jet pairs")         objectToPlot = "photonSecondaryJetPairs";
1352            else if(currentObject == "electron-secondary electron pairs")  objectToPlot = "electronSecondaryElectronPairs";
1353            else if(currentObject == "secondary electrons")                objectToPlot = "secondaryElectrons";
1354            else if(currentObject == "electron-trigobj pairs")             objectToPlot = "electronTrigobjPairs";
1355            else if(currentObject == "muon-trigobj pairs")                 objectToPlot = "muonTrigobjPairs";
1356 +          else if(currentObject == "electron-mcparticle pairs")          objectToPlot = "electronMCparticlePairs";
1357            else objectToPlot = currentObject;
1358  
1359            string tempCurrentObject = objectToPlot;
# Line 1293 | Line 1361 | OSUAnalysis::produce (edm::Event &event,
1361            string histoName = "num" + tempCurrentObject;
1362  
1363  
1364 <          if(find(objectsToCut.begin(), objectsToCut.end(), currentObject) != objectsToCut.end()) {
1364 >          if(find(objectsToPlot.begin(), objectsToPlot.end(), currentObject) != objectsToPlot.end()) {
1365              flagPair lastCutFlags = cumulativeFlags.at(currentObject).at(currentDir);
1366              int numToPlot = 0;
1367 <            for (uint currentFlag = 0; currentFlag != lastCutFlags.size(); currentFlag++){
1368 <              if(lastCutFlags.at(currentFlag).second) numToPlot++;
1367 >            for (uint iObj = 0; iObj != lastCutFlags.size(); iObj++){  // loop over all the objects  
1368 >              if(lastCutFlags.at(iObj).second) {
1369 >                numToPlot++;  
1370 >                if (verbose_>3) clog << "   Found object " << iObj << " in collection " << currentObject << " to plot." << endl;
1371 >              }
1372              }
1373  
1374              if(objectToPlot == "primaryvertexs"){
# Line 1305 | Line 1376 | OSUAnalysis::produce (edm::Event &event,
1376                oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName+"AfterPileupCorrection")->Fill(primaryvertexs->size(),scaleFactor);
1377              }
1378              else {
1379 +              if (printEventInfo_) clog << "Number of selected " << objectToPlot << " to plot:  " << numToPlot << endl;  
1380                oneDHists_.at(currentChannelIndex).at(currentCut).at(histoName)->Fill(numToPlot,scaleFactor);
1381              }
1382            }
1383 +
1384          } // end for (uint currentObjectIndex = 0; currentObjectIndex != objectsToPlot.size(); currentObjectIndex++)
1385  
1386  
# Line 1323 | Line 1396 | OSUAnalysis::produce (edm::Event &event,
1396  
1397          if     (coll == "jets")                assignTreeBranch(brSpecs,jets.product(),          cumulativeFlags.at(coll).back());
1398          else if(coll == "secondary jets")      assignTreeBranch(brSpecs,jets.product(),          cumulativeFlags.at(coll).back());
1399 <        else if(coll == "secondary photons")      assignTreeBranch(brSpecs,photons.product(),          cumulativeFlags.at(coll).back());
1399 >        else if(coll == "secondary photons")   assignTreeBranch(brSpecs,photons.product(),       cumulativeFlags.at(coll).back());
1400          else if(coll == "muons")               assignTreeBranch(brSpecs,muons.product(),         cumulativeFlags.at(coll).back());
1401 <        else if(coll == "secondary muons")     assignTreeBranch(brSpecs,muons.product(),         cumulativeFlags.at(coll).back());
1401 >        else if(coll == "secondary muons")     assignTreeBranch(brSpecs,secMuons.product(),      cumulativeFlags.at(coll).back());
1402          else if(coll == "electrons")           assignTreeBranch(brSpecs,electrons.product(),     cumulativeFlags.at(coll).back());
1403          else if(coll == "secondary electrons") assignTreeBranch(brSpecs,electrons.product(),     cumulativeFlags.at(coll).back());
1404          else if(coll == "events")              assignTreeBranch(brSpecs,events.product(),        cumulativeFlags.at(coll).back());
# Line 1342 | Line 1415 | OSUAnalysis::produce (edm::Event &event,
1415          else if(coll == "stops"
1416                  && datasetType_ == "signalMC") assignTreeBranch(brSpecs,stops.product(),         cumulativeFlags.at(coll).back());
1417        } // end loop over branches
1418 +      // set the evtLong, runInt, and lumiInt variables separately, since they are not type float  
1419 +      BNTreeBranchVals_evtLong_ = events->at(0).evt;
1420 +      BNTreeBranchVals_runInt_  = events->at(0).run;
1421 +      BNTreeBranchVals_lumiInt_ = events->at(0).lumi;
1422  
1423        if (!BNTrees_.at(currentChannelIndex)) { clog << "ERROR:  Undefined BNTree.  Will likely seg fault." << endl; }
1424        BNTrees_.at(currentChannelIndex)->Fill();  // only fill if event has passed cuts
# Line 1355 | Line 1432 | OSUAnalysis::produce (edm::Event &event,
1432  
1433    event.put (channelDecisions, "channelDecisions");
1434  
1435 < } // end void OSUAnalysis::analyze (const edm::Event &event, const edm::EventSetup &setup)
1435 >  isFirstEvent_ = false;  
1436 >
1437 >  if (verbose_) clog << "Finished OSUAnalysis::produce." << endl;  
1438 >
1439 > } // end void OSUAnalysis::produce (const edm::Event &event, const edm::EventSetup &setup)
1440  
1441  
1442  
# Line 1383 | Line 1464 | OSUAnalysis::evaluateComparison (string
1464    else if(comparison == "<")  return testValue <  cutValue;
1465    else if(comparison == "<=") return testValue <= cutValue;
1466    else if(comparison == "==") return testValue == cutValue;
1467 <  else if(comparison == "=") return testValue == cutValue;
1467 >  else if(comparison == "=")  return testValue == cutValue;
1468    else if(comparison == "!=") return testValue != cutValue;
1469    else {clog << "WARNING: invalid comparison operator '" << comparison << "'\n"; return false;}
1470  
# Line 1788 | Line 1869 | OSUAnalysis::valueLookup (const BNmuon*
1869        (object->isGlobalMuon  > 0 ||
1870         object->isTrackerMuon > 0);
1871    }
1872 +  else if(variable == "looseIDGlobalMuon") {
1873 +    value = object->pt > 10 &&
1874 +      object->isGlobalMuon  > 0;
1875 +  }
1876    else if(variable == "correctedD0VertexErr") value =  hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1877    else if(variable == "correctedD0VertexSig") value =  object->correctedD0Vertex / hypot (object->tkD0err, hypot (chosenVertex ()->xError, chosenVertex ()->yError));
1878    else if(variable == "detIso") value = (object->trackIsoDR03) / object->pt;
# Line 1803 | Line 1888 | OSUAnalysis::valueLookup (const BNmuon*
1888      else
1889        value = -999;
1890    }
1891 <
1892 <
1891 >  else if(variable == "ptPlusMet") {
1892 >    // Calculate the magnitude of the vector sum of the muon pT and the Met.  
1893 >    if (const BNmet *met = chosenMET ())
1894 >      {
1895 >        TVector2 p2Met;
1896 >        TVector2 p2Muon;
1897 >        p2Met. SetMagPhi(   met->pt,    met->phi);
1898 >        p2Muon.SetMagPhi(object->pt, object->phi);  
1899 >        TVector2 p2MetElec = p2Met + p2Muon;
1900 >        value = p2MetElec.Mod();  
1901 >      }
1902 >    else
1903 >      value = -999;
1904 >  }
1905  
1906    else if(variable == "correctedD0VertexInEBPlus"){
1907      if(fabs(object->eta) < 0.8 && object->eta > 0) value = object->correctedD0Vertex;
# Line 2176 | Line 2273 | OSUAnalysis::valueLookup (const BNelectr
2273        value = -999;
2274    }
2275  
2276 +  else if(variable == "ptPlusMet") {
2277 +    // Calculate the magnitude of the vector sum of the electron pT and the Met.  
2278 +    if (const BNmet *met = chosenMET ())
2279 +      {
2280 +        TVector2 p2Met;
2281 +        TVector2 p2Elec;
2282 +        p2Met. SetMagPhi(   met->pt,    met->phi);
2283 +        p2Elec.SetMagPhi(object->pt, object->phi);  
2284 +        TVector2 p2MetElec = p2Met + p2Elec;
2285 +        value = p2MetElec.Mod();  
2286 +      }
2287 +    else
2288 +      value = -999;
2289 +  }
2290 +
2291    else if(variable == "correctedD0VertexEEPositiveChargeLowPt"){
2292      if(fabs(object->eta) > 1.479 && object->charge > 0 && object->pt > 45) value = object->correctedD0Vertex;
2293      else value = -999;
# Line 2439 | Line 2551 | OSUAnalysis::valueLookup (const BNevent*
2551    else if(variable == "pthat") value = object->pthat;
2552    else if(variable == "qScale") value = object->qScale;
2553    else if(variable == "alphaQCD") value = object->alphaQCD;
2442 –  else if(variable == "Ht") value = getHt(jets.product());
2554    else if(variable == "alphaQED") value = object->alphaQED;
2555    else if(variable == "scalePDF") value = object->scalePDF;
2556    else if(variable == "x1") value = object->x1;
# Line 2510 | Line 2621 | OSUAnalysis::valueLookup (const BNevent*
2621    else if(variable == "electronScaleFactor") value = electronScaleFactor_;
2622    else if(variable == "stopCTauScaleFactor") value = stopCTauScaleFactor_;
2623    else if(variable == "bTagScaleFactor") value = bTagScaleFactor_;
2624 +
2625 +  else if(variable == "unfilteredHt") value = getHt(jets.product());
2626    else if(variable == "ht") value = chosenHT ();
2627 +
2628    else if(variable == "leadMuPairInvMass"){
2629      pair<const BNmuon *, const BNmuon *> muPair = leadMuonPair ();
2630      TLorentzVector p0 (muPair.first->px, muPair.first->py, muPair.first->pz, muPair.first->energy),
# Line 2764 | Line 2878 | OSUAnalysis::valueLookup (const BNtrack*
2878    else if(variable == "nHitsMissingInner")  value = object->nHitsMissingInner;
2879    else if(variable == "nHitsMissingMiddle") value = object->nHitsMissingMiddle;
2880    else if(variable == "depTrkRp3")          value = object->depTrkRp3;
2881 <  else if(variable == "trkRelIsoRp3")       value = (object->depTrkRp3 - object->pt) / object->pt;
2882 <  else if(variable == "trkRelIsoRp5")       value = (object->depTrkRp5 - object->pt) / object->pt;
2881 >  else if(variable == "trkRelIsoRp3")     { value = (object->depTrkRp3 - object->pt) / object->pt; if (value<0) value = 0; }
2882 >  else if(variable == "trkRelIsoRp5")     { value = (object->depTrkRp5 - object->pt) / object->pt; if (value<0) value = 0; }
2883    else if(variable == "depEcalRp3")         value = object->depEcalRp3;
2884    else if(variable == "depHcalRp3")         value = object->depHcalRp3;
2885    else if(variable == "depHoRp3")           value = object->depHoRp3;
# Line 2789 | Line 2903 | OSUAnalysis::valueLookup (const BNtrack*
2903    else if(variable == "dZwrtBS") value = object->dZ - events->at(0).BSz;
2904    else if(variable == "depTrkRp5MinusPt"){
2905      if ( (object->depTrkRp5 - object->pt) < 0 ) {
2906 + //       clog << "Warning:  found track with depTrkRp5 < pt:  depTrkRp5=" << object->depTrkRp5
2907 + //         << "; pt=" << object->pt
2908 + //         << "; object->depTrkRp5 - object->pt = " << object->depTrkRp5 - object->pt
2909 + //         << endl;  
2910             value = 0;
2911           }
2912           else value =  (object->depTrkRp5 - object->pt);
# Line 2811 | Line 2929 | OSUAnalysis::valueLookup (const BNtrack*
2929    else if(variable == "caloTotDeltaRp5ByP")         value = ((object->caloHadDeltaRp5 + object->caloEMDeltaRp5)/pMag);
2930    else if(variable == "caloTotDeltaRp5RhoCorr")     value = getTrkCaloTotRhoCorr(object);
2931    else if(variable == "caloTotDeltaRp5ByPRhoCorr")  value = getTrkCaloTotRhoCorr(object) / pMag;
2932 +  else if(variable == "depTrkRp5RhoCorr")           value = getTrkDepTrkRp5RhoCorr(object);
2933 +  else if(variable == "depTrkRp3RhoCorr")           value = getTrkDepTrkRp3RhoCorr(object);
2934 +
2935 +  else if(variable == "depTrkRp5MinusPtRhoCorr")    {
2936 +    if ( (getTrkDepTrkRp5RhoCorr(object) - object->pt) < 0 ) value = 0;
2937 +    else {value = (getTrkDepTrkRp5RhoCorr(object) - object->pt );}
2938 +  }
2939 +  
2940 +  else if(variable == "depTrkRp3MinusPtRhoCorr")    
2941 +    {
2942 +      if ( (getTrkDepTrkRp3RhoCorr(object) - object->pt) < 0 ) value = 0;
2943 +      else {value = (getTrkDepTrkRp3RhoCorr(object) - object->pt );}
2944 +    }
2945 +
2946    else if(variable == "isIso")                      value = getTrkIsIso(object, tracks.product());
2947    else if(variable == "isMatchedDeadEcal")          value = getTrkIsMatchedDeadEcal(object);
2948    else if(variable == "ptErrorByPt")                value = (object->ptError/object->pt);
# Line 2835 | Line 2967 | OSUAnalysis::valueLookup (const BNtrack*
2967      value = vz - (vx * px + vy * py)/pt * (pz/pt);
2968    }
2969  
2970 +  else if(variable == "deltaRMinSubLeadJet") {
2971 +    // calculate minimum deltaR between track and any other subleading jet  
2972 +    double trkJetDeltaRMin = 99.;  
2973 +    for (uint ijet = 0; ijet<jets->size(); ijet++) {
2974 +      string empty = "";  
2975 +      double isSubLeadingJet = valueLookup(&jets->at(ijet), "disappTrkSubLeadingJetID", "", empty);  
2976 +      if (!isSubLeadingJet) continue;  // only consider jets that pass the subleading jet ID criteria  
2977 +      double jetEta = valueLookup(&jets->at(ijet), "eta", "", empty);
2978 +      double jetPhi = valueLookup(&jets->at(ijet), "phi", "", empty);
2979 +      double trkJetDeltaR = deltaR(object->eta, object->phi, jetEta, jetPhi);  
2980 +      if (trkJetDeltaR < trkJetDeltaRMin) trkJetDeltaRMin = trkJetDeltaR;
2981 +    }
2982 +    value = trkJetDeltaRMin;  
2983 +  }  
2984 +  
2985 +  else if(variable == "deltaRMinElecLooseMvaId") {
2986 +    // calculate minimum deltaR between track and any other electron passing loose mva ID, i.e., mvaNonTrigV0 > 0
2987 +    double trkElecDeltaRMin = 99.;  
2988 +    for (uint ielec = 0; ielec<electrons->size(); ielec++) {
2989 +      string empty = "";  
2990 +      double mvaNonTrigV0 = valueLookup(&electrons->at(ielec), "mvaNonTrigV0", "", empty);  
2991 +      if (mvaNonTrigV0 < 0) continue;  // only consider electrons with mvaNonTrigV0 > 0  
2992 +      double elecEta = valueLookup(&electrons->at(ielec), "eta", "", empty);
2993 +      double elecPhi = valueLookup(&electrons->at(ielec), "phi", "", empty);
2994 +      double trkElecDeltaR = deltaR(object->eta, object->phi, elecEta, elecPhi);  
2995 +      if (trkElecDeltaR < trkElecDeltaRMin) trkElecDeltaRMin = trkElecDeltaR;
2996 +    }
2997 +    value = trkElecDeltaRMin;  
2998 +  }  
2999 +
3000 +  else if(variable == "deltaRMinMuonLooseId") {
3001 +    // calculate minimum deltaR between track and any other loose-Id muon
3002 +    double trkMuonDeltaRMin = 99.;  
3003 +    //    if (!muons) cout << "ERROR:  could not find muon collection for calculation of deltaRMinMuonLooseId" << endl;  
3004 +    for (uint imuon = 0; imuon<muons->size(); imuon++) {
3005 +      string empty = "";  
3006 +      double isLooseIdMuon = valueLookup(&muons->at(imuon), "looseID", "", empty);  
3007 +      if (!isLooseIdMuon) continue;  // only consider muons that pass the looseID criteria  
3008 +      double muonEta = valueLookup(&muons->at(imuon), "eta", "", empty);
3009 +      double muonPhi = valueLookup(&muons->at(imuon), "phi", "", empty);
3010 +      double trkMuonDeltaR = deltaR(object->eta, object->phi, muonEta, muonPhi);  
3011 +      if (trkMuonDeltaR < trkMuonDeltaRMin) trkMuonDeltaRMin = trkMuonDeltaR;
3012 +    }
3013 +    value = trkMuonDeltaRMin;  
3014 +  }  
3015 +  
3016 +  else if(variable == "deltaRMinSecMuonLooseIdGlobal") {
3017 +    // calculate minimum deltaR between track and any other loose-Id muon
3018 +    double trkMuonDeltaRMin = 99.;  
3019 +    //    if (!secMuons) cout << "ERROR:  could not find secondary muon collection for calculation of deltaRMinSecMuonLooseIdGlobal" << endl;  
3020 +    for (uint imuon = 0; imuon<secMuons->size(); imuon++) {  
3021 +      string empty = "";  
3022 +      double isLooseIdMuon = valueLookup(&secMuons->at(imuon), "looseIDGlobalMuon", "", empty);  
3023 +      if (!isLooseIdMuon) continue;  // only consider muons that pass the looseIDGlobal criteria  
3024 +      double muonEta = valueLookup(&secMuons->at(imuon), "eta", "", empty);
3025 +      double muonPhi = valueLookup(&secMuons->at(imuon), "phi", "", empty);
3026 +      double trkMuonDeltaR = deltaR(object->eta, object->phi, muonEta, muonPhi);  
3027 +      if (trkMuonDeltaR < trkMuonDeltaRMin) trkMuonDeltaRMin = trkMuonDeltaR;
3028 +    }
3029 +    value = trkMuonDeltaRMin;  
3030 +  }  
3031 +  
3032 +  else if(variable == "deltaRMinTauLooseHadronicId") {
3033 +    // calculate minimum deltaR between track and any other tau passing loose hadronic ID  
3034 +    double trkTauDeltaRMin = 99.;  
3035 +    //    if (!taus) cout << "ERROR:  could not find tau collection for calculation of deltaRMinTauLooseHadronicId" << endl;  
3036 +    for (uint itau = 0; itau<taus->size(); itau++) {
3037 +      string empty = "";  
3038 +      double isIdTau = valueLookup(&taus->at(itau), "looseHadronicID", "", empty);  
3039 +      if (!isIdTau) continue;  // only consider taus that pass the loose hadronic ID criteria  
3040 +      double tauEta = valueLookup(&taus->at(itau), "eta", "", empty);
3041 +      double tauPhi = valueLookup(&taus->at(itau), "phi", "", empty);
3042 +      double trkTauDeltaR = deltaR(object->eta, object->phi, tauEta, tauPhi);  
3043 +      if (trkTauDeltaR < trkTauDeltaRMin) trkTauDeltaRMin = trkTauDeltaR;
3044 +    }
3045 +    value = trkTauDeltaRMin;  
3046 +  }  
3047  
3048    else if(variable == "genDeltaRLowest") value = getGenDeltaRLowest(object);
3049  
# Line 2883 | Line 3092 | OSUAnalysis::valueLookup (const BNtrack*
3092  
3093  
3094  
3095 <  else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3095 >  else{clog << "WARNING: invalid variable '" << variable << "' for BNtrack collection.\n"; value = -999;}
3096  
3097    value = applyFunction(function, value);
3098  
# Line 3578 | Line 3787 | OSUAnalysis::valueLookup (const BNelectr
3787    return value;
3788   } // end electron-muon pair valueLookup
3789  
3790 <
3790 >
3791   //!electron-jet pair valueLookup
3792   double
3793   OSUAnalysis::valueLookup (const BNelectron* object1, const BNjet* object2, string variable, string function, string &stringValue){
# Line 3618 | Line 3827 | OSUAnalysis::valueLookup (const BNelectr
3827    return value;
3828   }
3829  
3830 + //!electron-mcparticle pair valueLookup
3831 + double
3832 + OSUAnalysis::valueLookup (const BNelectron* object1, const BNmcparticle* object2, string variable, string function, string &stringValue){
3833 +
3834 +  double value = 0.0;
3835 +
3836 +  if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
3837 +  else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
3838 +  else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
3839 +  else if(variable == "threeDAngle")
3840 +    {
3841 +      TVector3 threeVector1(object1->px, object1->py, object1->pz);
3842 +      TVector3 threeVector2(object2->px, object2->py, object2->pz);
3843 +      value = (threeVector1.Angle(threeVector2));
3844 +    }
3845 +  else if(variable == "chargeProduct"){
3846 +    value = object1->charge*object2->charge;
3847 +  }
3848 +
3849 +  else{clog << "WARNING: invalid variable '" << variable << "'\n"; value = -999;}
3850 +  value = applyFunction(function, value);
3851 +
3852 +  return value;
3853 + }
3854 +
3855 +
3856   //!photon-jet pair valueLookup
3857   double
3858   OSUAnalysis::valueLookup (const BNphoton* object1, const BNjet* object2, string variable, string function, string &stringValue){
# Line 3795 | Line 4030 | OSUAnalysis::valueLookup (const BNelectr
4030    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4031    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4032    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4033 +  else if(variable == "deltaRLooseMvaId") {
4034 +    // only consider electrons that pass "loose MVA id", i.e., mvaNonTrigV0 > 0;
4035 +    // otherwise return very large value (99)  
4036 +    if (object1->mvaNonTrigV0>0) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4037 +    else                         value = 99.;  
4038 +  }
4039    else if(variable == "invMass"){
4040      fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, electronMass);
4041      fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, electronMass );
# Line 3822 | Line 4063 | OSUAnalysis::valueLookup (const BNmuon*
4063    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4064    else if(variable == "deltaEta") value = fabs(object1->eta - object2->eta);
4065    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4066 +  else if(variable == "deltaRLooseID") {
4067 +    // only consider muons that pass looseId criteria; otherwise return very large value (99.)  
4068 +    string empty = "";  
4069 +    double isLooseId = valueLookup(object1, "looseID", "", empty);    
4070 +    if (isLooseId) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4071 +    else           value = 99.;  
4072 +  }
4073 +  else if(variable == "deltaRGlobalMuon") {
4074 +    // only consider muons that pass looseId criteria; otherwise return very large value (99.)  
4075 +    if (object1->isGlobalMuon) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4076 +    else                       value = 99.;  
4077 +  }
4078    else if(variable == "invMass"){
4079      fourVector1.SetPtEtaPhiM(object1->pt, object1->eta, object1->phi, muonMass);
4080      fourVector2.SetPtEtaPhiM(object2->pt, object2->eta, object2->phi, pionMass );
# Line 3887 | Line 4140 | OSUAnalysis::valueLookup (const BNtau* o
4140    double value = 0.0;
4141    if(variable == "deltaPhi") value = fabs(deltaPhi(object1->phi,object2->phi));
4142    else if(variable == "deltaR") value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4143 +  else if(variable == "deltaRLooseHadronicID") {
4144 +    // only consider tau's that pass the loose hadronic ID criteria; otherwise return very large value (99)  
4145 +    string empty = "";  
4146 +    double isLooseHadronicID = valueLookup(object1, "looseHadronicID", "", empty);    
4147 +  
4148 +    if (isLooseHadronicID) value = deltaR(object1->eta,object1->phi,object2->eta,object2->phi);
4149 +    else                   value = 99.;  
4150 +  }
4151    else if(variable == "chargeProduct"){
4152      value = object1->charge*object2->charge;
4153    }
# Line 4151 | Line 4412 | OSUAnalysis::getTrkCaloTotRhoCorr(const
4412  
4413   }
4414  
4415 + double
4416 + OSUAnalysis::getTrkDepTrkRp5RhoCorr(const BNtrack* track) {
4417 +  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.              
4418 +  if (!useTrackCaloRhoCorr_) return -99;
4419 +  // if (!rhokt6CaloJetsHandle_) {                                                                                                    
4420 +  //   clog << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;                        
4421 +  //   return -99;                                                                                                                    
4422 +  // }                                                                                                                                
4423 +  double radDeltaRCone = 0.5;
4424 +  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  // Define effective area as pi*r^2, where r is radius of DeltaR cone.                                                                                                          
4425 +  double rawDepTrkRp5 = track->depTrkRp5;
4426 + double depTrkRp5RhoCorr = TMath::Max(0., rawDepTrkRp5 - rhoCorr_kt6CaloJets);
4427 + return depTrkRp5RhoCorr;
4428 +
4429 + }
4430 +
4431 + double
4432 + OSUAnalysis::getTrkDepTrkRp3RhoCorr(const BNtrack* track) {
4433 +  // Return the pile-up (rho) corrected isolation energy, i.e., the total calorimeter energy around the candidate track.                                                
4434 +  if (!useTrackCaloRhoCorr_) return -99;
4435 +  // if (!rhokt6CaloJetsHandle_) {                                                                                                                                      
4436 +  //   clog << "ERROR [getTrkCaloTotRhoCorr]:  The collection rhokt6CaloJetsHandle is not available!" << endl;                                                          
4437 +  //   return -99;                                                                                                                                                      
4438 +  // }                                                                                                                                                                  
4439 +  double radDeltaRCone = 0.3;
4440 + // Define effective area as pi*r^2, where r is radius of DeltaR cone
4441 +  double rhoCorr_kt6CaloJets = *rhokt6CaloJetsHandle_ * TMath::Pi() * pow(radDeltaRCone, 2);  
4442 +  double rawDepTrkRp3 = track->depTrkRp3;
4443 +  double depTrkRp3RhoCorr = TMath::Max(0., rawDepTrkRp3 - rhoCorr_kt6CaloJets);
4444 +  return depTrkRp3RhoCorr;
4445 +  
4446 + }
4447 +
4448  
4449  
4450  
# Line 4227 | Line 4521 | OSUAnalysis::applyFunction(string functi
4521   template <class InputCollection>
4522   void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, InputCollection inputCollection, string inputType){
4523  
4524 +  if (verbose_>2) clog << "  Beginning setObjectFlags for cut " << currentCutIndex << ": " << currentCut.name
4525 +                       << ", inputType=" << inputType
4526 +                       << endl;  
4527    if (currentCut.inputCollection.find("pair")!=string::npos)  {
4528      string obj1, obj2;
4529      getTwoObjs(currentCut.inputCollection, obj1, obj2);
4530 +    if (verbose_>2) clog << "  Two object types:  " << obj1 << ", " << obj2 << endl;
4531      if (inputType==obj1 ||
4532          inputType==obj2) {
4533        // Do not add a cut to individualFlags or cumulativeFlags, if the cut is on a paired collection,
# Line 4241 | Line 4539 | void OSUAnalysis::setObjectFlags(cut &cu
4539      }
4540    }
4541  
4542 +  if (!inputCollection) cout << "ERROR:  invalid input collection for inputType=" << inputType << endl;  
4543 +
4544 +  if (verbose_>3) clog << "   Collection size:  " << inputCollection->size() << endl;
4545 +
4546    for (uint object = 0; object != inputCollection->size(); object++){
4547  
4548 +    if (verbose_>4) clog << "    Setting flags for object " << object << endl;
4549 +
4550      bool cutDecision = true;//object passes if this cut doesn't cut on that type of object
4551      bool plotDecision = true;
4552  
# Line 4267 | Line 4571 | void OSUAnalysis::setObjectFlags(cut &cu
4571          }
4572          cutDecision = tempDecision;
4573        }
4574 <      //invert the cut for plotting if this cut is a veto
4575 <      if(currentCut.isVeto) plotDecision = !cutDecision;
4576 <      else plotDecision = cutDecision;
4574 >      //invert the cut if this cut is a veto
4575 >      if(currentCut.isVeto) cutDecision = !cutDecision;
4576 >      plotDecision = cutDecision;
4577      }
4578  
4579      individualFlags.at(inputType).at(currentCutIndex).push_back(make_pair(cutDecision,plotDecision));
# Line 4290 | Line 4594 | void OSUAnalysis::setObjectFlags(cut &cu
4594  
4595      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(make_pair(previousCumulativeCutFlag,previousCumulativePlotFlag));
4596  
4597 <  }
4597 >  }  //   for (uint object = 0; object != inputCollection->size(); object++){
4598  
4599 < }
4599 > } // end void OSUAnalysis::setObjectFlags
4600  
4601  
4602   template <class InputCollection1, class InputCollection2>
4603 < void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags, \
4604 <                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, flagPair flags1, flagPair flags2, string inputType){
4605 <
4603 > void OSUAnalysis::setObjectFlags(cut &currentCut, uint currentCutIndex, flagMap &individualFlags, flagMap &cumulativeFlags,
4604 >                                 InputCollection1 inputCollection1, InputCollection2 inputCollection2, string inputType){
4605 >  // This function sets the flags for the paired object collection.  
4606 >  // If the cut is applying on the given paired object collection, then the flags for the single object collections are also set.
4607 >  // If not, then the flags for the paired object collection are taken as the AND of the flags for each single object collection.  
4608 >
4609 >  if (verbose_>2) clog << "  Beginning setObjectFlags for cut=" << currentCut.name
4610 >                       << ", inputType=" << inputType
4611 >                       << endl;  
4612  
4613    bool sameObjects = false;
4614 <  if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
4614 >  if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;  // FIXME:  is sameObjects just the not of isTwoTypesOfObject?  If so, it's redundant.  
4615  
4616    // Get the strings for the two objects that make up the pair.
4617    string obj1Type, obj2Type;
# Line 4332 | Line 4642 | void OSUAnalysis::setObjectFlags(cut &cu
4642        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
4643  
4644  
4645 <      bool cutDecision = true;//object passes if this cut doesn't cut on that type of object
4645 >      bool cutDecision  = true;//object passes if this cut doesn't cut on that type of object
4646        bool plotDecision = true;
4647  
4648 +      // Determine whether each pair passes the cut, only if inputCollection is the same as the inputType.  
4649        if(currentCut.inputCollection == inputType){
4650  
4651          vector<bool> subcutDecisions;
4652          for( int subcutIndex = 0; subcutIndex != currentCut.numSubcuts; subcutIndex++){
4653            string stringValue = "";
4654            double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), currentCut.variables.at(subcutIndex), currentCut.functions.at(subcutIndex), stringValue);
4655 +          if (verbose_>1) clog << currentCut.variables.at(subcutIndex) << " = " << value
4656 +                               << endl;  
4657            if (stringValue == "") subcutDecisions.push_back(evaluateComparison(value,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutValues.at(subcutIndex)));
4658            else subcutDecisions.push_back(evaluateComparison(stringValue,currentCut.comparativeOperators.at(subcutIndex),currentCut.cutStringValues.at(subcutIndex)));
4659          }
# Line 4356 | Line 4669 | void OSUAnalysis::setObjectFlags(cut &cu
4669            }
4670            cutDecision = tempDecision;
4671          }
4672 <        //invert the cut for plotting if this cut is a veto
4673 <        if(currentCut.isVeto) plotDecision = !cutDecision;
4674 <        else plotDecision = cutDecision;
4675 <      }
4676 <      individualFlags.at(inputType).at(currentCutIndex).push_back(make_pair(cutDecision,plotDecision));
4677 <      if (cutDecision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4678 <        individualFlags.at(obj1Type).at(currentCutIndex).at(object1).first = true;
4679 <        individualFlags.at(obj2Type).at(currentCutIndex).at(object2).first = true;
4680 <      }
4681 <      if (plotDecision && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4682 <        individualFlags.at(obj1Type).at(currentCutIndex).at(object1).second = true;
4683 <        individualFlags.at(obj2Type).at(currentCutIndex).at(object2).second = true;
4684 <      }
4672 >        //invert the cut if this cut is a veto
4673 >        if (currentCut.isVeto) cutDecision = !cutDecision;
4674 >        plotDecision = cutDecision;
4675 >
4676 >        if (verbose_>1) clog << " cutDecision = " << cutDecision
4677 >                             << "; for currentCut.inputCollection = " << currentCut.inputCollection
4678 >                             << "; object1 (" << obj1Type << ") = " << object1
4679 >                             << "; object2 (" << obj2Type << ") = " << object2
4680 >                             << endl;  
4681 >        
4682 >        if (cutDecision) {  // only set the flags for the individual objects if the pair object is being cut on
4683 >          individualFlags.at(obj1Type).at(currentCutIndex).at(object1).first = true;
4684 >          individualFlags.at(obj2Type).at(currentCutIndex).at(object2).first = true;
4685 >        }
4686 >        if (plotDecision) {  // only set the flags for the individual objects if the pair object is being cut on
4687 >          individualFlags.at(obj1Type).at(currentCutIndex).at(object1).second = true;
4688 >          individualFlags.at(obj2Type).at(currentCutIndex).at(object2).second = true;
4689 >        }
4690 >        
4691 >
4692 >      } // if(currentCut.inputCollection == inputType){
4693 >
4694 >      // The individualFlags will be true if the inputCollection is not the same as the inputType.
4695 >      // They are also independent of the previous flags on the single objects.  
4696 >      individualFlags.at(inputType).at(currentCutIndex).push_back(make_pair(cutDecision,plotDecision));  
4697  
4698 <      //set flags for objects that pass this cut AND all the previous cuts
4698 >
4699 >
4700 >      // ************************************
4701 >      // Determine cumulative flags
4702 >      // ************************************
4703 >      // determine whether this paired object passes this cut AND all previous cuts
4704        bool previousCumulativeCutFlag = true;
4705        for(uint previousCutIndex = 0; previousCutIndex != currentCutIndex; previousCutIndex++){
4706 <        if(previousCumulativeCutFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter).first) previousCumulativeCutFlag = true;
4707 <        else{ previousCumulativeCutFlag = false; break;}
4706 >        if(previousCumulativeCutFlag && individualFlags.at(inputType).at(previousCutIndex).at(counter).first) previousCumulativeCutFlag = true;
4707 >        else{ previousCumulativeCutFlag = false; break;}
4708        }
4709        previousCumulativeCutFlag = previousCumulativeCutFlag && cutDecision;
4710  
# Line 4385 | Line 4715 | void OSUAnalysis::setObjectFlags(cut &cu
4715        }
4716        previousCumulativePlotFlag = previousCumulativePlotFlag && plotDecision;
4717        
4718 <      //apply flags for the components of the composite object as well
4718 >      // Get the index for the flags of each of the single objects in the pair.  Usually this is the index of the previous cut, i.e., currentCutIndex-1.    
4719 >      int cutIdxFlagsObj1 = max(int(currentCutIndex-1),0);
4720 >      int cutIdxFlagsObj2 = max(int(currentCutIndex-1),0);
4721 >      // If the inputCollection of the cut is not equal to the inputType but the inputCollection includes objects that are contained in inputType, then use the currentCutIndex for those collections.
4722 >      // For example, if the inputType is jet-jet pairs, and the inputCollection is track-jet pairs, then use currentCutIndex for cutIdxFlagsObj{1,2}, i.e., for both jets.  
4723 >      // For example, if the inputType is jets, and the inputCollection is track-jet pairs, then use currentCutIndex for cutIdxFlagsObj2 (jets) and currentCutIndex-1 for cutIdxFlagsObj1 (tracks).  
4724 >      if (currentCut.inputCollection != inputType) {  
4725 >        if (currentCut.inputCollection.find(obj1Type)!=string::npos) cutIdxFlagsObj1 = currentCutIndex;
4726 >        if (currentCut.inputCollection.find(obj2Type)!=string::npos) cutIdxFlagsObj2 = currentCutIndex;
4727 >      }  
4728 >      flagPair flags1 = cumulativeFlags.at(obj1Type).at(cutIdxFlagsObj1);  // flag for input collection 1
4729 >      flagPair flags2 = cumulativeFlags.at(obj2Type).at(cutIdxFlagsObj2);  // flag for input collection 2
4730 >      
4731 >      // The cumulative flag is only true if the paired object cumulative flag is true, and if the single object cumulative flags are true.  
4732        bool currentCumulativeCutFlag = true;
4733        bool currentCumulativePlotFlag = true;
4391 –
4734        if(flags1.size() == 0 && flags2.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag;
4735        else if(flags1.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag && flags2.at(object2).first;
4736        else if(flags2.size() == 0) currentCumulativeCutFlag = previousCumulativeCutFlag && flags1.at(object1).first;
# Line 4399 | Line 4741 | void OSUAnalysis::setObjectFlags(cut &cu
4741        else if(flags2.size() == 0) currentCumulativePlotFlag = previousCumulativePlotFlag && flags1.at(object1).second;
4742        else currentCumulativePlotFlag = previousCumulativePlotFlag && flags1.at(object1).first && flags2.at(object2).second;
4743  
4744 <      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(make_pair(currentCumulativeCutFlag,currentCumulativePlotFlag));
4744 >      cumulativeFlags.at(inputType).at(currentCutIndex).push_back(make_pair(currentCumulativeCutFlag,currentCumulativePlotFlag));  // Set the flag for the paired object
4745  
4404 –      if (currentCumulativeCutFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4405 –        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1).first = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1, "cut");
4406 –        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2).first = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "cut");
4407 –      }
4746  
4747 <      if (currentCumulativePlotFlag && currentCut.inputCollection == inputType) {  // only set the flags for the individual objects if the pair object is being cut on
4747 >      if (currentCumulativeCutFlag && currentCut.inputCollection == inputType) {  // Set the flags for the individual objects if the paired object is being cut on.  
4748 >        cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1).first  = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1, "cut");
4749 >        cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2).first  = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "cut");
4750          cumulativeFlags.at(obj1Type).at(currentCutIndex).at(object1).second = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj1Type, object1, "plot");
4751          cumulativeFlags.at(obj2Type).at(currentCutIndex).at(object2).second = true && getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "plot");
4752 +
4753 +        if (verbose_>1) clog << " previousCumulativeCutFlag for object1 = " << getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object1, "cut") << endl;  
4754 +        if (verbose_>1) clog << " previousCumulativeCutFlag for object2 = " << getPreviousCumulativeFlags(currentCutIndex, individualFlags, obj2Type, object2, "cut") << endl;  
4755 +
4756        }
4757  
4758        counter++;
# Line 4416 | Line 4760 | void OSUAnalysis::setObjectFlags(cut &cu
4760      } // end   for (uint object2 = 0; object2 != inputCollection2->size(); object2++)
4761    }  // end   for (uint object1 = 0; object1 != inputCollection1->size(); object1++)
4762  
4763 < }
4763 > } // end void OSUAnalysis::setObjectFlags
4764  
4765  
4766   bool OSUAnalysis::getPreviousCumulativeFlags(uint currentCutIndex, flagMap &individualFlags, string obj1Type, uint object1, string flagType) {
# Line 4461 | Line 4805 | void OSUAnalysis::assignTreeBranch(Branc
4805   template <class InputCollection>
4806   void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection inputCollection, flagPair flags, double scaleFactor){
4807  
4808 +  if (verbose_>2) clog << "  Filling histogram for " << parameters.name << endl;  
4809  
4810    for (uint object = 0; object != inputCollection->size(); object++){
4811  
# Line 4484 | Line 4829 | void OSUAnalysis::fill1DHistogram(TH1* h
4829  
4830      if (printEventInfo_) {
4831        // Write information about event to screen, for testing purposes.
4832 <      clog << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << endl;
4832 >      clog << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value << " (object number " << object << ")" << endl;
4833      }
4834  
4835    }
4836   }
4837  
4838   template <class InputCollection1, class InputCollection2>
4839 < void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, flagPair flags1, flagPair flags2, flagPair pairFlags, double scaleFactor){
4839 > void OSUAnalysis::fill1DHistogram(TH1* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2,
4840 >                                  flagPair pairFlags, double scaleFactor){
4841  
4842    bool sameObjects = false;
4843    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
# Line 4503 | Line 4849 | void OSUAnalysis::fill1DHistogram(TH1* h
4849        if(sameObjects && object1 >= object2) continue;//account for duplicate pairs if both collections are the same
4850  
4851        pairCounter++;
4506 –      //only take objects which have passed all cuts and pairs which have passed all cuts
4507 –      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1).second) continue;
4508 –      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2).second) continue;
4852        if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter).second) continue;
4853  
4854        string currentString = parameters.inputVariables.at(0);
# Line 4524 | Line 4867 | void OSUAnalysis::fill1DHistogram(TH1* h
4867        double value = valueLookup(&inputCollection1->at(object1), &inputCollection2->at(object2), inputVariable, function, stringValue);
4868        histo->Fill(value,scaleFactor);
4869  
4870 +      if (printEventInfo_) {
4871 +        // Write information about event to screen, for testing purposes.
4872 +        clog << "  Info for event:  value for histogram " << histo->GetName() << ":  " << value
4873 +             << " (object1 number " << object1 << "), "
4874 +             << " (object2 number " << object2 << ")"
4875 +             << endl;
4876 +      }
4877 +      
4878      }
4879    }
4880  
# Line 4572 | Line 4923 | void OSUAnalysis::fill2DHistogram(TH2* h
4923   }
4924  
4925   template <class InputCollection1, class InputCollection2>
4926 < void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2, flagPair flags1, flagPair flags2, flagPair pairFlags, double scaleFactor){
4926 > void OSUAnalysis::fill2DHistogram(TH2* histo, histogram parameters, InputCollection1 inputCollection1, InputCollection2 inputCollection2,
4927 >                                  flagPair pairFlags, double scaleFactor){
4928  
4929    bool sameObjects = false;
4930    if(typeid(InputCollection1).name() == typeid(InputCollection2).name()) sameObjects = true;
# Line 4585 | Line 4937 | void OSUAnalysis::fill2DHistogram(TH2* h
4937  
4938        pairCounter++;
4939  
4588 –      //only take objects which have passed all cuts and pairs which have passed all cuts
4589 –      if(!plotAllObjectsInPassingEvents_ && !flags1.at(object1).second) continue;
4590 –      if(!plotAllObjectsInPassingEvents_ && !flags2.at(object2).second) continue;
4940        if(!plotAllObjectsInPassingEvents_ && !pairFlags.at(pairCounter).second) continue;
4941  
4942        string stringValue = "";

Diff Legend

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