code-format

Author: Wahid Redjeb

HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHitL1Seeded_cfi.py

@@ -78,4 +78,3 @@
     HGCHEFConfig = _modifiedHGCHEFConfig_v19,
     HGCHFNoseConfig = _modifiedHGCHFNoseConfig_v19
 )
-

HLTrigger/Configuration/python/HLT_75e33/modules/hltHGCalUncalibRecHit_cfi.py

@@ -80,4 +80,3 @@
     HGCHEFConfig = _modifiedHGCHEFConfig_v19,
     HGCHFNoseConfig = _modifiedHGCHFNoseConfig_v19
 )
-

HLTrigger/Configuration/python/HLT_75e33/psets/hgcal_reco_constants_cfi.py

@@ -59,4 +59,3 @@
                          maxNumberOfThickIndices = cms.uint32(8),
                          thresholdW0 = cms.vdouble(2.9, 2.9, 2.9, 2.9),
                          )
-

L1Trigger/L1THGCal/python/l1tHGCalVFEProducer_cfi.py

@@ -77,7 +77,6 @@
 # While here there are two different sets for CE-E and CE-H
 # Additionally there are four values for each set, in order to follow the four detid silicon types [HD120um, LD200um, LD300um, HD200um]
 # The thickness correction value for HD200um is copied from LD200um
->>>>>>> 3135ca68949 (initial fixes with procModifier v19)
 calibration_params_ee = cms.PSet(
         lsb = cms.double(triggerCellLsbBeforeCompression_si),
         fCperMIP = fCperMIPee,

L1Trigger/L1THGCal/src/veryfrontend/HGCalVFESummationImpl.cc

@@ -4,8 +4,7 @@
 HGCalVFESummationImpl::HGCalVFESummationImpl(const edm::ParameterSet& conf)
     : lsb_silicon_fC_(conf.getParameter<double>("siliconCellLSB_fC")),
       lsb_scintillator_MIP_(conf.getParameter<double>("scintillatorCellLSB_MIP")),
-      nThickness_(conf.getParameter<uint32_t>("numberOfThicknesses"))
-      {
+      nThickness_(conf.getParameter<uint32_t>("numberOfThicknesses")) {
   thresholds_silicon_ =
       conf.getParameter<edm::ParameterSet>("noiseSilicon").getParameter<std::vector<double>>("values");
   if (thresholds_silicon_.size() != nThickness_) {

SimCalorimetry/HGCalSimProducers/src/HGCFEElectronics.cc

@@ -74,7 +74,6 @@ HGCFEElectronics<DFr>::HGCFEElectronics(const edm::ParameterSet& ps)
     tdcOnset_fC_ = ps.getParameter<double>("tdcOnset_fC");
   if (ps.exists("tdcForToAOnset_fC")) {
     auto temp = ps.getParameter<std::vector<double> >("tdcForToAOnset_fC");
-    std::cout << "temp " << temp.size() << " tdcForToaOnset " << tdcForToAOnset_fC_.size() << std::endl;
     if (temp.size() == tdcForToAOnset_fC_.size()) {
       std::copy_n(temp.begin(), temp.size(), tdcForToAOnset_fC_.begin());
     } else {