Changes for new EtSum Triggers

cms-l1t-offline · Aug 26, 2016 · 27aecef · 27aecef
1 parent 00b516b
commit 27aecef
Show file tree

Hide file tree

Showing 15 changed files with 357 additions and 109 deletions.
diff --git a/DataFormats/L1TGlobal/interface/GlobalObject.h b/DataFormats/L1TGlobal/interface/GlobalObject.h
@@ -23,11 +23,12 @@ enum GlobalObject
     gtETT,
     gtHTT,
     gtHTM,
-    gtETM2,
+    gtETMHF,
     gtMinBiasHFP0,
     gtMinBiasHFM0,
     gtMinBiasHFP1,
     gtMinBiasHFM1,
+    gtETTem,
     gtExternal,
     ObjNull
 };

diff --git a/DataFormats/L1TGlobal/src/GlobalObject.cc b/DataFormats/L1TGlobal/src/GlobalObject.cc
@@ -37,11 +37,12 @@ l1t::GlobalObject l1TGtObjectStringToEnum(const std::string& label) {
             {"ETT", gtETT},
             {"HTT", gtHTT},
             {"HTM", gtHTM},
-	    {"ETM2", gtETM2},
+	    {"ETMHF", gtETMHF},
 	    {"MinBiasHFP0", gtMinBiasHFP0},
 	    {"MinBiasHFM0", gtMinBiasHFM0},
 	    {"MinBiasHFP1", gtMinBiasHFP1},
 	    {"MinBiasHFM1", gtMinBiasHFM1},
+	    {"ETTem", gtETTem},
             {"External", gtExternal},
             {"ObjNull", ObjNull},
             {0, (GlobalObject) - 1}
@@ -119,8 +120,8 @@ std::string l1t::l1TGtObjectEnumToString(const GlobalObject& gtObject) {
         }
             break;
 
-        case gtETM2: {
-            gtObjectString = "ETM2";
+        case gtETMHF: {
+            gtObjectString = "ETMHF";
         }
             break;
 
@@ -144,6 +145,11 @@ std::string l1t::l1TGtObjectEnumToString(const GlobalObject& gtObject) {
         }
             break;
 
+        case gtETTem: {
+            gtObjectString = "ETTem";
+        }
+            break;
+
         case gtExternal: {
             gtObjectString = "External";
         }

diff --git a/L1Trigger/L1TGlobal/interface/GlobalCondition.h b/L1Trigger/L1TGlobal/interface/GlobalCondition.h
@@ -10,7 +10,7 @@
  * Implementation:
  *    <TODO: enter implementation details>
  *
- * \author: Vasile Mihai Ghete - HEPHY Vienna
+ * \author: Brian Winer, OSU   Vasile Mihai Ghete - HEPHY Vienna
  *
  * $Date$
  * $Revision$

diff --git a/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h b/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h
@@ -11,7 +11,7 @@
  *    lightweight "maps" for enum string label and enum value
  *
  *
- * \author: Vasile Mihai Ghete - HEPHY Vienna
+ * \author: Brian Winer, OSU   Vasile Mihai Ghete - HEPHY Vienna
  *
  * $Date$
  * $Revision$
@@ -61,11 +61,12 @@ enum GtConditionType {
     TypeETT,
     TypeHTT,
     TypeHTM,
-    TypeETM2,
+    TypeETMHF,
     TypeMinBiasHFP0,
     TypeMinBiasHFM0,
     TypeMinBiasHFP1,
     TypeMinBiasHFM1,
+    TypeETTem,
     TypeExternal
 };
 

diff --git a/L1Trigger/L1TGlobal/interface/GlobalScales.h b/L1Trigger/L1TGlobal/interface/GlobalScales.h
@@ -61,10 +61,12 @@ class GlobalScales
 
     inline void setJetScales(ScaleParameters& scales) { m_jetScales = scales; }
 
-    inline void setETTScales(ScaleParameters& scales) { m_ettScales = scales; }
-    inline void setHTTScales(ScaleParameters& scales) { m_httScales = scales; }
-    inline void setETMScales(ScaleParameters& scales) { m_etmScales = scales; }
-    inline void setHTMScales(ScaleParameters& scales) { m_htmScales = scales; }
+    inline void setETTScales(ScaleParameters& scales)   { m_ettScales = scales; }
+    inline void setETTEmScales(ScaleParameters& scales) { m_ettEmScales = scales; }
+    inline void setHTTScales(ScaleParameters& scales)   { m_httScales = scales; }
+    inline void setETMScales(ScaleParameters& scales)   { m_etmScales = scales; }
+    inline void setETMHfScales(ScaleParameters& scales) { m_etmHfScales = scales; }
+    inline void setHTMScales(ScaleParameters& scales)   { m_htmScales = scales; }
 
     virtual void setLUT_CalMuEta(std::string lutName, std::vector<long long> lut); 
     virtual void setLUT_CalMuPhi(std::string lutName, std::vector<long long> lut);
@@ -77,14 +79,16 @@ class GlobalScales
     inline void setScalesName(std::string name) { m_ScaleSetName = name; }
     virtual std::string getScalesName() const; 
 
-    inline ScaleParameters getMUScales() const { return m_muScales; }
-    inline ScaleParameters getEGScales() const { return m_egScales; }
-    inline ScaleParameters getTAUScales() const { return m_tauScales; }
-    inline ScaleParameters getJETScales() const { return m_jetScales; }
-    inline ScaleParameters getETTScales() const { return m_ettScales; }
-    inline ScaleParameters getETMScales() const { return m_etmScales; }
-    inline ScaleParameters getHTTScales() const { return m_httScales; }
-    inline ScaleParameters getHTMScales() const { return m_htmScales; }
+    inline ScaleParameters getMUScales() const    { return m_muScales; }
+    inline ScaleParameters getEGScales() const    { return m_egScales; }
+    inline ScaleParameters getTAUScales() const   { return m_tauScales; }
+    inline ScaleParameters getJETScales() const   { return m_jetScales; }
+    inline ScaleParameters getETTScales() const   { return m_ettScales; }
+    inline ScaleParameters getETTEmScales() const { return m_ettEmScales; }
+    inline ScaleParameters getETMScales() const   { return m_etmScales; }
+    inline ScaleParameters getETMHFScales() const { return m_etmHfScales; }
+    inline ScaleParameters getHTTScales() const   { return m_httScales; }
+    inline ScaleParameters getHTMScales() const   { return m_htmScales; }
 
 
     long long getLUT_CalMuEta(std::string lutName, int element) const;
@@ -122,8 +126,10 @@ class GlobalScales
    ScaleParameters m_jetScales;
 
    ScaleParameters m_ettScales;
+   ScaleParameters m_ettEmScales;
    ScaleParameters m_httScales;
    ScaleParameters m_etmScales;
+   ScaleParameters m_etmHfScales;
    ScaleParameters m_htmScales; 
 
    //LUTs

diff --git a/L1Trigger/L1TGlobal/plugins/GenToInputProducer.cc b/L1Trigger/L1TGlobal/plugins/GenToInputProducer.cc
@@ -448,6 +448,10 @@ GenToInputProducer::produce(Event& iEvent, const EventSetup& iSetup)
    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double> > *p4 = new ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double> >();
    l1t::EtSum etTotal(*p4, l1t::EtSum::EtSumType::kTotalEt,pt, 0, 0, 0);    
 
+// Scale down ETTem as an estimate
+   pt  = convertPtToHW( sumEt*0.6, 2047, PtStep_ );
+   l1t::EtSum etEmTotal(*p4, l1t::EtSum::EtSumType::kTotalEtEm,pt, 0, 0, 0); 
+
    pt  = convertPtToHW( sumEt*0.9, 2047, PtStep_ );
    l1t::EtSum htTotal(*p4, l1t::EtSum::EtSumType::kTotalHt,pt, 0, 0, 0); 
 
@@ -471,6 +475,8 @@ GenToInputProducer::produce(Event& iEvent, const EventSetup& iSetup)
 
    int mpt = 0;
    int mphi= 0;
+   int mptHf = 0;
+   int mphiHf= 0;   
    int mhpt = 0;
    int mhphi= 0;  
    edm::Handle<reco::GenMETCollection> genMet;
@@ -479,6 +485,10 @@ GenToInputProducer::produce(Event& iEvent, const EventSetup& iSetup)
      mpt  = convertPtToHW( genMet->front().pt(), MaxEt_, PtStep_ );
      mphi = convertPhiToHW( genMet->front().phi(), PhiStepCalo_ );
 
+     // Make Missing Et with HF slightly largeer and rotated (These are all fake inputs anyway...not supposed to be realistic)
+     mptHf  = convertPtToHW( genMet->front().pt()*1.1, MaxEt_, PtStep_ );
+     mphiHf = convertPhiToHW( genMet->front().phi()+ 3.14/7., PhiStepCalo_ );
+
      // Make Missing Ht slightly smaller and rotated (These are all fake inputs anyway...not supposed to be realistic)
      mhpt  = convertPtToHW( genMet->front().pt()*0.9, MaxEt_, PtStep_ );
      mhphi = convertPhiToHW( genMet->front().phi()+ 3.14/5., PhiStepCalo_ );
@@ -489,17 +499,20 @@ GenToInputProducer::produce(Event& iEvent, const EventSetup& iSetup)
 
 // Missing Et and missing htt
    l1t::EtSum etmiss(*p4, l1t::EtSum::EtSumType::kMissingEt,mpt, 0,mphi, 0); 
+   l1t::EtSum etmissHF(*p4, l1t::EtSum::EtSumType::kMissingEtHF,mptHf, 0,mphiHf, 0);    
    l1t::EtSum htmiss(*p4, l1t::EtSum::EtSumType::kMissingHt,mhpt, 0,mhphi, 0); 
 
 // Fill the EtSums in the Correct order
    etsumVec.push_back(etTotal);
+   etsumVec.push_back(etEmTotal);
    etsumVec.push_back(hfP0);
    etsumVec.push_back(htTotal);
    etsumVec.push_back(hfM0); 
    etsumVec.push_back(etmiss);
    etsumVec.push_back(hfP1);
    etsumVec.push_back(htmiss);
    etsumVec.push_back(hfM1);
+   etsumVec.push_back(etmissHF);
 
 // Fill in some external conditions for testing
    if((iEvent.id().event())%2 == 0 ) {