* Add producer

cms-sw · Oct 14, 2015 · 6bb57e5 · 6bb57e5
1 parent 2d94ffc
commit 6bb57e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/L1TriggerConfig/L1ScalesProducers/python/L1CaloHcalScaleConfigOnline_cfi.py b/L1TriggerConfig/L1ScalesProducers/python/L1CaloHcalScaleConfigOnline_cfi.py
@@ -1,4 +1,8 @@
 import FWCore.ParameterSet.Config as cms
+
+from Configuration.Geometry.GeometryExtended2015Reco_cff import *
+HcalTrigTowerGeometryESProducer = cms.ESProducer("HcalTrigTowerGeometryESProducer")
+
 L1CaloHcalScaleConfigOnline = cms.ESProducer("L1CaloHcalScaleConfigOnlineProd",
     onlineAuthentication = cms.string('.'),
     forceGeneration = cms.bool(False),

diff --git a/L1TriggerConfig/L1ScalesProducers/src/L1CaloHcalScaleConfigOnlineProd.cc b/L1TriggerConfig/L1ScalesProducers/src/L1CaloHcalScaleConfigOnlineProd.cc
@@ -82,26 +82,6 @@ L1CaloHcalScaleConfigOnlineProd::L1CaloHcalScaleConfigOnlineProd(
 {
   hcalScale = new L1CaloHcalScale(0);
   caloTPG = new CaloTPGTranscoderULUT();
-<<<<<<< HEAD
-
-  HcalTopologyMode::Mode mode = HcalTopologyMode::LHC;
-  int maxDepthHB = 2;
-  int maxDepthHE = 3;
-  edm::LogWarning("") << "Fix how to get HcalTopology correctly";
-  /*
-  if( iConfig.exists( "hcalTopologyConstants" ))
-  {
-    const edm::ParameterSet hcalTopoConsts = iConfig.getParameter<edm::ParameterSet>( "hcalTopologyConstants" );
-    StringToEnumParser<HcalTopologyMode::Mode> parser;
-    mode = (HcalTopologyMode::Mode) parser.parseString(hcalTopoConsts.getParameter<std::string>("mode"));
-    maxDepthHB = hcalTopoConsts.getParameter<int>("maxDepthHB");
-    maxDepthHE = hcalTopoConsts.getParameter<int>("maxDepthHE");
-  }
-  */
-
-  theTrigTowerGeometry = new HcalTrigTowerGeometry( new HcalTopology( mode, maxDepthHB, maxDepthHE ));
-=======
->>>>>>> * Use Hcal trigger tower geometry from Event setup
 }