Merge pull request #35 from baffioni/baffioni-smihits-810pre6

Baffioni smihits 810pre6
alja · Jun 23, 2016 · 4c29779 · 4c29779
2 parents 3b166c6 + 8cb6384
commit 4c29779
Show file tree

Hide file tree

Showing 4 changed files with 266 additions and 78 deletions.
diff --git a/L1Trigger/L1THGCal/src/fe_codecs/HGCalBestChoiceCodecImpl.cc b/L1Trigger/L1THGCal/src/fe_codecs/HGCalBestChoiceCodecImpl.cc
@@ -48,7 +48,7 @@ std::vector<bool> HGCalBestChoiceCodecImpl::encode(const HGCalBestChoiceCodecImp
                     << "      : Number of energy values = "<<nData_<<"\n";
             }
             // Saturate and truncate energy values
-            if(value+1>(0x1u<<triggerCellSaturationBits_)) value = (0x1<<triggerCellSaturationBits_);
+            if(value+1>(0x1u<<triggerCellSaturationBits_)) value = (0x1<<triggerCellSaturationBits_)-1;
             for(size_t i=0; i<dataLength_; i++)
             {
                 result[nCellsInModule_ + idata*dataLength_ + i] = static_cast<bool>(value & (0x1<<(i+triggerCellTruncationBits_)));// remove the lowest bits (=triggerCellTruncationBits_)

diff --git a/L1Trigger/L1THGCal/test/BuildFile.xml b/L1Trigger/L1THGCal/test/BuildFile.xml
@@ -9,6 +9,7 @@
 <use   name="Geometry/Records"/>
 <use   name="CommonTools/UtilAlgos"/>
 <use   name="DataFormats/L1Trigger"/>
+<use   name="SimDataFormats/CaloTest"/>
 
 <library name="testL1TriggerL1THGCal"  file="HGCalTriggerGeomTester.cc,HGCalTriggerBestChoiceTester.cc">
 <flags   EDM_PLUGIN="1"/>