Merge tag 'CMSSW_14_2_0_pre1' into CMSSW_14_1_0_pre3_LST_X_LSTCore_re…

…alfiles_batch7

Alignment/APEEstimation/interface/TrackerSectorStruct.h

@@ -40,7 +40,7 @@ class TrackerSectorStruct {
           PProbXVsVar(nullptr),
           PSigmaXHitVsVar(nullptr),
           PSigmaXTrkVsVar(nullptr),
-          PSigmaXVsVar(nullptr){};
+          PSigmaXVsVar(nullptr) {}
 
     inline void fillCorrHists(const TString,
                               const TrackStruct::HitParameterStruct &hitParameterStruct,

Alignment/APEEstimation/plugins/ApeEstimator.cc

@@ -128,8 +128,8 @@ class ApeEstimator : public edm::one::EDAnalyzer<> {
 
 private:
   struct PositionAndError2 {
-    PositionAndError2() : posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F){};
-    PositionAndError2(float x, float y, float eX, float eY) : posX(x), posY(y), errX2(eX), errY2(eY){};
+    PositionAndError2() : posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F) {}
+    PositionAndError2(float x, float y, float eX, float eY) : posX(x), posY(y), errX2(eX), errY2(eY) {}
     float posX;
     float posY;
     float errX2;

Alignment/APEEstimation/plugins/BuildFile.xml

@@ -1,6 +1,7 @@
 <library file="*.cc" name="ApeEstimatorApeEstimatorPlugins">
   <use name="Alignment/APEEstimation" source_only="1"/>
   <use name="CommonTools/UtilAlgos"/>
+  <use name="CondFormats/Alignment"/>
   <use name="DataFormats/TrackingRecHit"/>
   <use name="DataFormats/TrackerRecHit2D"/>
   <use name="DataFormats/TrackReco"/>

Alignment/APEEstimation/test/apeMeasurement/apeMeasurement.py

@@ -283,14 +283,14 @@ def main():
             if not dataset["finished"][iov]:
                 skimSubName = os.path.join(workingArea,"skim_{}.sub".format(dataset["iovName"][iov]))
                 with open(skimSubName, "w") as skimSubScript:                  
-                    args = "fileList={fileList} outputName={outputName} trackSelection={trackSelection} globalTag={globalTag} maxEvents={maxEvents} maxFileSize={maxFileSize}".format(
+                    skim_args = "fileList={fileList} outputName={outputName} trackSelection={trackSelection} globalTag={globalTag} maxEvents={maxEvents} maxFileSize={maxFileSize}".format(
                                                                                 fileList=dataset["fileList"].format(iov), 
                                                                                 outputName=dataset["iovName"][iov],
                                                                                 trackSelection=dataset["trackSelection"],
                                                                                 globalTag=dataset["globalTag"],
                                                                                 maxEvents=dataset["maxEvents"],
                                                                                 maxFileSize=dataset["maxFileSize"])
-                    skimSubScript.write(condorTemplates.skimSubTemplate.format(workingArea=workingArea, base=base, args=args, target=dataset["targetPath"], name=dataset["iovName"][iov]))
+                    skimSubScript.write(condorTemplates.skimSubTemplate.format(workingArea=workingArea, base=base, args=skim_args, target=dataset["targetPath"], name=dataset["iovName"][iov]))
                 with open(master_dag_name, "a") as master_dag:
                     master_dag.write("JOB {} {}\n".format("skim_{}".format(dataset["iovName"][iov]), skimSubName))
 

Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h

@@ -17,7 +17,7 @@ class CocoaMaterialElementary {
 public:
   //---------- Constructors / Destructor
   CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol, float A, ALIint Z);
-  ~CocoaMaterialElementary(){};
+  ~CocoaMaterialElementary() {}
 
   ALIstring getName() const { return theName; }
   float getDensity() const { return theDensity; }

Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h

@@ -17,7 +17,7 @@ class CocoaSolidShape {
 public:
   //---------- Constructors / Destructor
   CocoaSolidShape(ALIstring type);
-  virtual ~CocoaSolidShape(){};
+  virtual ~CocoaSolidShape() {}
 
   ALIstring getType() const { return theType; }
 

Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h

@@ -14,7 +14,7 @@ class CocoaSolidShapeBox : public CocoaSolidShape {
 public:
   //---------- Constructors / Destructor
   CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim);
-  ~CocoaSolidShapeBox() override{};
+  ~CocoaSolidShapeBox() override {}
 
   ALIfloat getXHalfLength() const { return theXHalfLength; }
   ALIfloat getYHalfLength() const { return theYHalfLength; }

Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h

@@ -20,7 +20,7 @@ class CocoaSolidShapeTubs : public CocoaSolidShape {
                       ALIfloat pDz,
                       ALIfloat pSPhi = 0. * CLHEP::deg,
                       ALIfloat pDPhi = 360. * CLHEP::deg);
-  ~CocoaSolidShapeTubs() override{};
+  ~CocoaSolidShapeTubs() override {}
   ALIfloat getInnerRadius() const { return theInnerRadius; }
   ALIfloat getOuterRadius() const { return theOuterRadius; }
   ALIfloat getZHalfLength() const { return theZHalfLength; }

Alignment/CocoaDaq/interface/CocoaDaqReader.h

@@ -7,11 +7,11 @@ class OpticalAlignMeasurementInfo;
 
 class CocoaDaqReader {
 public:
-  CocoaDaqReader(){};
+  CocoaDaqReader() {}
   static CocoaDaqReader* GetDaqReader() { return theDaqReader; }
   static void SetDaqReader(CocoaDaqReader* reader);
 
-  virtual ~CocoaDaqReader(){};
+  virtual ~CocoaDaqReader() {}
 
   virtual bool ReadNextEvent() = 0;
   virtual bool ReadEvent(int nev) { return false; };

Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h

@@ -195,7 +195,7 @@ class CocoaDaqRootEvent : public TObject {
 
 public:
   CocoaDaqRootEvent();
-  ~CocoaDaqRootEvent() override{};
+  ~CocoaDaqRootEvent() override {}
   void SetHeader(int run, int evt) { Header->SetRunEvt(run, evt); }
   void DumpIt();
 

Alignment/CocoaFit/interface/Fit.h

@@ -32,8 +32,8 @@ enum FitQuality { FQsmallDistanceToMinimum, FQbigDistanceToMinimum, FQchiSquareW
 class Fit {
 public:
   //----- Constructor / Destructor
-  Fit(){};
-  ~Fit(){};
+  Fit() {}
+  ~Fit() {}
 
   //----- Gets the only instance of this class
   static Fit& getInstance();

Alignment/CocoaFit/interface/FittedEntriesManager.h

@@ -16,8 +16,8 @@
 class FittedEntriesManager {
 public:
   //---------- Constructors / Destructor
-  FittedEntriesManager(){};
-  ~FittedEntriesManager(){};
+  FittedEntriesManager() {}
+  ~FittedEntriesManager() {}
   static FittedEntriesManager* getInstance();
   void AddFittedEntriesSet(FittedEntriesSet* fents);
   void MakeHistos();

Alignment/CocoaFit/interface/FittedEntriesSet.h

@@ -26,7 +26,7 @@ class FittedEntriesSet {
   FittedEntriesSet(const std::vector<ALIstring>& wl);
   //---- Average a list of FittedEntriesSet's
   FittedEntriesSet(const std::vector<FittedEntriesSet*>& vSets);
-  ~FittedEntriesSet(){};
+  ~FittedEntriesSet() {}
   void Fill();
   void FillEntries();
   void FillCorrelations();

Alignment/CocoaFit/interface/FittedEntry.h

@@ -17,11 +17,11 @@ class Entry;
 class FittedEntry {
 public:
   //---------- Constructors / Destructor
-  FittedEntry(){};
+  FittedEntry() {}
   FittedEntry(Entry* entry, ALIint order, ALIdouble sigma);
   FittedEntry(ALIstring name, float value, float sigma);
   FittedEntry(const std::vector<FittedEntry*>& vFEntry);
-  ~FittedEntry(){};
+  ~FittedEntry() {}
 
   void BuildName();
 

Alignment/CocoaFit/interface/HistoDef.h

@@ -17,9 +17,9 @@ class Entry;
 class HistoDef {
 public:
   //---------- Constructors / Destructor
-  HistoDef(){};
+  HistoDef() {}
   void init(ALIstring name);
-  ~HistoDef(){};
+  ~HistoDef() {}
 
   ALIstring name() const { return theName; }
   float minimum() const { return theMin; }

Alignment/CocoaFit/interface/NtupleManager.h

@@ -20,8 +20,8 @@ class TClonesArray;
 class NtupleManager {
 public:
   //---------- Constructors / Destructor
-  NtupleManager(){};
-  ~NtupleManager(){};
+  NtupleManager() {}
+  ~NtupleManager() {}
   static NtupleManager* getInstance();
   void BookNtuple();
   void InitNtuple();

Alignment/CocoaModel/interface/ALILine.h

@@ -15,8 +15,8 @@ class ALIPlane;
 
 class ALILine {
 public:
-  ALILine(){};
-  ~ALILine(){};
+  ALILine() {}
+  ~ALILine() {}
   ALILine(const CLHEP::Hep3Vector& point, const CLHEP::Hep3Vector& direction);
   // Next 1 line was added with 22 Mar 2001
   //  CLHEP::Hep3Vector ALILine( const ALILine& l2, bool notParallel = 0);

Alignment/CocoaModel/interface/ALIRmDataFromFile.h

@@ -16,7 +16,7 @@ class ALIRmDataFromFile {
 public:
   //----- Constructor / destructor
   ALIRmDataFromFile();
-  ~ALIRmDataFromFile(){};
+  ~ALIRmDataFromFile() {}
 
   // Access DATA MEMBERS
   ALIbool setAngle(const ALIstring& coord, const ALIdouble val);

Alignment/CocoaModel/interface/DeviationSensor2D.h

@@ -16,9 +16,9 @@
 class DeviationSensor2D {
 public:
   //---------- Constructors / Destructor
-  DeviationSensor2D(){};
+  DeviationSensor2D() {}
   DeviationSensor2D(ALIdouble posDimFactor, ALIdouble angDimFactor);
-  ~DeviationSensor2D(){};
+  ~DeviationSensor2D() {}
 
   // read file
   void fillData(const std::vector<ALIstring>& wl);

Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h

@@ -27,7 +27,7 @@ class DeviationsFromFileSensor2D {
     theOffsetX = 0.;
     theOffsetY = 0.;
   };
-  ~DeviationsFromFileSensor2D(){};
+  ~DeviationsFromFileSensor2D() {}
 
   // read file
   void readFile(ALIFileIn& ifdevi);

Alignment/CocoaModel/interface/EntryAngle.h

@@ -20,7 +20,7 @@ class EntryAngle : public Entry {
     theDimType = ED_angle;
     //-    std::cout << "entryangle " << type << std::endl;
   };
-  ~EntryAngle() override{};
+  ~EntryAngle() override {}
 
   //----- Return value and sigma dimension factors
   ALIdouble ValueDimensionFactor() const override { return ALIUtils::AngleValueDimensionFactor(); }

Alignment/CocoaModel/interface/EntryAngleAffAngles.h

@@ -15,7 +15,7 @@
 class EntryAngleAffAngles : public EntryAngle {
 public:
   EntryAngleAffAngles(const ALIstring& type);
-  ~EntryAngleAffAngles() override{};
+  ~EntryAngleAffAngles() override {}
 
   virtual void FillName(const ALIstring& name);
   void displace(ALIdouble disp) override;

Alignment/CocoaModel/interface/EntryLength.h

@@ -20,7 +20,7 @@ class EntryLength : public Entry {
     // std::cout << "entrylength" << std::endl;
     theDimType = ED_length;
   };
-  ~EntryLength() override{};
+  ~EntryLength() override {}
 
   //----- Return value and sigma dimension factors
   ALIdouble ValueDimensionFactor() const override { return ALIUtils::LengthValueDimensionFactor(); }

Alignment/CocoaModel/interface/EntryLengthAffCentre.h

@@ -15,7 +15,7 @@
 class EntryLengthAffCentre : public EntryLength {
 public:
   EntryLengthAffCentre(const ALIstring& type);
-  ~EntryLengthAffCentre() override{};
+  ~EntryLengthAffCentre() override {}
 
   virtual void FillName(const ALIstring& name);
   void displace(ALIdouble disp) override;

Alignment/CocoaModel/interface/EntryMgr.h

@@ -14,7 +14,7 @@ class EntryData;
 
 class EntryMgr {
 private:
-  EntryMgr(){};
+  EntryMgr() {}
 
 public:
   static EntryMgr* getInstance();

Alignment/CocoaModel/interface/EntryNoDim.h

@@ -19,7 +19,7 @@ class EntryNoDim : public Entry {
     theDimType = ED_nodim;
     //std::cout << "entryNoDim" << std::endl;
   };
-  ~EntryNoDim() override{};
+  ~EntryNoDim() override {}
 
   // Access DATA MEMBERS
   //----------- Return value and sigma dimension factors (1. as object of this class have no dimension)

Alignment/CocoaModel/interface/ErrorCorrelationMgr.h

@@ -18,7 +18,7 @@ typedef std::map<ALIstring, ALIdouble, std::less<ALIstring> > msd;
 
 class ErrorCorrelationMgr {
 private:
-  ErrorCorrelationMgr(){};
+  ErrorCorrelationMgr() {}
 
 public:
   static ErrorCorrelationMgr* getInstance();

Alignment/CocoaModel/interface/LightRay.h

@@ -24,7 +24,7 @@ class LightRay {
   // Make a light ray out of the centre_glob points of two OptO:'source' and 'pointLens'
   LightRay(OpticalObject* p1, OpticalObject* p2);
   LightRay(CLHEP::Hep3Vector& vec1, CLHEP::Hep3Vector& vec2);
-  ~LightRay(){};
+  ~LightRay() {}
 
   //@@@@@@@@@@@@@@@@@@@@ Methods for each OptO
   //----- Make a light ray out of the centre_glob and Z direction of one OptO: 'laser' or 'source'

Alignment/CocoaModel/interface/Measurement.h

@@ -28,7 +28,7 @@ class Measurement {
 public:
   //----- Constructors / destructor
   Measurement(const ALIint measdim, ALIstring& type, ALIstring& name);
-  Measurement(){};
+  Measurement() {}
   virtual ~Measurement();
 
   // construct Measurement reading date from file
@@ -47,7 +47,7 @@ class Measurement {
   void addAffectingEntriesFromOptO(const OpticalObject* optoP);
 
   // Get simulated value (called every time a parameter is displaced)
-  virtual void calculateSimulatedValue(ALIbool firstTime){};
+  virtual void calculateSimulatedValue(ALIbool firstTime) {}
   // Get simulated value original (called every time a parameter value is changed: after getting values from file and every non-linear fit iteration )
   void calculateOriginalSimulatedValue();
 
@@ -63,7 +63,7 @@ class Measurement {
   // Get the previous OptOs in the list of OptO that take part in this measurement
   const OpticalObject* getPreviousOptO(const OpticalObject* Popto) const;
   //---------- Add any correction between the measurement data and the default format in COCOA
-  virtual void correctValueAndSigma(){};
+  virtual void correctValueAndSigma() {}
 
   //---------- Convert from V to rad
   virtual void setConversionFactor(const std::vector<ALIstring>& wordlist) {
@@ -155,7 +155,7 @@ class Measurement {
   // Check is value is simulated
   bool valueIsSimulated(ALIint coor) { return theValueIsSimulated[coor]; }
 
-  virtual void setXlaserLine(ALIuint ii, int val){};
+  virtual void setXlaserLine(ALIuint ii, int val) {}
 
   static ALIdouble cameraScaleFactor;
 

Alignment/CocoaModel/interface/MeasurementCOPS.h

@@ -21,8 +21,8 @@ class MeasurementCOPS : public Measurement {
     for (unsigned int ii = 0; ii < 4; ii++)
       theXlaserLine[ii] = -1;
   };
-  MeasurementCOPS(){};
-  ~MeasurementCOPS() override{};
+  MeasurementCOPS() {}
+  ~MeasurementCOPS() override {}
 
   // Get simulated value (called every time a parameter is displaced)
   void calculateSimulatedValue(ALIbool firstTime) override;

Alignment/CocoaModel/interface/MeasurementDiffEntry.h

@@ -17,9 +17,9 @@
 
 class MeasurementDiffEntry : public Measurement {
 public:
-  MeasurementDiffEntry(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name){};
-  MeasurementDiffEntry(){};
-  ~MeasurementDiffEntry() override{};
+  MeasurementDiffEntry(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name) {}
+  MeasurementDiffEntry() {}
+  ~MeasurementDiffEntry() override {}
 
   // separate OptO names and Entry names
   void buildOptONamesList(const std::vector<ALIstring>& wl) override;

Alignment/CocoaModel/interface/MeasurementDistancemeter.h

@@ -18,9 +18,9 @@
 class MeasurementDistancemeter : public Measurement {
 public:
   MeasurementDistancemeter(const ALIint measdim, ALIstring& type, ALIstring& name)
-      : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.){};
-  MeasurementDistancemeter(){};
-  ~MeasurementDistancemeter() override{};
+      : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.) {}
+  MeasurementDistancemeter() {}
+  ~MeasurementDistancemeter() override {}
 
   // Get simulated value (called every time a parameter is displaced)
   void calculateSimulatedValue(ALIbool firstTime) override;

Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h

@@ -18,9 +18,9 @@
 class MeasurementDistancemeter3dim : public Measurement {
 public:
   MeasurementDistancemeter3dim(const ALIint measdim, ALIstring& type, ALIstring& name)
-      : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.){};
-  MeasurementDistancemeter3dim(){};
-  ~MeasurementDistancemeter3dim() override{};
+      : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.) {}
+  MeasurementDistancemeter3dim() {}
+  ~MeasurementDistancemeter3dim() override {}
 
   // Get simulated value (called every time a parameter is displaced)
   void calculateSimulatedValue(ALIbool firstTime) override;

Alignment/CocoaModel/interface/MeasurementSensor2D.h

@@ -17,9 +17,9 @@
 
 class MeasurementSensor2D : public Measurement {
 public:
-  MeasurementSensor2D(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name){};
-  MeasurementSensor2D(){};
-  ~MeasurementSensor2D() override{};
+  MeasurementSensor2D(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name) {}
+  MeasurementSensor2D() {}
+  ~MeasurementSensor2D() override {}
 
   // Get simulated value (called every time a parameter is displaced)
   void calculateSimulatedValue(ALIbool firstTime) override;

Alignment/CocoaModel/interface/MeasurementTiltmeter.h

@@ -24,9 +24,9 @@ class MeasurementTiltmeter : public Measurement {
         theConstantTerm(0.),
         theConstantTermSigma(0.),
         thePedestal(0.),
-        thePedestalSigma(0.){};
-  MeasurementTiltmeter(){};
-  ~MeasurementTiltmeter() override{};
+        thePedestalSigma(0.) {}
+  MeasurementTiltmeter() {}
+  ~MeasurementTiltmeter() override {}
 
   // Get simulated value (called every time a parameter is displaced)
   void calculateSimulatedValue(ALIbool firstTime) override;