important patch for FG region bits

cms-sw · Nov 2, 2015 · 045e305 · 045e305
1 parent 48a3c47
commit 045e305
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/EventFilter/L1TRawToDigi/src/implementations_stage1/RCTEmRegionPacker.cc b/EventFilter/L1TRawToDigi/src/implementations_stage1/RCTEmRegionPacker.cc
@@ -48,7 +48,9 @@ namespace l1t {
             int overFlow=(int)j->overFlow();
             int fineGrain=(int)j->fineGrain();
             int mip=(int)j->mip();
+            bool tauveto=j->tauVeto();
             //int quiet=(int)j->quiet();
+
             int rctCrate=(int)j->rctCrate();
             int rctCard=(int)j->rctCard();
             int rctRegion=(int)j->rctRegionIndex();  
@@ -57,13 +59,14 @@ namespace l1t {
             if(!isHf){
               converter[rctCrate].SetRCEt(et,rctCard,rctRegion);
               converter[rctCrate].SetRCOf(overFlow,rctCard,rctRegion);
-              converter[rctCrate].SetRCTau(fineGrain,rctCard,rctRegion);
+              converter[rctCrate].SetRCTau(tauveto,rctCard,rctRegion);
               converter[rctCrate].SetRCHad(mip,rctCard,rctRegion);
-              LogDebug("L1T")<<"CRATE"<<rctCrate<<"region="<<rctRegion<<", card="<<rctCard<<", rgnEt="<<et<<", overflow="<<overFlow<<", tauveto="<<fineGrain<<", hadveto="<<mip<<std::endl;
+              LogDebug("L1T")<<"CRATE"<<rctCrate<<"region="<<rctRegion<<", card="<<rctCard<<", rgnEt="<<et<<", overflow="<<overFlow<<", tauveto="<<tauveto<<", hadveto="<<mip<<std::endl;
 
             }
             else{
               converter[rctCrate].SetHFEt(et,rctRegion);
+              converter[rctCrate].SetHFFg(fineGrain,rctRegion);
               LogDebug("L1T")<<"CRATE"<<rctCrate<<"region="<<rctRegion<<", rgnEt="<<et<<std::endl;
 
             }

diff --git a/EventFilter/L1TRawToDigi/src/implementations_stage1/RCTEmRegionUnpacker.cc b/EventFilter/L1TRawToDigi/src/implementations_stage1/RCTEmRegionUnpacker.cc
@@ -137,9 +137,10 @@ namespace l1t {
                for(int j = 0; j < 8; j++) {
 
                   unsigned int hfet=(unsigned int)converter.GetHFEt(j);
+                  bool hfgrain=(bool)converter.GetHFFg(j);
 
                   LogDebug("L1T")<<"UNPACKER, CRATE"<<crate<<"region="<<j<<", rgnEt="<<hfet<<std::endl;
-                  L1CaloRegion rgn = L1CaloRegion(hfet,0,crate,j);
+                  L1CaloRegion rgn = L1CaloRegion(hfet,hfgrain,crate,j);
                   rgn.setBx(bx);
                   resRCTRegions_->push_back(rgn);
                }