* remove NOMINAL_SVFIT, as NOMINAL is just enough

* add cleaning of the selection word bits in HTTEvent
akalinow · Feb 28, 2017 · e74df9d · e74df9d
1 parent fd42034
commit e74df9d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/HTTAnalysis/AnalysisEnums.h b/HTTAnalysis/AnalysisEnums.h
@@ -88,7 +88,7 @@ eventCategory *myQCDSFDenom;
 
 };
 
-enum sysEffects {NOMINAL, NOMINAL_SVFIT,
+enum sysEffects {NOMINAL, 
                  TESUp, TESDown,
                  JESUp, JESDown,
                  M2TUp, M2TDown,

diff --git a/HTTAnalysis/HTTAnalyzer.cc b/HTTAnalysis/HTTAnalyzer.cc
@@ -136,7 +136,7 @@ void HTTAnalyzer::fillControlHistos(const std::string & hNameSuffix, float event
         myHistos_->fill2DUnrolledHistogram("h1DUnRollMjjMassSV"+hNameSuffix, aPair.getP4(aSystEffect).M(), jetsMass, eventWeight);
 
         myHistos_->fill1DHistogram("h1DIso"+hNameSuffix,aLeg1.getProperty(PropertyEnum::combreliso),eventWeight);
-        if(aSystEffect!=HTTAnalysis::NOMINAL_SVFIT) return;
+        if(aSystEffect!=HTTAnalysis::NOMINAL) return;
 
         fillDecayPlaneAngle(hNameSuffix, eventWeight, aSystEffect);
         fillGenDecayPlaneAngle(hNameSuffix+"_Gen", eventWeight);
@@ -253,7 +253,7 @@ bool HTTAnalyzer::analyze(const EventProxyBase& iEvent){
         std::string categorySuffix = "";
         std::string systEffectName = "";
         const std::vector<const HTTAnalysis::eventCategory*> & aCategoryRejester = myChannelSpecifics->getCategoryRejester();
-        for(unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL_SVFIT;
+        for(unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL;
             iSystEffect<=(unsigned int)HTTAnalysis::ZmumuDown; ++iSystEffect) {
 
               if(iSystEffect==(unsigned int)HTTAnalysis::DUMMY_SYS) continue;
@@ -278,7 +278,7 @@ bool HTTAnalyzer::analyze(const EventProxyBase& iEvent){
 
                         categorySuffix = std::to_string(iCategory);
                         systEffectName = HTTAnalysis::systEffectName(iCategory, iSystEffect, aCategoryRejester);
-                        hNameSuffix = sampleName+"_"+categorySuffix+systEffectName;                    
+                        hNameSuffix = sampleName+"_"+categorySuffix+systEffectName;
                         fillControlHistos(hNameSuffix, eventWeightWithSyst, aSystEffect);
                 }
         }

diff --git a/HTTAnalysis/HTTAnalyzerCPmethods.cc b/HTTAnalysis/HTTAnalyzerCPmethods.cc
@@ -117,7 +117,7 @@ void HTTAnalyzer::fillGenDecayPlaneAngle(const std::string & hNameSuffix, float
   }
 
   ///////////////////////////////////////////////////////////
-  HTTAnalysis::sysEffects sysType = HTTAnalysis::NOMINAL_SVFIT;
+  HTTAnalysis::sysEffects sysType = HTTAnalysis::NOMINAL;
 
   if(aGenLeg2.getProperty(PropertyEnum::decayMode)==HTTAnalysis::tauDecay1ChargedPion0PiZero){
     float cosPhiNN =  muonPCA.Vect().Unit().Dot(tauPCA.Vect().Unit());

diff --git a/HTTAnalysis/HTTAnalyzerUtilityMethods.cc b/HTTAnalysis/HTTAnalyzerUtilityMethods.cc
@@ -32,7 +32,7 @@ std::string HTTAnalyzer::getSampleName(const EventProxyHTT & myEventProxy){
 //////////////////////////////////////////////////////////////////////////////
 float HTTAnalyzer::getSystWeight(const HTTAnalysis::sysEffects & aSystEffect){
 
-        if(aSystEffect==HTTAnalysis::NOMINAL || aSystEffect==HTTAnalysis::NOMINAL_SVFIT) return 1.0;
+        if(aSystEffect==HTTAnalysis::NOMINAL) return 1.0;
 
         if(aSystEffect==HTTAnalysis::ZPtUp && sampleName.find("DYJets")!=std::string::npos) return aEvent.getPtReWeight();
         else if(aSystEffect==HTTAnalysis::ZPtDown && sampleName.find("DYJets")!=std::string::npos) return 1.0/aEvent.getPtReWeight();

diff --git a/HTTAnalysis/HTTEvent.cxx b/HTTAnalysis/HTTEvent.cxx
@@ -46,6 +46,7 @@ void HTTEvent::clear(){
 
   nTracksInRefit = 0;
 
+  selectionWord.ResetAllBits();
 }
 ////////////////////////////////////////////////
 ////////////////////////////////////////////////
@@ -67,7 +68,7 @@ void HTTParticle::clear(){
 ////////////////////////////////////////////////
 const TLorentzVector & HTTParticle::getSystScaleP4(HTTAnalysis::sysEffects type) const{
 
-  if(type==HTTAnalysis::NOMINAL || type==HTTAnalysis::NOMINAL_SVFIT) {
+  if(type==HTTAnalysis::NOMINAL) {
     lastSystEffect = type;
     return p4;
   }
@@ -147,13 +148,13 @@ const TLorentzVector & HTTPair::getP4(HTTAnalysis::sysEffects type) const {
   //std::cout<<"type: "<<(unsigned int)type<<" size: "<<p4Vector.size()<<std::endl;
 
   if(p4Vector.size()>(unsigned int)type) return p4Vector[(unsigned int)type];
-  return p4Vector[(unsigned int)HTTAnalysis::NOMINAL_SVFIT];
+  return p4Vector[(unsigned int)HTTAnalysis::NOMINAL];
 }
 ////////////////////////////////////////////////
 ////////////////////////////////////////////////
 const TVector2 & HTTPair::getSystScaleMET(HTTAnalysis::sysEffects type) const{
 
-  if(type==HTTAnalysis::NOMINAL || type==HTTAnalysis::NOMINAL_SVFIT ||
+  if(type==HTTAnalysis::NOMINAL ||
   (unsigned int)type>(unsigned int)HTTAnalysis::DUMMY_SYS) {
     lastSystEffect = type;
     return met;

diff --git a/HTTAnalysis/HTTEvent.h b/HTTAnalysis/HTTEvent.h
@@ -56,7 +56,7 @@ class HTTEvent{
     "byVTightIsolationMVArun2v1DBdR03oldDMwLT"
   };
 
-  HTTEvent(){ clear();}
+  HTTEvent(){clear();}
 
   ~HTTEvent(){}
 
@@ -105,6 +105,8 @@ class HTTEvent{
   ///Reset class data members
   void clear();
 
+  void clearSelectionWord() {selectionWord.ResetAllBits();}
+
   ///Data member getters.
   unsigned int getRunId() const {return runId;}
 

diff --git a/HTTAnalysis/HTTHistograms.cc b/HTTAnalysis/HTTHistograms.cc
@@ -446,7 +446,7 @@ void HTTHistograms::finalizeHistograms(const std::vector<const HTTAnalysis::even
         }
 
         ///Make systematic effect histos.
-        for(unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL_SVFIT;
+        for(unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL;
             iSystEffect<=(unsigned int)HTTAnalysis::ZmumuDown; ++iSystEffect) {
               if(iSystEffect==(unsigned int)HTTAnalysis::DUMMY_SYS) continue;
                 for(auto iCategory: mainCategoriesRejester) {

diff --git a/HTTAnalysis/HTTHistograms.h b/HTTAnalysis/HTTHistograms.h
@@ -26,7 +26,7 @@ class HTTHistograms: public AnalysisHistograms {
   using AnalysisHistograms::get1DHistogram;
 
   TH1F *get1DHistogram(unsigned int iCategory, std::string varName,
-       unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL_SVFIT);
+       unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL);
 
   std::string getTemplateName(const std::string& name);
 
@@ -38,18 +38,18 @@ class HTTHistograms: public AnalysisHistograms {
 
   ///Estimate QCD background using the SS/OS method.
   TH1F* getQCDbackground(unsigned int iCategory, std::string varName,
-       unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL_SVFIT);
+       unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL);
 
   ///Calculate scaling factor for the WJets MC
   ///Scaling factor is estimated in high Mt region.
   ///Other backgrounds are subtracted, basing on MC
   ///QCD contribution is neglected.
   std::pair<float,float> getWNormalisation(unsigned int iCategory,
-    unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL_SVFIT);
+    unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL);
 
   ///Calculate QCD ratio between signal and control regions.
   std::pair<float,float> getQCDControlToSignal(unsigned int iCategory,
-              unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL_SVFIT);
+              unsigned int iSystEffect = (unsigned int)HTTAnalysis::NOMINAL);
 
    private:
 

diff --git a/HTTAnalysis/Tools.cc b/HTTAnalysis/Tools.cc
@@ -120,8 +120,7 @@ float getCrossSection(const std::string & sampleName){
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 std::string systEffectName(unsigned int iSystEffect){
-        if(iSystEffect==(int)NOMINAL) return "";
-        else if(iSystEffect==(int)NOMINAL_SVFIT) return "";
+        if(iSystEffect==(int)NOMINAL) return "";      
         else if(iSystEffect==(int)TESUp) return "_CMS_scale_t_mt_13TeVUp";
         else if(iSystEffect==(int)TESDown) return "_CMS_scale_t_mt_13TeVDown";
         else if(iSystEffect==(int)JESUp) return "_CMS_scale_j_13TeVUp";