post-merge fixes for cms-sw#38449

jhakala · Aug 3, 2022 · 8de8f70 · 8de8f70
1 parent 92b04a1
commit 8de8f70
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/Alignment/CommonAlignmentProducer/python/AlcaSiPixelAliHarvesterHG_cff.py b/Alignment/CommonAlignmentProducer/python/AlcaSiPixelAliHarvesterHG_cff.py
@@ -41,7 +41,7 @@
     pedeSteerer = dict(
         pedeCommand = 'pede',
         method = 'inversion  5  0.8',
-        options = cms.vstring(
+        options = [
             #'regularisation 1.0 0.05', # non-stated pre-sigma 50 mrad or 500 mum
             'entries 500',
             'chisqcut  30.0  4.5',
@@ -50,9 +50,9 @@
             'skipemptycons' 
             #'outlierdownweighting 3','dwfractioncut 0.1'
             #'outlierdownweighting 5','dwfractioncut 0.2'
-        ),
+        ],
         fileDir = 'HGalignment/',
-        runDir = cms.untracked.string('HGalignment/'),
+        runDir = 'HGalignment/',
         steerFile = 'pedeSteerHG',
         pedeDump = 'pedeHG.dump'
     ),
@@ -71,10 +71,9 @@
 
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 dqmEnvSiPixelAliHG = DQMEDHarvester('DQMHarvestingMetadata',
-                                  subSystemFolder = cms.untracked.string('AlCaReco'),  
-                                  )
+                                    subSystemFolder = cms.untracked.string('AlCaReco'))
 
 ALCAHARVESTSiPixelAliHG = cms.Sequence(SiPixelAliMilleFileExtractorHG*
-                                     SiPixelAliPedeAlignmentProducerHG*
-                                     SiPixelAliDQMModuleHG*
-                                     dqmEnvSiPixelAliHG)
+                                       SiPixelAliPedeAlignmentProducerHG*
+                                       SiPixelAliDQMModuleHG*
+                                       dqmEnvSiPixelAliHG)
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc
@@ -854,14 +854,7 @@ void AlignmentProducerBase::writeForRunRange(cond::Time_t time) {
 
     auto alignments = alignableTracker_->alignments();
     auto alignmentErrors = alignableTracker_->alignmentErrors();
-    this->writeDB(
-        // ~alignments, "TrackerAlignmentRcd", alignmentErrors, "TrackerAlignmentErrorExtendedRcd", trackerGlobal, time);
-        alignments,
-        tkAliRcdName_,
-        alignmentErrors,
-        "TrackerAlignmentErrorExtendedRcd",
-        trackerGlobal,
-        time);
+    this->writeDB(alignments, tkAliRcdName_, alignmentErrors, "TrackerAlignmentErrorExtendedRcd", trackerGlobal, time);
 
     // Save surface deformations to database
     if (saveDeformationsToDB_) {

diff --git a/CondFormats/PCLConfig/src/AlignPCLThresholdsHG.cc b/CondFormats/PCLConfig/src/AlignPCLThresholdsHG.cc
@@ -101,12 +101,7 @@ float AlignPCLThresholdsHG::getFractionCut(const std::string &AlignableId, const
 //****************************************************************************//
 const bool AlignPCLThresholdsHG::hasFloatMap(const std::string &AlignableId) const {
   const auto &it = floatMap_.find(AlignableId);
-
-  if (it != floatMap_.end()) {
-    return true;
-  } else {
-    return false;
-  }
+  return (it != floatMap_.end());
 }
 
 //****************************************************************************//