Merge pull request #17790 from matz-e/hcal-fix-compression-lut-90x

Fix HCAL TP compression LUTs by populating plan 1 TP list first.
cms-sw · Mar 17, 2017 · 8735b6d · 8735b6d
2 parents 2670496 + 85afb83
commit 8735b6d
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
@@ -253,21 +253,21 @@ void CaloTPGTranscoderULUT::setup(HcalLutMetadata const& lutMetadata, HcalTrigTo
     outputLUT_.resize(theTopology->getHTSize());
     hcaluncomp_.resize(theTopology->getHTSize());
 
+    plan1_towers_.clear();
+    for (const auto& id: lutMetadata.getAllChannels()) {
+       if (not (id.det() == DetId::Hcal and theTopology->valid(id)))
+          continue;
+       HcalDetId cell(id);
+       if (not theTopology->dddConstants()->isPlan1(cell))
+          continue;
+       for (const auto& tower: theTrigTowerGeometry.towerIds(cell))
+          plan1_towers_.emplace(tower);
+    }
+
     if (compressionFile_.empty() && decompressionFile_.empty()) {
 	loadHCALCompress(lutMetadata,theTrigTowerGeometry);
     }
     else {
 	throw cms::Exception("Not Implemented") << "setup of CaloTPGTranscoderULUT from text files";
    }
-
-   plan1_towers_.clear();
-   for (const auto& id: lutMetadata.getAllChannels()) {
-      if (not (id.det() == DetId::Hcal and theTopology->valid(id)))
-         continue;
-      HcalDetId cell(id);
-      if (not theTopology->dddConstants()->isPlan1(cell))
-         continue;
-      for (const auto& tower: theTrigTowerGeometry.towerIds(cell))
-         plan1_towers_.emplace(tower);
-   }
 }