diff --git a/Alignment/APEEstimation/interface/TrackerSectorStruct.h b/Alignment/APEEstimation/interface/TrackerSectorStruct.h index ee36a999d913a..03e5f03eeff59 100644 --- a/Alignment/APEEstimation/interface/TrackerSectorStruct.h +++ b/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, diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc index 98310396ff9f4..9062fe00246e6 100644 --- a/Alignment/APEEstimation/plugins/ApeEstimator.cc +++ b/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; diff --git a/Alignment/APEEstimation/plugins/BuildFile.xml b/Alignment/APEEstimation/plugins/BuildFile.xml index fd6dfe3cad086..e62fd18bcbeb7 100644 --- a/Alignment/APEEstimation/plugins/BuildFile.xml +++ b/Alignment/APEEstimation/plugins/BuildFile.xml @@ -1,6 +1,7 @@ + diff --git a/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h b/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h index 4d60f99c228b5..8cb528118490c 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h +++ b/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; } diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h index 942bde75b3bbb..610945cde6c07 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h +++ b/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; } diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h index 25182e7d7f15d..f2c1f781e8ec9 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h +++ b/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; } diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h index 9cb871337707c..50f822cb81ab2 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h +++ b/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; } diff --git a/Alignment/CocoaDaq/interface/CocoaDaqReader.h b/Alignment/CocoaDaq/interface/CocoaDaqReader.h index c5a7550261823..fd727c660ab6c 100644 --- a/Alignment/CocoaDaq/interface/CocoaDaqReader.h +++ b/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; }; diff --git a/Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h b/Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h index 14faac9476fa3..eb221633e0ca2 100644 --- a/Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h +++ b/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(); diff --git a/Alignment/CocoaFit/interface/Fit.h b/Alignment/CocoaFit/interface/Fit.h index 6769adb726f19..1651155587398 100644 --- a/Alignment/CocoaFit/interface/Fit.h +++ b/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(); diff --git a/Alignment/CocoaFit/interface/FittedEntriesManager.h b/Alignment/CocoaFit/interface/FittedEntriesManager.h index 8890a6a70bc50..d83f745bc9fc5 100644 --- a/Alignment/CocoaFit/interface/FittedEntriesManager.h +++ b/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(); diff --git a/Alignment/CocoaFit/interface/FittedEntriesSet.h b/Alignment/CocoaFit/interface/FittedEntriesSet.h index e7eabc5dc5857..6c8ced66e2428 100644 --- a/Alignment/CocoaFit/interface/FittedEntriesSet.h +++ b/Alignment/CocoaFit/interface/FittedEntriesSet.h @@ -26,7 +26,7 @@ class FittedEntriesSet { FittedEntriesSet(const std::vector& wl); //---- Average a list of FittedEntriesSet's FittedEntriesSet(const std::vector& vSets); - ~FittedEntriesSet(){}; + ~FittedEntriesSet() {} void Fill(); void FillEntries(); void FillCorrelations(); diff --git a/Alignment/CocoaFit/interface/FittedEntry.h b/Alignment/CocoaFit/interface/FittedEntry.h index 66357c7e94201..37f6e9d813b22 100644 --- a/Alignment/CocoaFit/interface/FittedEntry.h +++ b/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& vFEntry); - ~FittedEntry(){}; + ~FittedEntry() {} void BuildName(); diff --git a/Alignment/CocoaFit/interface/HistoDef.h b/Alignment/CocoaFit/interface/HistoDef.h index 565a43e5dc140..3d4379c324305 100644 --- a/Alignment/CocoaFit/interface/HistoDef.h +++ b/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; } diff --git a/Alignment/CocoaFit/interface/NtupleManager.h b/Alignment/CocoaFit/interface/NtupleManager.h index 17750ff868b2c..8524a858711f0 100644 --- a/Alignment/CocoaFit/interface/NtupleManager.h +++ b/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(); diff --git a/Alignment/CocoaModel/interface/ALILine.h b/Alignment/CocoaModel/interface/ALILine.h index 3250efe7bdd2a..142bfabbd5928 100644 --- a/Alignment/CocoaModel/interface/ALILine.h +++ b/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); diff --git a/Alignment/CocoaModel/interface/ALIRmDataFromFile.h b/Alignment/CocoaModel/interface/ALIRmDataFromFile.h index 35043987627ee..d44bd64b15f7a 100644 --- a/Alignment/CocoaModel/interface/ALIRmDataFromFile.h +++ b/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); diff --git a/Alignment/CocoaModel/interface/DeviationSensor2D.h b/Alignment/CocoaModel/interface/DeviationSensor2D.h index d422da6049cdb..b5089670facee 100644 --- a/Alignment/CocoaModel/interface/DeviationSensor2D.h +++ b/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& wl); diff --git a/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h b/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h index c331072fdb1e2..c85825e50d5d0 100644 --- a/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h +++ b/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h @@ -27,7 +27,7 @@ class DeviationsFromFileSensor2D { theOffsetX = 0.; theOffsetY = 0.; }; - ~DeviationsFromFileSensor2D(){}; + ~DeviationsFromFileSensor2D() {} // read file void readFile(ALIFileIn& ifdevi); diff --git a/Alignment/CocoaModel/interface/EntryAngle.h b/Alignment/CocoaModel/interface/EntryAngle.h index c76b6620d9dc9..0080d289cad77 100644 --- a/Alignment/CocoaModel/interface/EntryAngle.h +++ b/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(); } diff --git a/Alignment/CocoaModel/interface/EntryAngleAffAngles.h b/Alignment/CocoaModel/interface/EntryAngleAffAngles.h index f2c914a8a8c00..bebc4ed8f2804 100644 --- a/Alignment/CocoaModel/interface/EntryAngleAffAngles.h +++ b/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; diff --git a/Alignment/CocoaModel/interface/EntryLength.h b/Alignment/CocoaModel/interface/EntryLength.h index 17456eee4437d..c7a55da0449f0 100644 --- a/Alignment/CocoaModel/interface/EntryLength.h +++ b/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(); } diff --git a/Alignment/CocoaModel/interface/EntryLengthAffCentre.h b/Alignment/CocoaModel/interface/EntryLengthAffCentre.h index 195cdb77e1044..d6635567f952b 100644 --- a/Alignment/CocoaModel/interface/EntryLengthAffCentre.h +++ b/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; diff --git a/Alignment/CocoaModel/interface/EntryMgr.h b/Alignment/CocoaModel/interface/EntryMgr.h index 983b927f8a960..b6fd79abd4691 100644 --- a/Alignment/CocoaModel/interface/EntryMgr.h +++ b/Alignment/CocoaModel/interface/EntryMgr.h @@ -14,7 +14,7 @@ class EntryData; class EntryMgr { private: - EntryMgr(){}; + EntryMgr() {} public: static EntryMgr* getInstance(); diff --git a/Alignment/CocoaModel/interface/EntryNoDim.h b/Alignment/CocoaModel/interface/EntryNoDim.h index 4ac52f4ff1559..3e69b5029b1d8 100644 --- a/Alignment/CocoaModel/interface/EntryNoDim.h +++ b/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) diff --git a/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h b/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h index 3ba8e0d21bf22..479d0e204d960 100644 --- a/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h +++ b/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h @@ -18,7 +18,7 @@ typedef std::map > msd; class ErrorCorrelationMgr { private: - ErrorCorrelationMgr(){}; + ErrorCorrelationMgr() {} public: static ErrorCorrelationMgr* getInstance(); diff --git a/Alignment/CocoaModel/interface/LightRay.h b/Alignment/CocoaModel/interface/LightRay.h index e6bdcf0e1c713..7fd0c162e48fe 100644 --- a/Alignment/CocoaModel/interface/LightRay.h +++ b/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' diff --git a/Alignment/CocoaModel/interface/Measurement.h b/Alignment/CocoaModel/interface/Measurement.h index 24d66b69efeca..951402f8747d0 100644 --- a/Alignment/CocoaModel/interface/Measurement.h +++ b/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& 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; diff --git a/Alignment/CocoaModel/interface/MeasurementCOPS.h b/Alignment/CocoaModel/interface/MeasurementCOPS.h index 285afc6393b7e..fdc2cc956bed8 100644 --- a/Alignment/CocoaModel/interface/MeasurementCOPS.h +++ b/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; diff --git a/Alignment/CocoaModel/interface/MeasurementDiffEntry.h b/Alignment/CocoaModel/interface/MeasurementDiffEntry.h index ca8341c76e5db..42a1f77013813 100644 --- a/Alignment/CocoaModel/interface/MeasurementDiffEntry.h +++ b/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& wl) override; diff --git a/Alignment/CocoaModel/interface/MeasurementDistancemeter.h b/Alignment/CocoaModel/interface/MeasurementDistancemeter.h index 1c8c7e80b939d..94c41927452dc 100644 --- a/Alignment/CocoaModel/interface/MeasurementDistancemeter.h +++ b/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; diff --git a/Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h b/Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h index 8fd9f52cb2edc..3696451e86dcb 100644 --- a/Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h +++ b/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; diff --git a/Alignment/CocoaModel/interface/MeasurementSensor2D.h b/Alignment/CocoaModel/interface/MeasurementSensor2D.h index 7506853199aef..eb6ffc8b8ad49 100644 --- a/Alignment/CocoaModel/interface/MeasurementSensor2D.h +++ b/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; diff --git a/Alignment/CocoaModel/interface/MeasurementTiltmeter.h b/Alignment/CocoaModel/interface/MeasurementTiltmeter.h index 2833b2e7263b2..c9d1f9200fe27 100644 --- a/Alignment/CocoaModel/interface/MeasurementTiltmeter.h +++ b/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; diff --git a/Alignment/CocoaModel/interface/Model.h b/Alignment/CocoaModel/interface/Model.h index 675ec35646783..79715e4f56c18 100644 --- a/Alignment/CocoaModel/interface/Model.h +++ b/Alignment/CocoaModel/interface/Model.h @@ -55,7 +55,7 @@ class Model { public: //---------- Constructor / destructor Model(); - ~Model(){}; + ~Model() {} ///---------- Gets the only instance of this class static Model& getInstance(); diff --git a/Alignment/CocoaModel/interface/OptOCOPS.h b/Alignment/CocoaModel/interface/OptOCOPS.h index 2c7b6b971d6f5..e0b50bbe698af 100644 --- a/Alignment/CocoaModel/interface/OptOCOPS.h +++ b/Alignment/CocoaModel/interface/OptOCOPS.h @@ -20,10 +20,10 @@ class DeviationsFromFileSensor2D; class OptOCOPS : public OpticalObject { public: //---------- Constructors / Destructor - OptOCOPS(){}; + OptOCOPS() {} OptOCOPS(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false){}; - ~OptOCOPS() override{}; + : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false) {} + ~OptOCOPS() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOCameraDetector.h b/Alignment/CocoaModel/interface/OptOCameraDetector.h index 9866d64f8ae56..bc6a24e3eaaac 100644 --- a/Alignment/CocoaModel/interface/OptOCameraDetector.h +++ b/Alignment/CocoaModel/interface/OptOCameraDetector.h @@ -18,10 +18,10 @@ class LightRay; class OptOCameraDetector : public OpticalObject { public: //---------- Constructors / Destructor - OptOCameraDetector(){}; + OptOCameraDetector() {} OptOCameraDetector(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOCameraDetector() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOCameraDetector() override {} //---------- Propagate light for measurement meas void participateInMeasurement(LightRay& lightray, Measurement& meas, const ALIstring& behav) override; diff --git a/Alignment/CocoaModel/interface/OptOCubeSplitter.h b/Alignment/CocoaModel/interface/OptOCubeSplitter.h index 57e24bcd3b401..d8903707ab3fb 100644 --- a/Alignment/CocoaModel/interface/OptOCubeSplitter.h +++ b/Alignment/CocoaModel/interface/OptOCubeSplitter.h @@ -18,10 +18,10 @@ class LightRay; class OptOCubeSplitter : public OpticalObject { public: //---------- Constructors / Destructor - OptOCubeSplitter(){}; + OptOCubeSplitter() {} OptOCubeSplitter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOCubeSplitter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOCubeSplitter() override {} //---------- Fast simulation of deviation of the light ray (reflection, shift, ...) void fastDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptODistancemeter.h b/Alignment/CocoaModel/interface/OptODistancemeter.h index 1cd54f834bdbf..9b3400847b4fd 100644 --- a/Alignment/CocoaModel/interface/OptODistancemeter.h +++ b/Alignment/CocoaModel/interface/OptODistancemeter.h @@ -18,10 +18,10 @@ class LightRay; class OptODistancemeter : public OpticalObject { public: //---------- Constructors / Destructor - OptODistancemeter(){}; + OptODistancemeter() {} OptODistancemeter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptODistancemeter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptODistancemeter() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptODistancemeter3dim.h b/Alignment/CocoaModel/interface/OptODistancemeter3dim.h index bb744b2cd56c3..3d7d8a8e05774 100644 --- a/Alignment/CocoaModel/interface/OptODistancemeter3dim.h +++ b/Alignment/CocoaModel/interface/OptODistancemeter3dim.h @@ -18,10 +18,10 @@ class LightRay; class OptODistancemeter3dim : public OpticalObject { public: //---------- Constructors / Destructor - OptODistancemeter3dim(){}; + OptODistancemeter3dim() {} OptODistancemeter3dim(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptODistancemeter3dim() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptODistancemeter3dim() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOLaser.h b/Alignment/CocoaModel/interface/OptOLaser.h index 19d2935145e29..3e5945639a66c 100644 --- a/Alignment/CocoaModel/interface/OptOLaser.h +++ b/Alignment/CocoaModel/interface/OptOLaser.h @@ -18,10 +18,10 @@ class LightRay; class OptOLaser : public OpticalObject { public: //---------- Constructors / Destructor - OptOLaser(){}; + OptOLaser() {} OptOLaser(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOLaser() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOLaser() override {} //---------- Default behaviour: create a LightRay object void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOLens.h b/Alignment/CocoaModel/interface/OptOLens.h index 03673c25a9985..998f87a277946 100644 --- a/Alignment/CocoaModel/interface/OptOLens.h +++ b/Alignment/CocoaModel/interface/OptOLens.h @@ -20,8 +20,8 @@ class OptOLens : public OpticalObject { //---------- Constructors / Destructor OptOLens(); OptOLens(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOLens() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOLens() override {} //---------- Propagate light for measurement meas void participateInMeasurement(LightRay& lightray, Measurement& meas, const ALIstring& behav) override; diff --git a/Alignment/CocoaModel/interface/OptOMirror.h b/Alignment/CocoaModel/interface/OptOMirror.h index 62aa6b8808c68..2d4bda126029a 100644 --- a/Alignment/CocoaModel/interface/OptOMirror.h +++ b/Alignment/CocoaModel/interface/OptOMirror.h @@ -18,10 +18,10 @@ class LightRay; class OptOMirror : public OpticalObject { public: //---------- Constructors / Destructor - OptOMirror(){}; + OptOMirror() {} OptOMirror(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOMirror() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOMirror() override {} //---------- Propagate light for measurement meas //----- Default behaviour: detailed deviation diff --git a/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h b/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h index 808906336209f..3bbe807f71571 100644 --- a/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h +++ b/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h @@ -18,10 +18,10 @@ class LightRay; class OptOModifiedRhomboidPrism : public OpticalObject { public: //---------- Constructors / Destructor - OptOModifiedRhomboidPrism(){}; + OptOModifiedRhomboidPrism() {} OptOModifiedRhomboidPrism(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOModifiedRhomboidPrism() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOModifiedRhomboidPrism() override {} //---------- Fast simulation of deviation of the light ray (reflection, shift, ...) void fastDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptOOpticalSquare.h b/Alignment/CocoaModel/interface/OptOOpticalSquare.h index 41b315db850e5..113a0c86820b6 100644 --- a/Alignment/CocoaModel/interface/OptOOpticalSquare.h +++ b/Alignment/CocoaModel/interface/OptOOpticalSquare.h @@ -18,10 +18,10 @@ class LightRay; class OptOOpticalSquare : public OpticalObject { public: //---------- Constructors / Destructor - OptOOpticalSquare(){}; + OptOOpticalSquare() {} OptOOpticalSquare(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOOpticalSquare() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOOpticalSquare() override {} //---------- Fast simulation of deviation of the light ray (reflection, shift, ...) void fastDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptOPinhole.h b/Alignment/CocoaModel/interface/OptOPinhole.h index c853ce63a0f5c..ac264fe54e566 100644 --- a/Alignment/CocoaModel/interface/OptOPinhole.h +++ b/Alignment/CocoaModel/interface/OptOPinhole.h @@ -18,10 +18,10 @@ class LightRay; class OptOPinhole : public OpticalObject { public: //---------- Constructors / Destructor - OptOPinhole(){}; + OptOPinhole() {} OptOPinhole(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOPinhole() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOPinhole() override {} //---------- Default behaviour void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOPlateSplitter.h b/Alignment/CocoaModel/interface/OptOPlateSplitter.h index 7c2f04b22ee7a..db536739637a8 100644 --- a/Alignment/CocoaModel/interface/OptOPlateSplitter.h +++ b/Alignment/CocoaModel/interface/OptOPlateSplitter.h @@ -18,10 +18,10 @@ class LightRay; class OptOPlateSplitter : public OpticalObject { public: //---------- Constructors / Destructor - OptOPlateSplitter(){}; + OptOPlateSplitter() {} OptOPlateSplitter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOPlateSplitter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOPlateSplitter() override {} //---------- Detailed simulation of deviation of the light ray (reflection, shift, ...) void detailedDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptORisleyPrism.h b/Alignment/CocoaModel/interface/OptORisleyPrism.h index 5877c2d55fa45..c7484c78527ba 100644 --- a/Alignment/CocoaModel/interface/OptORisleyPrism.h +++ b/Alignment/CocoaModel/interface/OptORisleyPrism.h @@ -18,10 +18,10 @@ class LightRay; class OptORisleyPrism : public OpticalObject { public: //---------- Constructors / Destructor - OptORisleyPrism(){}; + OptORisleyPrism() {} OptORisleyPrism(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptORisleyPrism() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptORisleyPrism() override {} //---------- Propagate light for measurement meas void participateInMeasurement(LightRay& lightray, Measurement& meas, const ALIstring& behav) override; diff --git a/Alignment/CocoaModel/interface/OptOScreen.h b/Alignment/CocoaModel/interface/OptOScreen.h index af0723be02957..36c628bcd06bc 100644 --- a/Alignment/CocoaModel/interface/OptOScreen.h +++ b/Alignment/CocoaModel/interface/OptOScreen.h @@ -18,10 +18,10 @@ class LightRay; class OptOScreen : public OpticalObject { public: //---------- Constructors / Destructor - OptOScreen(){}; + OptOScreen() {} OptOScreen(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOScreen() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOScreen() override {} //---------- defaultBehaviour: do nothing void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOSensor2D.h b/Alignment/CocoaModel/interface/OptOSensor2D.h index 738abcc5189c4..f7a65fa15dc6e 100644 --- a/Alignment/CocoaModel/interface/OptOSensor2D.h +++ b/Alignment/CocoaModel/interface/OptOSensor2D.h @@ -19,10 +19,10 @@ class DeviationsFromFileSensor2D; class OptOSensor2D : public OpticalObject { public: //---------- Constructors / Destructor - OptOSensor2D(){}; + OptOSensor2D() {} OptOSensor2D(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false){}; - ~OptOSensor2D() override{}; + : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false) {} + ~OptOSensor2D() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOSource.h b/Alignment/CocoaModel/interface/OptOSource.h index 15d2d9d51783a..d8f5a1c3d9386 100644 --- a/Alignment/CocoaModel/interface/OptOSource.h +++ b/Alignment/CocoaModel/interface/OptOSource.h @@ -20,8 +20,8 @@ class OptOSource : public OpticalObject { //---------- Constructors / Destructor OptOSource(); OptOSource(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOSource() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOSource() override {} #ifdef COCOA_VIS virtual void fillVRML(); diff --git a/Alignment/CocoaModel/interface/OptOTiltmeter.h b/Alignment/CocoaModel/interface/OptOTiltmeter.h index e5868419c8fbf..c9c1b64a8bc50 100644 --- a/Alignment/CocoaModel/interface/OptOTiltmeter.h +++ b/Alignment/CocoaModel/interface/OptOTiltmeter.h @@ -18,10 +18,10 @@ class LightRay; class OptOTiltmeter : public OpticalObject { public: //---------- Constructors / Destructor - OptOTiltmeter(){}; + OptOTiltmeter() {} OptOTiltmeter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOTiltmeter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOTiltmeter() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOUserDefined.h b/Alignment/CocoaModel/interface/OptOUserDefined.h index 5d821c8cf9b1c..23602d60fb043 100644 --- a/Alignment/CocoaModel/interface/OptOUserDefined.h +++ b/Alignment/CocoaModel/interface/OptOUserDefined.h @@ -18,10 +18,10 @@ class LightRay; class OptOUserDefined : public OpticalObject { public: //---------- Constructors / Destructor - OptOUserDefined(){}; + OptOUserDefined() {} OptOUserDefined(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOUserDefined() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOUserDefined() override {} #ifdef COCOA_VIS virtual void fillVRML() override; diff --git a/Alignment/CocoaModel/interface/OptOXLaser.h b/Alignment/CocoaModel/interface/OptOXLaser.h index 751e67b42589c..d26a1e44c82d1 100644 --- a/Alignment/CocoaModel/interface/OptOXLaser.h +++ b/Alignment/CocoaModel/interface/OptOXLaser.h @@ -18,10 +18,10 @@ class LightRay; class OptOXLaser : public OpticalObject { public: //---------- Constructors / Destructor - OptOXLaser(){}; + OptOXLaser() {} OptOXLaser(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOXLaser() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOXLaser() override {} //---------- Default behaviour: create a LightRay object void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OpticalObject.h b/Alignment/CocoaModel/interface/OpticalObject.h index 8f25d08e91db3..4275bc7a68bed 100644 --- a/Alignment/CocoaModel/interface/OpticalObject.h +++ b/Alignment/CocoaModel/interface/OpticalObject.h @@ -37,7 +37,7 @@ class OpticalObject { public: //---------- Constructors / destructor - OpticalObject(){}; + OpticalObject() {} OpticalObject(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data); virtual ~OpticalObject(); @@ -51,8 +51,8 @@ class OpticalObject { virtual void constructMaterial(); virtual void constructSolidShape(); - virtual void fillVRML(){}; - virtual void fillIguana(){}; + virtual void fillVRML() {} + virtual void fillIguana() {} // ACCESS DATA MEMBERS const ALIstring& name() const { return theName; }; diff --git a/Alignment/CocoaModel/interface/OpticalObjectMgr.h b/Alignment/CocoaModel/interface/OpticalObjectMgr.h index 05386b93190ed..71d3d634ab61e 100644 --- a/Alignment/CocoaModel/interface/OpticalObjectMgr.h +++ b/Alignment/CocoaModel/interface/OpticalObjectMgr.h @@ -18,8 +18,8 @@ class OpticalObject; class OpticalObjectMgr { public: - OpticalObjectMgr(){}; - ~OpticalObjectMgr(){}; + OpticalObjectMgr() {} + ~OpticalObjectMgr() {} /// Get the only instance static OpticalObjectMgr* getInstance(); diff --git a/Alignment/CocoaModel/interface/ParameterMgr.h b/Alignment/CocoaModel/interface/ParameterMgr.h index 365f583be155e..42b69e0a5bf9d 100644 --- a/Alignment/CocoaModel/interface/ParameterMgr.h +++ b/Alignment/CocoaModel/interface/ParameterMgr.h @@ -14,7 +14,7 @@ typedef std::map > msd; class ParameterMgr { private: - ParameterMgr(){}; + ParameterMgr() {} public: static ParameterMgr* getInstance(); diff --git a/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h b/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h index bd62a5e404cac..813667030c27a 100644 --- a/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h +++ b/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h @@ -25,8 +25,8 @@ class OpticalObject; class CocoaToDDLMgr { public: //---------- Constructors / Destructor - CocoaToDDLMgr(){}; - ~CocoaToDDLMgr(){}; + CocoaToDDLMgr() {} + ~CocoaToDDLMgr() {} static CocoaToDDLMgr* getInstance(); void writeDDDFile(ALIstring filename); diff --git a/Alignment/CocoaUtilities/interface/ALIFileIn.h b/Alignment/CocoaUtilities/interface/ALIFileIn.h index c39d748fc2b57..84b2c6f6bce0a 100644 --- a/Alignment/CocoaUtilities/interface/ALIFileIn.h +++ b/Alignment/CocoaUtilities/interface/ALIFileIn.h @@ -19,7 +19,7 @@ class ALIFileIn { public: - ALIFileIn(){}; + ALIFileIn() {} ~ALIFileIn() {} private: diff --git a/Alignment/CocoaUtilities/interface/ALIFileOut.h b/Alignment/CocoaUtilities/interface/ALIFileOut.h index 59d5b8944f18f..88e7d526f7340 100644 --- a/Alignment/CocoaUtilities/interface/ALIFileOut.h +++ b/Alignment/CocoaUtilities/interface/ALIFileOut.h @@ -20,9 +20,9 @@ class ALIFileOut : public std::ofstream { public: - ALIFileOut(){}; - ALIFileOut(const ALIstring& name) : std::ofstream(), theName(name){}; - ~ALIFileOut() override{}; + ALIFileOut() {} + ALIFileOut(const ALIstring& name) : std::ofstream(), theName(name) {} + ~ALIFileOut() override {} // get the instance of file with name filename static ALIFileOut& getInstance(const ALIstring& filename); diff --git a/Alignment/CocoaUtilities/interface/ALIUtils.h b/Alignment/CocoaUtilities/interface/ALIUtils.h index 5772049595d4b..8cba52fefe251 100644 --- a/Alignment/CocoaUtilities/interface/ALIUtils.h +++ b/Alignment/CocoaUtilities/interface/ALIUtils.h @@ -22,8 +22,8 @@ class ALIUtils { public: - ALIUtils(){}; - ~ALIUtils(){}; + ALIUtils() {} + ~ALIUtils() {} static int IsNumber(const ALIstring& str); static void dump3v(const CLHEP::Hep3Vector& vec, const std::string& msg); diff --git a/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h b/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h index 020c9ab862eae..0517f0eacb79f 100644 --- a/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h +++ b/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h @@ -17,11 +17,11 @@ class ALIFileIn; class GlobalOptionMgr { private: - GlobalOptionMgr(){}; + GlobalOptionMgr() {} public: //---------- Constructors / Destructor - ~GlobalOptionMgr(){}; + ~GlobalOptionMgr() {} static GlobalOptionMgr* getInstance(); public: diff --git a/Alignment/CommonAlignment/interface/Alignable.h b/Alignment/CommonAlignment/interface/Alignable.h index 3ded45fe5a925..0dd59f69c5e10 100644 --- a/Alignment/CommonAlignment/interface/Alignable.h +++ b/Alignment/CommonAlignment/interface/Alignable.h @@ -254,7 +254,7 @@ class Alignable { private: /// private default ctr. to enforce usage of the specialised ones - Alignable(){}; + Alignable() {} AlignmentParameters* theAlignmentParameters; diff --git a/Alignment/CommonAlignment/interface/AlignableComposite.h b/Alignment/CommonAlignment/interface/AlignableComposite.h index d770a66c73c82..ac2b24e2ee2ec 100644 --- a/Alignment/CommonAlignment/interface/AlignableComposite.h +++ b/Alignment/CommonAlignment/interface/AlignableComposite.h @@ -115,7 +115,7 @@ class AlignableComposite : public Alignable { private: /// default constructor hidden - AlignableComposite() : Alignable(0, RotationType()){}; + AlignableComposite() : Alignable(0, RotationType()) {} Alignables theComponents; // direct daughters }; diff --git a/Alignment/CommonAlignment/interface/AlignableMap.h b/Alignment/CommonAlignment/interface/AlignableMap.h index 2b070a93a615d..fa1b45c78562e 100644 --- a/Alignment/CommonAlignment/interface/AlignableMap.h +++ b/Alignment/CommonAlignment/interface/AlignableMap.h @@ -28,8 +28,8 @@ class AlignableMap { using Container = std::map; public: - AlignableMap(){}; - virtual ~AlignableMap(){}; + AlignableMap() {} + virtual ~AlignableMap() {} /// Get an object from map using its name. /// A new object is default-constructed if the name does not exist. diff --git a/Alignment/CommonAlignment/interface/AlignmentLevel.h b/Alignment/CommonAlignment/interface/AlignmentLevel.h index 3ed6cc5f6a920..c126230471b8f 100644 --- a/Alignment/CommonAlignment/interface/AlignmentLevel.h +++ b/Alignment/CommonAlignment/interface/AlignmentLevel.h @@ -10,7 +10,7 @@ class AlignmentLevel { //========================== PUBLIC METHODS ================================= public: //=================================================================== AlignmentLevel(align::StructureType levelType, unsigned int maxNumComponents, bool isFlat) - : levelType(levelType), maxNumComponents(maxNumComponents), isFlat(isFlat){}; + : levelType(levelType), maxNumComponents(maxNumComponents), isFlat(isFlat) {} // copy construction + assignment AlignmentLevel(const AlignmentLevel&) = default; AlignmentLevel& operator=(const AlignmentLevel&) = default; diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h index c7a243bb856a5..4d9dd6961c0ec 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h @@ -14,10 +14,10 @@ class AlignableDataIO { enum PosType { Abs, Org, Rel }; /// Constructor - AlignableDataIO(PosType p) : thePosType(p){}; + AlignableDataIO(PosType p) : thePosType(p) {} /// Destructor - virtual ~AlignableDataIO(){}; + virtual ~AlignableDataIO() {} /// Open IO handle virtual int open(const char* filename, int iteration, bool writemode) = 0; diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h index d0849fe78a119..872b08be88e14 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h @@ -112,10 +112,10 @@ class AlignmentAlgorithmBase { }; /// Constructor - AlignmentAlgorithmBase(const edm::ParameterSet &, const edm::ConsumesCollector &){}; + AlignmentAlgorithmBase(const edm::ParameterSet &, const edm::ConsumesCollector &) {} /// Destructor - virtual ~AlignmentAlgorithmBase(){}; + virtual ~AlignmentAlgorithmBase() {} /// Call at beginning of job (must be implemented in derived class) virtual void initialize(const edm::EventSetup &setup, @@ -161,16 +161,16 @@ class AlignmentAlgorithmBase { virtual void run(const edm::EventSetup &setup, const EventInfo &eventInfo) = 0; /// called at begin of run - virtual void beginRun(const edm::Run &, const edm::EventSetup &, bool changed){}; + virtual void beginRun(const edm::Run &, const edm::EventSetup &, bool changed) {} /// called at end of run - order of arguments like in EDProducer etc. - virtual void endRun(const EndRunInfo &runInfo, const edm::EventSetup &setup){}; + virtual void endRun(const EndRunInfo &runInfo, const edm::EventSetup &setup) {} /// called at begin of luminosity block (no lumi block info passed yet) - virtual void beginLuminosityBlock(const edm::EventSetup &setup){}; + virtual void beginLuminosityBlock(const edm::EventSetup &setup) {} /// called at end of luminosity block (no lumi block info passed yet) - virtual void endLuminosityBlock(const edm::EventSetup &setup){}; + virtual void endLuminosityBlock(const edm::EventSetup &setup) {} /// called in order to pass parameters to alignables for a specific run /// range in case the algorithm supports run range dependent alignment. diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h index fd52e6e3b2db3..372da591ecd08 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h @@ -45,7 +45,7 @@ class AlignmentParameterBuilder { const edm::ParameterSet &pSet); /// destructor - virtual ~AlignmentParameterBuilder(){}; + virtual ~AlignmentParameterBuilder() {} /// master initialisation method, PSet must have form as constructor wants it void addAllSelections(const edm::ParameterSet &pSet); diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h index 0732a12a3a3f0..5e68d38847c77 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h @@ -13,7 +13,7 @@ class AlignmentParametersIO { protected: - virtual ~AlignmentParametersIO(){}; + virtual ~AlignmentParametersIO() {} /// open IO virtual int open(const char* filename, int iteration, bool writemode) = 0; diff --git a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h index 20b8a61ab0700..126b7d0d6ee19 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h @@ -47,7 +47,7 @@ class IntegratedCalibrationBase { explicit IntegratedCalibrationBase(const edm::ParameterSet &cfg); /// Destructor - virtual ~IntegratedCalibrationBase(){}; + virtual ~IntegratedCalibrationBase() {} /// How many parameters does this calibration define? virtual unsigned int numParameters() const = 0; @@ -88,21 +88,21 @@ class IntegratedCalibrationBase { /// Call at beginning of job: /// default implementation is dummy, to be overwritten in derived class if useful. - virtual void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras){}; + virtual void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras) {} /// Call at beginning of run: /// default implementation is dummy, to be overwritten in derived class if useful. - virtual void beginRun(const edm::Run &, const edm::EventSetup &){}; + virtual void beginRun(const edm::Run &, const edm::EventSetup &) {} /// Called at beginning of a loop of the AlignmentProducer, /// to be used for iterative algorithms, default does nothing. /// FIXME: move call to algorithm? - virtual void startNewLoop(){}; + virtual void startNewLoop() {} /// Called at end of a loop of the AlignmentProducer, /// to be used for iterative algorithms, default does nothing. /// FIXME: move call to algorithm? - virtual void endOfLoop(){}; + virtual void endOfLoop() {} /// Called at end of a the job of the AlignmentProducer. /// Do here the necessary stuff with the results that should have been passed diff --git a/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h b/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h index cb955a6e410fb..b0ab14874879b 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h @@ -40,7 +40,7 @@ class TkModuleGroupSelector { const std::vector &sdets); /// Destructor - virtual ~TkModuleGroupSelector(){}; + virtual ~TkModuleGroupSelector() {} // Returns the number of parameters. unsigned int getNumberOfParameters() const; diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc b/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc index b1b7afe628f01..e5ef7c6e69c49 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc @@ -234,7 +234,7 @@ void ApeSettingAlgorithm::terminate(const edm::EventSetup &iSetup) { am[2][1] = rt.zy(); am[2][2] = rt.zz(); sm = sm.similarity(am); //symmetric matrix - } //transform to local + } //transform to local for (int j = 0; j < sm.num_row(); ++j) for (int k = 0; k <= j; ++k) apeSaveFile << " " << sm[j][k]; //always write full matrix diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc index c134984abf9f4..ef254391b61fe 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc @@ -41,7 +41,7 @@ #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "Geometry/GEMGeometry/interface/GEMGeometry.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc index d35477a8322cf..f80fb78e59b60 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc @@ -34,7 +34,7 @@ class AlignmentMonitorMuonResiduals : public AlignmentMonitorBase { public: AlignmentMonitorMuonResiduals(const edm::ParameterSet &cfg, edm::ConsumesCollector iC); - ~AlignmentMonitorMuonResiduals() override{}; + ~AlignmentMonitorMuonResiduals() override {} void book() override; void event(const edm::Event &iEvent, @@ -2012,7 +2012,7 @@ void AlignmentMonitorMuonResiduals::event(const edm::Event &iEvent, } // else if CSC } // end if good hit - } // end loop over measurements + } // end loop over measurements } // end loop over track-trajectories } @@ -2264,7 +2264,7 @@ void AlignmentMonitorMuonResiduals::afterAlignment() { m_xerronmean_me41->Fill(xerronmean); } } // else itis CSC - } // end if xmean, xstdev exist + } // end if xmean, xstdev exist if (m_numy[id] > 0.) { double ymean = m_y_wy[id] / m_y_w[id]; @@ -2458,7 +2458,7 @@ void AlignmentMonitorMuonResiduals::afterAlignment() { m_yerronmean_me41->Fill(yerronmean); } } // else itis CSC - } // end if ymean, ystdev exist + } // end if ymean, ystdev exist } // end loop over chambers } diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc index a7cfa99f7ea56..ce4703de884ed 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc @@ -276,7 +276,7 @@ void AlignmentMonitorMuonSystemMap1D::book() { } } } // endcaps - } // stations + } // stations m_counter_event = 0; m_counter_track = 0; @@ -322,7 +322,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent, processMuonResidualsFromTrack(muonResidualsFromTrack, iEvent); } } // end if track has acceptable momentum - } // end loop over tracks + } // end loop over tracks } else { const edm::Handle &muons = iEvent.getHandle(muonToken_); diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc index 4004983d9373a..0bc5dc043cdf7 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc @@ -221,7 +221,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent, builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.); processMuonResidualsFromTrack(muonResidualsFromTrack, traj); } // end if track pT is within range - } // end loop over tracks + } // end loop over tracks } else { const edm::Handle &muons = iEvent.getHandle(muonToken_); @@ -287,7 +287,7 @@ void AlignmentMonitorMuonVsCurvature::processMuonResidualsFromTrack(MuonResidual tprofile_wheel_st_sector[wheel][station][sector][kDeltaDxDz]->Fill(qoverpt, resid_dxdz); } } // if it's a good segment - } // if DT + } // if DT if (m_doCSC && chamberId->subdetId() == MuonSubdetId::CSC) { CSCDetId cscid(chamberId->rawId()); @@ -310,7 +310,7 @@ void AlignmentMonitorMuonVsCurvature::processMuonResidualsFromTrack(MuonResidual tprofile_st_ring_chamber[station][ring][chamber][kDeltaDxDz]->Fill(qoverpz, resid_dxdz); } } // if it's a good segment - } // if CSC + } // if CSC } // end loop over chamberIds } diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc index f3603dda2fbdf..9abd676356b8b 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc @@ -473,8 +473,8 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end other numhits - } // end this near other - } // end other is DT + } // end this near other + } // end other is DT // cross-system: other is CSC // only do it for DT stubs in W+-2 St1&2: @@ -516,8 +516,8 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end other is CSC - } // end loop over other - } // end if DT13 + } // end loop over other + } // end if DT13 // z-direction if (dt2 != nullptr && dt2->numHits() >= m_minDT2Hits && (dt2->chi2() / double(dt2->ndof())) < 2.0) { @@ -550,11 +550,11 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end other numhits - } // end this near other - } // end other is DT - } // end loop over other - } // end if DT2 - } // end if DT + } // end this near other + } // end other is DT + } // end loop over other + } // end if DT2 + } // end if DT // **************** CSC **************** else if (m_doCSC && chamberId->subdetId() == MuonSubdetId::CSC) { @@ -610,13 +610,13 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end of same ring&chamber - } // end other min numhits - } // end this near other - } // end other is CSC - } // end loop over other + } // end other min numhits + } // end this near other + } // end other is CSC + } // end loop over other } // end if this min numhits - } // end if CSC + } // end if CSC } // end loop over chamberIds } diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc index bb0cd79b49cec..06cbff3ec731f 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc @@ -28,8 +28,8 @@ class AlignmentMonitorTemplate : public AlignmentMonitorBase { public: AlignmentMonitorTemplate(const edm::ParameterSet& cfg, edm::ConsumesCollector iC) - : AlignmentMonitorBase(cfg, iC, "AlignmentMonitorTemplate"){}; - ~AlignmentMonitorTemplate() override{}; + : AlignmentMonitorBase(cfg, iC, "AlignmentMonitorTemplate") {} + ~AlignmentMonitorTemplate() override {} void book() override; void event(const edm::Event& iEvent, @@ -123,8 +123,8 @@ void AlignmentMonitorTemplate::event(const edm::Event& iEvent, search->second->Fill(tsosc.localPosition().x() - hit->localPosition().x()); } } // end if hit is valid - } // end loop over hits - } // end loop over tracks/trajectories + } // end loop over hits + } // end loop over tracks/trajectories } void AlignmentMonitorTemplate::afterAlignment() { diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc index e927cfdc9e747..5985da9f1745b 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc @@ -72,7 +72,7 @@ class AlignmentStats : public edm::one::EDAnalyzer { ~AlignmentStats() override = default; static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); - void beginRun(edm::Run const &, edm::EventSetup const &) override{}; + void beginRun(edm::Run const &, edm::EventSetup const &) override {} void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override; void endRun(edm::Run const &iRun, edm::EventSetup const &iSetup) override; void beginJob() override; diff --git a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h index d7009029e4376..06b2d9c85ef0f 100644 --- a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h +++ b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h @@ -56,7 +56,7 @@ class BowedSurfaceAlignmentParameters : public AlignmentParameters { const std::vector &selection); /// Destructor - ~BowedSurfaceAlignmentParameters() override{}; + ~BowedSurfaceAlignmentParameters() override {} void apply() override; int type() const override; diff --git a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h index b2ace06ddadb7..a48abd1efcfac 100644 --- a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h +++ b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h @@ -30,7 +30,7 @@ class CompositeAlignmentDerivativesExtractor { const std::vector &tsos); /// destructor - ~CompositeAlignmentDerivativesExtractor(void){}; + ~CompositeAlignmentDerivativesExtractor(void) {} const AlgebraicMatrix &derivatives(void) const { return theDerivatives; } const AlgebraicVector &correctionTerm(void) const { return theCorrectionTerm; } diff --git a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h index 32bb452429cd8..213f71e014a17 100644 --- a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h +++ b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h @@ -40,7 +40,7 @@ class RigidBodyAlignmentParameters : public AlignmentParameters { const std::vector &selection); /// Destructor - ~RigidBodyAlignmentParameters() override{}; + ~RigidBodyAlignmentParameters() override {} void apply() override; int type() const override; diff --git a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h index a3a6303936036..d435b23b349e1 100644 --- a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h +++ b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h @@ -25,23 +25,23 @@ class RigidBodyAlignmentParameters4D : public RigidBodyAlignmentParameters { /// parameters (no covariance) created from current (mis-)placement of /// alignable (if calcMis = true). RigidBodyAlignmentParameters4D(Alignable *alignable, bool calcMis) - : RigidBodyAlignmentParameters(alignable, calcMis){}; + : RigidBodyAlignmentParameters(alignable, calcMis) {} /// Constructor for full set of parameters RigidBodyAlignmentParameters4D(Alignable *alignable, const AlgebraicVector ¶meters, const AlgebraicSymMatrix &covMatrix) - : RigidBodyAlignmentParameters(alignable, parameters, covMatrix){}; + : RigidBodyAlignmentParameters(alignable, parameters, covMatrix) {} /// Constructor for selection RigidBodyAlignmentParameters4D(Alignable *alignable, const AlgebraicVector ¶meters, const AlgebraicSymMatrix &covMatrix, const std::vector &selection) - : RigidBodyAlignmentParameters(alignable, parameters, covMatrix, selection){}; + : RigidBodyAlignmentParameters(alignable, parameters, covMatrix, selection) {} /// Destructor - ~RigidBodyAlignmentParameters4D() override{}; + ~RigidBodyAlignmentParameters4D() override {} int type() const override; diff --git a/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h index 7859141491bf9..72f2ff9590fdf 100644 --- a/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h +++ b/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h @@ -84,7 +84,7 @@ class TwoBowedSurfacesAlignmentParameters : public AlignmentParameters { const std::vector &selection); /// Destructor - ~TwoBowedSurfacesAlignmentParameters() override{}; + ~TwoBowedSurfacesAlignmentParameters() override {} void apply() override; int type() const override; diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h index c3f8ec1660df5..10bc0bbad207f 100644 --- a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h +++ b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h @@ -55,7 +55,7 @@ #include "Geometry/DTGeometry/interface/DTGeometry.h" #include "Geometry/CSCGeometry/interface/CSCGeometry.h" #include "Geometry/GEMGeometry/interface/GEMGeometry.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc index 04e99668cc357..4366531e72e76 100644 --- a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc +++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc @@ -206,14 +206,14 @@ void AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm:: m_resid_after->Fill(residual); } } // end if residuals pass cut - } // end second loop over hits - } // end if filling histograms + } // end second loop over hits + } // end if filling histograms if (tracker_forwardredchi2 < m_maxTrackerForwardRedChi2 && tracker_dof >= m_minTrackerDOF && !has_bad_residual) { newTrajTrackMap->insert((*iPair).key, (*iPair).val); } // end if passes tracker cuts - } // end if passes pT cut - } // end loop over original trajTrackMap + } // end if passes pT cut + } // end loop over original trajTrackMap // put it in the Event iEvent.put(std::move(newTrajTrackMap)); diff --git a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml index 3c7f11b7dbec7..b2b0cbf78dc05 100644 --- a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml +++ b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml @@ -1,8 +1,9 @@ + + - @@ -45,11 +46,11 @@ - + diff --git a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc index 286141fe1e9ce..3ee7aeccf4a12 100644 --- a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc +++ b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc @@ -53,7 +53,6 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc index 6c5a325fdf700..1de9b85470c80 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc @@ -44,7 +44,7 @@ AlignmentCSCBeamHaloSelector::Tracks AlignmentCSCBeamHaloSelector::select(const } station_map[station]++; } // end if it's a CSC hit - } // end loop over hits + } // end loop over hits unsigned int stations = 0; for (std::map::const_iterator station_iter = station_map.begin(); diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc index a8edd189e46ee..97e9911a6d99c 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc @@ -103,7 +103,7 @@ AlignmentCSCOverlapSelector::Tracks AlignmentCSCOverlapSelector::select(const Tr } } // end if it's a CSC hit - } // end loop over hits + } // end loop over hits if ((m_station == 0 || m_station == -4) && (MEminus4_even >= m_minHitsPerChamber) && (MEminus4_odd >= m_minHitsPerChamber)) diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc index 545258e38ea53..a09f765c65f19 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc @@ -51,7 +51,7 @@ AlignmentCSCTrackSelector::Tracks AlignmentCSCTrackSelector::select(const Tracks hitsOnStationB++; } // end if CSC - } // end loop over hits + } // end loop over hits bool stationAokay; if (m_stationA == 0) diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc index 35b1b72f26acc..bce77755f2d26 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc @@ -710,7 +710,7 @@ AlignmentTrackSelector::Tracks AlignmentTrackSelector::checkPrescaledHits(const continue; } - } //end if hit in Strips + } //end if hit in Strips else { // test explicitely BPIX/FPIX const SiPixelRecHit* pixelhit = dynamic_cast(hit); if (pixelhit != nullptr) { diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc index 8acd0f017a60b..3c4f0a0706a4d 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc @@ -60,8 +60,8 @@ AlignmentTrackFromVertexCompositeCandidateSelector::Tracks AlignmentTrackFromVer LogDebug("AlignmentTrackFromVertexSelector") << "track index: " << indx << "filling result vector" << std::endl; result.push_back(&(*tk)); } // if a valid key is found - } // end loop over tracks - } // if the handle is valid + } // end loop over tracks + } // if the handle is valid LogDebug("AlignmentTrackFromVertexCompositeCandidateSelector") << "collection will have size: " << result.size() << std::endl; diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc index 76f42d997417b..4c77d64dccfbb 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc @@ -122,7 +122,7 @@ AlignmentTrackFromVertexSelector::Tracks AlignmentTrackFromVertexSelector::selec LogDebug("AlignmentTrackFromVertexSelector") << "track index: " << indx << "filling result vector" << std::endl; result.push_back(&(*tk)); } // if a valid key is found - } // end loop over tracks - } // if the handle is valid + } // end loop over tracks + } // if the handle is valid return result; } diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp index 7a802dc13ee3e..7eeb32fa6da32 100644 --- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp +++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp @@ -29,7 +29,7 @@ class GlobalPositionRcdWrite : public edm::one::EDAnalyzer<> { m_ecal(iConfig.getParameter("ecal")), m_hcal(iConfig.getParameter("hcal")), m_calo(iConfig.getParameter("calo")), - nEventCalls_(0){}; + nEventCalls_(0) {} ~GlobalPositionRcdWrite() {} virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); diff --git a/Alignment/Geners/interface/AbsArchive.hh b/Alignment/Geners/interface/AbsArchive.hh index 90939bc00ae38..0b3d0cfe3ab80 100644 --- a/Alignment/Geners/interface/AbsArchive.hh +++ b/Alignment/Geners/interface/AbsArchive.hh @@ -109,7 +109,7 @@ namespace gs { private: friend class AbsReference; - friend gs::AbsArchive & ::operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record); + friend gs::AbsArchive & ::operator<<(gs::AbsArchive & ar, const gs::AbsRecord & record); // Search for items which correspond to the given reference. // The "reference" works both as the input and as the output in diff --git a/Alignment/Geners/interface/AbsRecord.hh b/Alignment/Geners/interface/AbsRecord.hh index 05ecdfeff4f87..3ecb3edcfb535 100644 --- a/Alignment/Geners/interface/AbsRecord.hh +++ b/Alignment/Geners/interface/AbsRecord.hh @@ -31,7 +31,7 @@ namespace gs { : ItemDescriptor(classId, ioPrototype, name, category), itemId_(0), itemLength_(0) {} private: - friend gs::AbsArchive & ::operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record); + friend gs::AbsArchive & ::operator<<(gs::AbsArchive & ar, const gs::AbsRecord & record); // The following functions must be overriden by derived classes. // "writeData" should return "true" upon success. diff --git a/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h b/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h index eaa757e9202fe..b62ae3e41e59d 100644 --- a/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h +++ b/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h @@ -39,7 +39,7 @@ class HIPAlignmentAlgorithm : public AlignmentAlgorithmBase { HIPAlignmentAlgorithm(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC); /// Destructor - ~HIPAlignmentAlgorithm() override{}; + ~HIPAlignmentAlgorithm() override {} /// Call at beginning of job void initialize(const edm::EventSetup& setup, diff --git a/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h b/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h index ce1fd59c3e468..addfeda0b0221 100644 --- a/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h +++ b/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h @@ -35,7 +35,7 @@ class HIPUserVariables : public AlignmentUserVariables { alierr(other.alierr) {} /** destructor */ - ~HIPUserVariables() override{}; + ~HIPUserVariables() override {} /** clone method (copy constructor) */ HIPUserVariables* clone(void) const override { return new HIPUserVariables(*this); } diff --git a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc index 39c6612187990..2460a4c543f12 100644 --- a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc +++ b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc @@ -848,7 +848,7 @@ void HIPAlignmentAlgorithm::run(const edm::EventSetup& setup, const EventInfo& e << "ERROR in : Dynamic cast of Strip RecHit failed! " << "TypeId of the TTRH: " << className(*hit); } //end if type == SiStripRecHit2D - } //end if hit from strips + } //end if hit from strips else { const SiPixelRecHit* pixelhit = dynamic_cast(rechit); if (pixelhit) { @@ -1375,7 +1375,7 @@ void HIPAlignmentAlgorithm::collector(void) { } iuvar++; } // End loop over alignables - } // End loop over subjobs + } // End loop over subjobs } for (int ijob = 1; ijob <= theCollectorNJobs; ijob++) { diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.h b/Alignment/LaserAlignment/plugins/LaserAlignment.h index 8622cf61aaaf3..d0ae96154ca24 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.h +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.h @@ -45,7 +45,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" diff --git a/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc b/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc index 8afe573f21ccf..5aa17204f99b2 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc @@ -99,7 +99,7 @@ bool LaserAlignmentEventFilter::filter(edm::StreamID sid, edm::Event& iEvent, co } } } // channel loop - } // FED loop + } // FED loop // LogDebug("LaserAlignmentEventFilter") << det_ctr << " channels were tested for signal\n" // < { void beginJob() override; void beginRun(edm::Run const&, edm::EventSetup const&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; - void endRun(edm::Run const&, edm::EventSetup const&) override{}; + void endRun(edm::Run const&, edm::EventSetup const&) override {} void endJob() override; void fillDetectorId(void); diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc index 9c2765af9fb25..998ab7225a37a 100644 --- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc +++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc @@ -152,8 +152,8 @@ void LaserBeamsBarrel::GeneratePrimaries(G4Event *myEvent) { theParticleGun->GeneratePrimaryVertex(myEvent); } } // end looop over both beam directions - } // end looop over particles in beam - } // end loop over beams + } // end looop over particles in beam + } // end loop over beams } void LaserBeamsBarrel::setOptPhotonPolar(G4double Angle) { diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc index 54132dc5f26a7..aadfb0d604fbc 100644 --- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc +++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc @@ -154,9 +154,9 @@ void LaserBeamsTEC1::GeneratePrimaries(G4Event *myEvent) { theParticleGun->GeneratePrimaryVertex(myEvent); } } // end loop over both beam directions - } // end loop over particles in beam - } // end loop over beams - } // end loop over rings + } // end loop over particles in beam + } // end loop over beams + } // end loop over rings } void LaserBeamsTEC1::setOptPhotonPolar(G4double Angle) { diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc index 858a303d00c58..9182b1792e953 100644 --- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc +++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc @@ -154,9 +154,9 @@ void LaserBeamsTEC2::GeneratePrimaries(G4Event *myEvent) { theParticleGun->GeneratePrimaryVertex(myEvent); } } // end loop over both beam directions - } // end loop over particles in beam - } // end loop over beams - } // end loop over rings + } // end loop over particles in beam + } // end loop over beams + } // end loop over rings } void LaserBeamsTEC2::setOptPhotonPolar(G4double Angle) { diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc index 5d1740324b5f9..eec6bcd0f27cd 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc @@ -160,8 +160,8 @@ void MillePedeDQMModule ::dqmEndJob(DQMStore::IBooker& booker, DQMStore::IGetter } else { vetoStr = "N/A"; } // if the alignment exceeds the cutoffs - } // LG case - } // if the alignment was not stored + } // LG case + } // if the alignment was not stored exitCode->Fill(exitCodeStr); isVetoed->Fill(vetoStr); diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc index 1f45e948cae9f..6f9e25f424030 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc @@ -13,6 +13,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/Utilities/interface/TypeDemangler.h" #include "Alignment/CommonAlignment/interface/Alignable.h" #include "Alignment/CommonAlignment/interface/AlignmentParameters.h" @@ -151,7 +152,7 @@ bool PedeReader::readIfSameLine(std::ifstream &aStream, T &outValue) const { return true; } } // switch - } // while + } // while edm::LogError("Alignment") << "@SUB=PedeReader::readIfSameLine" << "Should never come here!"; @@ -206,9 +207,9 @@ Alignable *PedeReader::setParameter(unsigned int paramLabel, if (!userParams->isFixed(paramNum)) { userParams->preSigma()[paramNum] /= cmsToPede; if (bufLength == 2) { - edm::LogWarning("Alignment") - << "@SUB=PedeReader::setParameter" - << "Param " << paramLabel << " (from " << typeid(*alignable).name() << ") without result!"; + edm::LogWarning("Alignment") << "@SUB=PedeReader::setParameter" + << "Param " << paramLabel << " (from " + << edm::typeDemangle(typeid(*alignable).name()) << ") without result!"; userParams->isValid()[paramNum] = false; params->setValid(false); } diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc index 90ca15e3e623a..e07f4ca9de14f 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc @@ -528,7 +528,7 @@ void PedeSteerer::hierarchyConstraint(const Alignable *ali, } aConstr << "\n"; ++nParPerConstr; // OK, we used one. - } // end loop on params + } // end loop on params // if (nParPerConstr && nParPerConstr >= theMinHieraParPerConstr) { // Enough to make sense? @@ -585,9 +585,9 @@ unsigned int PedeSteerer::presigmas(const std::vector &cffPre } presigmas[iParam] = presigma; } // end if selected for presigma - } // end loop on params - } // end loop on alignables for given selection and presigma - } // end loop on PSets + } // end loop on params + } // end loop on alignables for given selection and presigma + } // end loop on PSets if (aliPresiMap.empty()) return 0; @@ -640,7 +640,7 @@ unsigned int PedeSteerer::presigmasFile(const std::string &fileName, ++nPresiParam; } // end loop on parameters for alignables with chosen presigmas - } // end loop on alignables + } // end loop on alignables delete filePtr; // close properly file return nPresiParam; diff --git a/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h b/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h index 07f503f6aec05..4bb61ded439ad 100644 --- a/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h +++ b/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h @@ -22,7 +22,7 @@ class MuonScenarioBuilder : public MisalignmentScenarioBuilder { explicit MuonScenarioBuilder(Alignable* alignable); /// Destructor - ~MuonScenarioBuilder() override{}; + ~MuonScenarioBuilder() override {} /// Apply misalignment scenario to the Muon void applyScenario(const edm::ParameterSet& scenario) override; diff --git a/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc b/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc index c9149d0728084..44f23bf6aaca9 100644 --- a/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc +++ b/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc @@ -853,8 +853,8 @@ void MuonGeometryArrange::compareGeometries(Alignable* refAli, Alignable* curAli TotalX += Rtotal; break; } // end of else - } // end of for on int i - } // end of for on ich + } // end of for on int i + } // end of for on ich // At this point we should have a total displacement and total L TotalX = TotalX / nUsed; @@ -1134,8 +1134,8 @@ bool MuonGeometryArrange::isMother(Alignable* ali) { for (int i = 0; i < size; i++) { if (checkChosen(aliComp[i])) return true; // A ring has CSC chambers - } // as subcomponents - return false; // 1'st layer of subcomponents weren't CSC chambers + } // as subcomponents + return false; // 1'st layer of subcomponents weren't CSC chambers } ////////////////////////////////////////////////// @@ -1190,8 +1190,8 @@ bool MuonGeometryArrange::passChosen(Alignable* ali) { for (int i = 0; i < size; i++) { if (checkChosen(aliComp[i])) return true; // A ring has CSC chambers - } // as subcomponents - return false; // 1'st layer of subcomponents weren't CSC chambers + } // as subcomponents + return false; // 1'st layer of subcomponents weren't CSC chambers } ////////////////////////////////////////////////// bool MuonGeometryArrange::passIdCut(uint32_t id) { diff --git a/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc b/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc index b0ed1e6e198a3..ed600bb60ed52 100644 --- a/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc +++ b/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc @@ -47,8 +47,8 @@ class MuonGeometryDBConverter : public edm::one::EDAnalyzer<> { ~MuonGeometryDBConverter() override; static void fillDescriptions(edm::ConfigurationDescriptions &); - void beginJob() override{}; - void endJob() override{}; + void beginJob() override {} + void endJob() override {} private: void analyze(const edm::Event &, const edm::EventSetup &) override; diff --git a/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc b/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc index ac3df3da5db19..57b1587025002 100644 --- a/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc +++ b/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc @@ -29,7 +29,7 @@ #include "Geometry/GEMGeometry/interface/GEMGeometry.h" #include "Alignment/MuonAlignment/interface/MuonScenarioBuilder.h" #include "Alignment/CommonAlignment/interface/Alignable.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include diff --git a/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc b/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc index cc403072d5b7d..777c875c62dfa 100644 --- a/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc +++ b/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc @@ -22,7 +22,7 @@ #include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h" #include "CondFormats/AlignmentRecord/interface/GEMAlignmentRcd.h" #include "CondFormats/AlignmentRecord/interface/GEMAlignmentErrorExtendedRcd.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "CondFormats/Alignment/interface/DetectorGlobalPosition.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Geometry/GEMGeometry/interface/GEMGeometry.h" diff --git a/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc b/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc index 1224b5de5219c..fed73e4c1677a 100644 --- a/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc +++ b/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc @@ -360,11 +360,11 @@ AlignableMuon *MuonAlignmentInputXML::newAlignableMuon() const { aliset[ali] = true; } // end if this node is an element - } // end loop over collection's children + } // end loop over collection's children alicollections[name] = aliset; } // end if this is a top-level collection - } // end loop over collections + } // end loop over collections for (unsigned int i = 0; i < operations->getLength(); i++) { DOMElement *operation = (DOMElement *)(operations->item(i)); @@ -415,7 +415,7 @@ AlignableMuon *MuonAlignmentInputXML::newAlignableMuon() const { } // anything else? assume it's a position/rotation directive } // end if node is node is an element - } // end first loop over operation's children + } // end first loop over operation's children // from now on, we only want to see position/rotation directives for (std::vector::const_iterator node = nodesToRemove.begin(); node != nodesToRemove.end(); ++node) { @@ -464,8 +464,8 @@ AlignableMuon *MuonAlignmentInputXML::newAlignableMuon() const { } } // end if node is an element - } // end second loop over operation's children - } // end loop over operations + } // end second loop over operation's children + } // end loop over operations delete parser; delete errHandler; @@ -586,10 +586,10 @@ Alignable *MuonAlignmentInputXML::getDTnode(align::StructureType structureType, } } // end if we need a layer number - } // end if we need a superlayer number - } // end if we need a sector number - } // end if we need a station number - } // end if we need a wheel number + } // end if we need a superlayer number + } // end if we need a sector number + } // end if we need a station number + } // end if we need a wheel number DTLayerId layerId(wheel, station, sector, superlayer, layer); rawId = layerId.rawId(); @@ -679,9 +679,9 @@ Alignable *MuonAlignmentInputXML::getCSCnode(align::StructureType structureType, } } // end if we need a layer number - } // end if we need a chamber number - } // end if we need a ring number - } // end if we need a station number + } // end if we need a chamber number + } // end if we need a ring number + } // end if we need a station number CSCDetId layerId(endcap, station, ring, chamber, layer); rawId = layerId.rawId(); @@ -716,8 +716,8 @@ Alignable *MuonAlignmentInputXML::getGEMnode(align::StructureType structureType, throw cms::Exception("XMLException") << "Value of \"rawId\" must be an integer" << std::endl; } } else { - int endcap, station, ring, superChamber, chamber; - endcap = station = ring = superChamber = chamber = 1; + int endcap, station, ring, superChamber; + endcap = station = ring = superChamber = 1; DOMAttr *node_endcap = node->getAttributeNode(str_endcap); if (node_endcap == nullptr) @@ -758,9 +758,9 @@ Alignable *MuonAlignmentInputXML::getGEMnode(align::StructureType structureType, } catch (const XMLException &toCatch) { throw cms::Exception("XMLException") << "Value of \"superChamber\" must be an integer" << std::endl; } - } // end if we need a chamber number - } // end if we need a ring number - } // end if we need a station number + } // end if we need a superchamber number + } // end if we need a ring number + } // end if we need a station number GEMDetId chamberId(endcap, ring, station, 0, superChamber, 0); rawId = chamberId.rawId(); diff --git a/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc b/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc index cdcdd656551a6..47ccb7a462be9 100644 --- a/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc +++ b/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc @@ -230,7 +230,7 @@ void MuonAlignmentOutputXML::writeComponents(align::Alignables &alignables, } } // end if not rawId - } // end if DT + } // end if DT if (doDet == doCSC) { // CSC if (m_rawIds && rawId != 0) { @@ -263,7 +263,7 @@ void MuonAlignmentOutputXML::writeComponents(align::Alignables &alignables, } } // end if not rawId - } // end if CSC + } // end if CSC if (doDet == doGEM) { // GEM if (m_rawIds && rawId != 0) { @@ -296,7 +296,7 @@ void MuonAlignmentOutputXML::writeComponents(align::Alignables &alignables, } } // end if not rawId - } // end if GEM + } // end if GEM align::PositionType pos = (*alignable)->globalPosition(); align::RotationType rot = (*alignable)->globalRotation(); diff --git a/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h b/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h index ab53d3e9e52fb..3cdb5f2cfe8f6 100644 --- a/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h +++ b/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h @@ -13,8 +13,8 @@ class CSCPairConstraint { public: - CSCPairConstraint(int i, int j, double value, double error) : m_i(i), m_j(j), m_value(value), m_error(error){}; - virtual ~CSCPairConstraint(){}; + CSCPairConstraint(int i, int j, double value, double error) : m_i(i), m_j(j), m_value(value), m_error(error) {} + virtual ~CSCPairConstraint() {} virtual int i() const { return m_i; }; virtual int j() const { return m_j; }; diff --git a/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h b/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h index 376f36ab22465..bc1b2917a4594 100644 --- a/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h +++ b/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h @@ -15,7 +15,7 @@ class MuonResidualsTwoBin { public: MuonResidualsTwoBin(bool twoBin, MuonResidualsFitter *pos, MuonResidualsFitter *neg) - : m_twoBin(twoBin), m_pos(pos), m_neg(neg){}; + : m_twoBin(twoBin), m_pos(pos), m_neg(neg) {} ~MuonResidualsTwoBin() { if (m_pos != nullptr) delete m_pos; diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h b/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h index 072ce9168d5b4..48162c3ff4f23 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h @@ -23,8 +23,8 @@ class CSCAlignmentCorrections { public: CSCAlignmentCorrections(std::string fitterName, double oldchi2, double newchi2) - : m_fitterName(fitterName), m_oldchi2(oldchi2), m_newchi2(newchi2){}; - virtual ~CSCAlignmentCorrections(){}; + : m_fitterName(fitterName), m_oldchi2(oldchi2), m_newchi2(newchi2) {} + virtual ~CSCAlignmentCorrections() {} void insertCorrection(std::string name, CSCDetId id, double value) { m_name.push_back(name); diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h b/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h index b5d6bab7a4a06..673508d3778a3 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h @@ -24,7 +24,7 @@ class CSCChamberFitter { public: CSCChamberFitter(const edm::ParameterSet &iConfig, std::vector &residualsConstraints); - virtual ~CSCChamberFitter(){}; + virtual ~CSCChamberFitter() {} bool fit(std::vector &corrections) const; void radiusCorrection(AlignableNavigator *alignableNavigator, diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc index 183cc137acbd1..5cd1c881e6193 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc @@ -160,7 +160,7 @@ void CSCOverlapsTrackPreparation::produce(edm::Event& iEvent, const edm::EventSe TSOSes.push_back( TrajectoryStateOnSurface(localTrajectoryParameters, localTrajectoryError, layerSurface, &*magneticField)); } // end if CSC - } // end loop over hits + } // end loop over hits assert(clonedHits.size() == transHits.size()); assert(transHits.size() == TSOSes.size()); @@ -186,7 +186,7 @@ void CSCOverlapsTrackPreparation::produce(edm::Event& iEvent, const edm::EventSe reference_map[trajCounter] = trackCounter; } // end if there are any clonedHits/TSOSes to work with - } // end loop over tracks + } // end loop over tracks unsigned int numTrajectories = trajectoryCollection->size(); diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc index df460fa3d9ad9..8536003c60c79 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc @@ -558,7 +558,7 @@ bool CSCPairResidualsConstraint::dphidzFromTrack(const std::vectorGet( Form("jetHTAnalyzer/%s_%s", iovNames.at(iIov).Data(), histogramName[iHistogramType].Data())); } // if for drawing histogram - } // histogram type loop + } // histogram type loop for (int iProfileType = 0; iProfileType < knProfileTypes; iProfileType++) { if (drawProfile[iProfileType] || (drawTrend[kDzErrorTrend] && iProfileType == kDzErrorVsPtWide) || (drawTrend[kDxyErrorTrend] && iProfileType == kDxyErrorVsPtWide)) { jetHtProfiles[iFile][iProfileType][iIov] = (TProfile *)inputFile[iFile]->Get( Form("jetHTAnalyzer/%s_%s", iovNames.at(iIov).Data(), profileName[iProfileType].Data())); } // if for drawing profile - } // profile type loop - } // iov loop for reading histograms from file - } // Regular histogram loading - } // Loop over files + } // profile type loop + } // iov loop for reading histograms from file + } // Regular histogram loading + } // Loop over files // Collect the information for the trend graphs const int nRuns = iovVector.size() - 1; @@ -819,8 +819,8 @@ void jetHtPlotter(std::string configurationFileName) { } } // Wide pT bin loop - } // File loop - } // If for drawing trends + } // File loop + } // If for drawing trends // =============================================== // Draw the plots @@ -924,7 +924,7 @@ void jetHtPlotter(std::string configurationFileName) { << Form("%s_%s", iovNames.at(iIov).Data(), histogramName[iHistogramType].Data()) << std::endl; } } // if for drawing histogram - } // histogram type loop + } // histogram type loop } // Draw dz and dxy profiles @@ -1142,7 +1142,7 @@ void jetHtPlotter(std::string configurationFileName) { } } // iov loop for drawing - } // if for drawing profiles for each IOV + } // if for drawing profiles for each IOV // First, setup the legends for the all runs plots doNotDrawEta = (!drawCentralEtaSummaryProfile || iProfileType == kDxyErrorVsEta || iProfileType == kDzErrorVsEta); @@ -1242,7 +1242,7 @@ void jetHtPlotter(std::string configurationFileName) { gPad->GetCanvas()->SaveAs(Form("output/%s%s_allIovs.pdf", profileName[iProfileType].Data(), saveComment)); } } // if for drawing profile - } // profile type loop + } // profile type loop // Close the output file if (makeIovListForSlides) @@ -1345,7 +1345,7 @@ void jetHtPlotter(std::string configurationFileName) { } } // Wide pT loop - } // Trend type loop + } // Trend type loop } /* diff --git a/Alignment/OfflineValidation/interface/TrackerValidationVariables.h b/Alignment/OfflineValidation/interface/TrackerValidationVariables.h index d26430a681181..1c426baa791fa 100644 --- a/Alignment/OfflineValidation/interface/TrackerValidationVariables.h +++ b/Alignment/OfflineValidation/interface/TrackerValidationVariables.h @@ -86,7 +86,7 @@ class TrackerValidationVariables { dz(-999.), charge(-999), numberOfValidHits(0), - numberOfLostHits(0){}; + numberOfLostHits(0) {} float p; float pt; float ptError; diff --git a/Alignment/OfflineValidation/interface/pvTree.h b/Alignment/OfflineValidation/interface/pvTree.h index 5d9b7fdcc410a..d1f4b58557ca6 100644 --- a/Alignment/OfflineValidation/interface/pvTree.h +++ b/Alignment/OfflineValidation/interface/pvTree.h @@ -45,8 +45,8 @@ class pvCand { float minW_subVtx1; float minW_subVtx2; - pvCand(){}; - virtual ~pvCand(){}; + pvCand() {} + virtual ~pvCand() {} ClassDef(pvCand, 1) }; @@ -61,8 +61,8 @@ class pvEvent { std::vector pvs; - pvEvent(){}; - virtual ~pvEvent(){}; + pvEvent() {} + virtual ~pvEvent() {} ClassDef(pvEvent, 1) }; diff --git a/Alignment/OfflineValidation/macros/FitPVResiduals.C b/Alignment/OfflineValidation/macros/FitPVResiduals.C index 04fe43f26e13a..3b7221559b482 100644 --- a/Alignment/OfflineValidation/macros/FitPVResiduals.C +++ b/Alignment/OfflineValidation/macros/FitPVResiduals.C @@ -3669,8 +3669,8 @@ void FillMap(TH2F *trendMap, std::cout << "FitPVResiduals::FillMap() " << fitPar_ << " unknown estimator!" << std::endl; break; } // closes the switch statement - } // closes loop on eta bins - } // cloeses loop on phi bins + } // closes loop on eta bins + } // cloeses loop on phi bins } /*--------------------------------------------------------------------*/ diff --git a/Alignment/OfflineValidation/plugins/BuildFile.xml b/Alignment/OfflineValidation/plugins/BuildFile.xml index ba723ca66815f..89382be76225d 100644 --- a/Alignment/OfflineValidation/plugins/BuildFile.xml +++ b/Alignment/OfflineValidation/plugins/BuildFile.xml @@ -34,7 +34,6 @@ - diff --git a/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc b/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc index 5a2ed8122a40d..7803017416be7 100644 --- a/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc +++ b/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc @@ -108,7 +108,7 @@ class EopElecTreeWriter : public edm::one::EDAnalyzer bool checkBinOrdering(std::array& bins); diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc index c47c9fe820f8a..e51942d1628e5 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc @@ -28,7 +28,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "Alignment/CommonAlignment/interface/Utilities.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" #include "Alignment/CommonAlignment/interface/Alignable.h" diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc index 5e66e54b9ddeb..1dd1d5a2e3b58 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryIntoNtuples.cc @@ -57,7 +57,7 @@ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "Alignment/CommonAlignment/interface/Alignable.h" diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc index cd4a3b60d0cda..57c058bf15de6 100644 --- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc +++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc @@ -1394,7 +1394,7 @@ void TrackerOfflineValidation::analyze(const edm::Event& iEvent, const edm::Even } } // finish loop over hit quantities - } // finish loop over track quantities + } // finish loop over track quantities if (useOverflowForRMS_) TH1::StatOverflows(kFALSE); diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc index c723981544efb..23f4f86a0e7e3 100644 --- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc +++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc @@ -98,7 +98,7 @@ class TrackerOfflineValidationSummary : public edm::one::EDAnalyzerFill(); } // end of loop on muons - } // end of loop for tracking particle - } // end of loop for efficiency + } // end of loop for tracking particle + } // end of loop for efficiency // // Fake Rate diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/defaultInputFiles_cff.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/defaultInputFiles_cff.py index 77c2975d2f1ba..7ec31ae8b2e6a 100644 --- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/defaultInputFiles_cff.py +++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/defaultInputFiles_cff.py @@ -23,11 +23,11 @@ filesDefaultMC_DoubleMuonPUPhase_string = '/store/mc/Phase2Fall22DRMiniAOD/DYJetsToMuMu_M-50_TuneCP5_14TeV-madgraphMLM-pythia8/ALCARECO/TkAlZMuMu-PU200ALCA_TkAlPU200_125X_mcRun4_realistic_v5-v1/60000/9382696c-70fd-4b37-8a0f-24bd02aeda5f.root' filesDefaultMC_MinBiasPUPhase2RECO = cms.untracked.vstring( - '/store/relval/CMSSW_12_5_3/RelValMinBias_14TeV/GEN-SIM-RECO/125X_mcRun4_realistic_v5_2026D88PU-v1/2590000/22e22ae6-a353-4f2e-815e-cc5efee37af9.root', + '/store/relval/CMSSW_14_1_0_pre6/RelValMinBias_14TeV/GEN-SIM-RECO/PU_141X_mcRun4_realistic_v1_STD_2026D110_PU-v3/2560000/c22f1cbd-50e3-458e-aba9-b0a327e4c971.root' ) filesDefaultMC_TTbarPhase2RECO = cms.untracked.vstring( - '/store/relval/CMSSW_12_6_0_pre5/RelValTTbar_14TeV/GEN-SIM-RECO/125X_mcRun4_realistic_v5_2026D88noPU-v1/2590000/57cbe250-487d-4a47-998b-48f9028a0058.root', + '/store/relval/CMSSW_14_1_0_pre5/RelValTTbar_14TeV/GEN-SIM-RECO/140X_mcRun4_realistic_v4_STD_2026D110_noPU-v1/2580000/b8c9ef5e-9c45-4c47-aae3-4db1304cd66e.root', ) filesDefaultData_JetHTRun2018D = cms.untracked.vstring( diff --git a/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc b/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc index 36df70af29971..736104890eb2c 100644 --- a/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc +++ b/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc @@ -742,7 +742,7 @@ void GeometryComparisonPlotter::MakePlots( // printing will be performed after customisation (e.g. legend or title) just after the loops on ix and iy } } // end of loop on y - } // end of loop on x + } // end of loop on x // CUSTOMISATION gStyle->SetOptTitle(0); // otherwise, the title is repeated in every pad of the global canvases @@ -1066,7 +1066,7 @@ void GeometryComparisonPlotter::MakePlots( } } // end of loop on y - } // end of loop on x + } // end of loop on x // CUSTOMISATION gStyle->SetOptTitle(0); // otherwise, the title is repeated in every pad of the global canvases diff --git a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc index 3e25890a0cad9..4eb8b6cd2247b 100644 --- a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc +++ b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc @@ -427,8 +427,7 @@ void TrackerValidationVariables::fillHitQuantities(const Trajectory* trajectory, void TrackerValidationVariables::fillTrackQuantities(const edm::Event& event, const edm::EventSetup& eventSetup, std::vector& v_avtrackout) { - fillTrackQuantities( - event, eventSetup, [](const reco::Track&) -> bool { return true; }, v_avtrackout); + fillTrackQuantities(event, eventSetup, [](const reco::Track&) -> bool { return true; }, v_avtrackout); } void TrackerValidationVariables::fillTrackQuantities(const edm::Event& event, diff --git a/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py b/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py index d4ef8bc13880c..e48edb0716234 100644 --- a/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py +++ b/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py @@ -33,12 +33,17 @@ class RefitType(Enum): _theRefitter = RefitType.COMMON # RefitType.STANDARD (other option not involving filtering) _theTrackCollection = 'generalTracks' # FIXME: 'ALCARECOTkAlMinBias' once a sample is available +################################################################### +# Set default phase-2 settings +################################################################### +import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings +_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION) + ################################################################### # Set the era ################################################################### if(options.isPhase2): - from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 - process = cms.Process("Demo",Phase2C17I13M9) + process = cms.Process("Demo", _PH2_ERA) else: from Configuration.Eras.Era_Run3_cff import Run3 process = cms.Process("Demo", Run3) @@ -104,7 +109,7 @@ class RefitType(Enum): # Standard loads ################################################################### if(options.isPhase2): - process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') + process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') else: process.load("Configuration.Geometry.GeometryRecoDB_cff") @@ -118,7 +123,7 @@ class RefitType(Enum): #################################################################### process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, ('auto:phase2_realistic_T21' if options.isPhase2 else 'auto:phase1_2022_realistic'), '') +process.GlobalTag = GlobalTag(process.GlobalTag, (_PH2_GLOBAL_TAG if options.isPhase2 else 'auto:phase1_2022_realistic'), '') if _allFromGT: print("############ testPVValidation_cfg.py: msg%-i: All is taken from GT") diff --git a/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py b/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py index 1c9a437574dc1..3de1193b30170 100644 --- a/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py +++ b/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py @@ -81,7 +81,7 @@ class RefitType(Enum): # Standard loads ################################################################### #process.load("Configuration.Geometry.GeometryRecoDB_cff") -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') #################################################################### # Get the BeamSpot diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h b/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h index 8e6fa74672304..2c2df308bf8f5 100644 --- a/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h +++ b/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h @@ -28,7 +28,7 @@ class SurveyPxbDicer { typedef std::pair idPair_t; // Constructors - SurveyPxbDicer(){}; + SurveyPxbDicer() {} // Constructor from VPSet SurveyPxbDicer(const std::vector &pars, unsigned int seed); diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h b/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h index 6023b2afa8be1..8164bd1627e7f 100644 --- a/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h +++ b/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h @@ -18,7 +18,7 @@ class SurveyPxbImageReader { // Constructors //! Empty default constructor - SurveyPxbImageReader(){}; + SurveyPxbImageReader() {} //! Constructor with ifstream and destination vector SurveyPxbImageReader(std::ifstream &infile, measurements_t &measurements, SurveyPxbImage::count_t reserve = 800) { read(infile, measurements, reserve); diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc index c46ff1a6fc27f..7d7f31dc56a99 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc @@ -12,7 +12,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "CLHEP/Random/RandGauss.h" CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg) diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h index 2ff4c50668976..47151a1d3652e 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h @@ -32,7 +32,7 @@ class SurveyDataConverter : public edm::one::EDAnalyzer<> { public: explicit SurveyDataConverter(const edm::ParameterSet& iConfig); void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - void endJob() override{}; + void endJob() override {} private: static const int NFILES = 2; diff --git a/Alignment/TrackerAlignment/interface/AlignableTracker.h b/Alignment/TrackerAlignment/interface/AlignableTracker.h index 60f09ff991a3f..209fcc64eb643 100644 --- a/Alignment/TrackerAlignment/interface/AlignableTracker.h +++ b/Alignment/TrackerAlignment/interface/AlignableTracker.h @@ -20,7 +20,7 @@ class AlignableTracker : public AlignableComposite { public: AlignableTracker(const TrackerGeometry*, const TrackerTopology*); - ~AlignableTracker() override{/* TODO: delete all tracker-alignables? */}; + ~AlignableTracker() override { /* TODO: delete all tracker-alignables? */ } /// Return alignables of subdet and hierarchy level determined by name /// as defined in tracker part of Alignment/CommonAlignment/StructureType.h diff --git a/Alignment/TrackerAlignment/interface/TrackerNameSpace.h b/Alignment/TrackerAlignment/interface/TrackerNameSpace.h index 707caac0396d0..037bd0902d627 100644 --- a/Alignment/TrackerAlignment/interface/TrackerNameSpace.h +++ b/Alignment/TrackerAlignment/interface/TrackerNameSpace.h @@ -266,5 +266,5 @@ namespace align { TID tid_; TEC tec_; }; -}; // namespace align +}; // namespace align #endif /* Alignment_TrackerAlignment_TrackerNameSpace_H */ diff --git a/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h b/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h index b9c2e50048b00..5a9e16cc51bcd 100644 --- a/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h +++ b/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h @@ -27,7 +27,7 @@ class TrackerScenarioBuilder : public MisalignmentScenarioBuilder { explicit TrackerScenarioBuilder(AlignableTracker* alignable); /// Destructor - ~TrackerScenarioBuilder() override{}; + ~TrackerScenarioBuilder() override {} /// Apply misalignment scenario to the tracker void applyScenario(const edm::ParameterSet& scenario) override; diff --git a/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc b/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc index d8dd16dc02325..e90407ed1d0cf 100644 --- a/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc +++ b/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc @@ -235,7 +235,7 @@ void AlignmentPrescaler::produce(edm::Event& iEvent, const edm::EventSetup& iSet } ntakenhits++; } //end if take this hit - } //end loop on RecHits + } //end loop on RecHits trackflags[ittrk - Tracks->begin()] = ntakenhits; } //end loop on tracks diff --git a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc index 2831c514fc19f..f5bde3c156f65 100644 --- a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc +++ b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc @@ -12,7 +12,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc b/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc index c0386fec19d4e..4c554dbba6ba0 100644 --- a/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc +++ b/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc @@ -209,7 +209,7 @@ void TkAlCaOverlapTagger::produce(edm::Event& iEvent, const edm::EventSetup& iSe << className(*hit); } - } //end if hit in Strips + } //end if hit in Strips else { //pixel hit const SiPixelRecHit* transpixelhit = dynamic_cast(hit); if (transpixelhit != nullptr) { @@ -237,7 +237,7 @@ void TkAlCaOverlapTagger::produce(edm::Event& iEvent, const edm::EventSetup& iSe break; } } //end second loop on TM - } //end if a previous TM exists + } //end if a previous TM exists previousTM = &(*itTrajMeas); previousId = detid; diff --git a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc index e3fb15766730f..e80ec57139e91 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc @@ -25,7 +25,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CommonTopologies/interface/GeometryAligner.h" +#include "Geometry/GeometryAligner/interface/GeometryAligner.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/PTrackerParametersRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc index ad2bbbc8aceac..c3f71f06d32ef 100644 --- a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc +++ b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc @@ -247,7 +247,7 @@ void AlignableTrackerBuilder ::buildStripDetectorAlignable( buildPixelDetectorAlignable(geomDet, subdetId, aliDets, aliDetUnits, update); } } // no else: glued components of AlignableDet constructed within - // AlignableSiStripDet -> AlignableDet, see above + // AlignableSiStripDet -> AlignableDet, see above } //_____________________________________________________________________________ @@ -293,7 +293,7 @@ void AlignableTrackerBuilder ::buildOuterTrackerDetectorAlignable( } numDetUnits += nAddedUnits; } // no else: stacked components of AlignableDet constructed within - // AlignableStackDet -> AlignableDet, see above + // AlignableStackDet -> AlignableDet, see above } //_____________________________________________________________________________ diff --git a/Alignment/TrackerAlignment/test/BuildFile.xml b/Alignment/TrackerAlignment/test/BuildFile.xml index 9970bae1b9fa0..f7b33b10889bb 100644 --- a/Alignment/TrackerAlignment/test/BuildFile.xml +++ b/Alignment/TrackerAlignment/test/BuildFile.xml @@ -27,3 +27,4 @@ + diff --git a/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py b/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py index a43aeacdda74c..e73a48ca19a59 100644 --- a/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py +++ b/Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py @@ -3,7 +3,9 @@ import FWCore.ParameterSet.VarParsing as VarParsing import copy, sys, os -process = cms.Process("Misaligner") +import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings +GLOBAL_TAG, ERA = _settings.get_era_and_conditions("2026D107") # this should really be _settings.DEFAULT_VERSION :( +process = cms.Process("Misaligner", ERA) ################################################################### # Setup 'standard' options @@ -46,7 +48,7 @@ ################################################################### # Ideal geometry producer and standard includes ################################################################### -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D107Reco_cff') process.trackerGeometry.applyAlignment = True ################################################################### @@ -54,7 +56,8 @@ ################################################################### process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') # using realistic Phase 2 geom +#process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T25', '') # using realistic Phase 2 geom +process.GlobalTag = GlobalTag(process.GlobalTag, GLOBAL_TAG, '') # using realistic Phase 2 geom print("Using global tag:", process.GlobalTag.globaltag.value()) ################################################################### diff --git a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h index 07f3e67c0c5bb..92d5b9ec4c847 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h @@ -35,11 +35,11 @@ class TrackerGeometryAnalyzer : public edm::one::EDAnalyzer //========================== PUBLIC METHODS ================================= public: //=================================================================== TrackerGeometryAnalyzer(const edm::ParameterSet&); - virtual ~TrackerGeometryAnalyzer(){}; + virtual ~TrackerGeometryAnalyzer() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&) override{}; - virtual void endRun(const edm::Run&, const edm::EventSetup&) override{}; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override {} + virtual void endRun(const edm::Run&, const edm::EventSetup&) override {} //========================= PRIVATE METHODS ================================= private: //================================================================== diff --git a/Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py b/Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py new file mode 100644 index 0000000000000..4269f37f9575c --- /dev/null +++ b/Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py @@ -0,0 +1,72 @@ +from __future__ import print_function +import FWCore.ParameterSet.Config as cms +import FWCore.ParameterSet.VarParsing as VarParsing + +import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings +################################################################### +# Setup 'standard' options +################################################################### +options = VarParsing.VarParsing() +options.register('Scenario', + _settings.DEFAULT_VERSION, # default value + VarParsing.VarParsing.multiplicity.singleton, # singleton or list + VarParsing.VarParsing.varType.string, # string, int, or float + "geometry version to use") +options.parseArguments() + +################################################################### +# get Global Tag and ERA +################################################################### +GLOBAL_TAG, ERA = _settings.get_era_and_conditions(options.Scenario) +process = cms.Process("Alignment", ERA) + +process.load("Configuration.StandardSequences.MagneticField_cff") # B-field map +if(options.Scenario == _settings.DEFAULT_VERSION): + print("Loading default scenario: ", _settings.DEFAULT_VERSION) + process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') +else: + process.load('Configuration.Geometry.GeometryExtended'+options.Scenario+'Reco_cff') +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") # Global tag + + +################################################################################ +# parameters to configure: +from Configuration.AlCa.GlobalTag import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag,GLOBAL_TAG) + +process.load("Alignment.TrackerAlignment.createIdealTkAlRecords_cfi") +process.createIdealTkAlRecords.alignToGlobalTag = False +################################################################################ + +usedGlobalTag = process.GlobalTag.globaltag.value() +print("Using Global Tag:", usedGlobalTag) + +from CondCore.CondDB.CondDB_cfi import * +process.PoolDBOutputService = cms.Service("PoolDBOutputService", + CondDB, + timetype = cms.untracked.string("runnumber"), + toPut = cms.VPSet( + cms.PSet( + record = cms.string("TrackerAlignmentRcd"), + tag = cms.string("Alignments") + ), + cms.PSet( + record = cms.string("TrackerAlignmentErrorExtendedRcd"), + tag = cms.string("AlignmentErrorsExtended") + ), + cms.PSet( + record = cms.string("TrackerSurfaceDeformationRcd"), + tag = cms.string("AlignmentSurfaceDeformations") + ), + ) +) +process.PoolDBOutputService.connect = \ + ("sqlite_file:tracker_alignment_payloads_"+ + options.Scenario+("_reference.db" + if process.createIdealTkAlRecords.createReferenceRcd + else "_fromIdealGeometry.db")) + +process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1)) +process.source = cms.Source("EmptySource") + +process.p = cms.Path(process.createIdealTkAlRecords) diff --git a/Alignment/TrackerAlignment/test/testCreateReferenceRecords.sh b/Alignment/TrackerAlignment/test/testCreateReferenceRecords.sh new file mode 100755 index 0000000000000..7b896fc5f94a0 --- /dev/null +++ b/Alignment/TrackerAlignment/test/testCreateReferenceRecords.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +function die { echo $1: status $2 ; exit $2; } +for test in $(ls $SCRAM_TEST_PATH | grep createTrackerAlignmentRcds); do + echo -e "\n\nrunning unit test: " ${test} + cmsRun $SCRAM_TEST_PATH/${test} || die "Failure running ${test}" $? +done diff --git a/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducer.cc b/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducer.cc index fe9a1917484f1..883249ecdcec1 100644 --- a/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducer.cc +++ b/AnalysisAlgos/TrackInfoProducer/src/TrackInfoProducer.cc @@ -33,7 +33,7 @@ class TrackInfoProducer : public edm::stream::EDProducer<> { public: explicit TrackInfoProducer(const edm::ParameterSet& iConfig); - ~TrackInfoProducer() override{}; + ~TrackInfoProducer() override {} void produce(edm::Event&, const edm::EventSetup&) override; diff --git a/AnalysisDataFormats/SUSYBSMObjects/interface/MuonSegment.h b/AnalysisDataFormats/SUSYBSMObjects/interface/MuonSegment.h index f8bf9dd643c20..79f29f6fcec93 100644 --- a/AnalysisDataFormats/SUSYBSMObjects/interface/MuonSegment.h +++ b/AnalysisDataFormats/SUSYBSMObjects/interface/MuonSegment.h @@ -12,7 +12,7 @@ namespace susybsm { class MuonSegment { public: - MuonSegment(){}; + MuonSegment() {} //bool isDT() const { return DT;} //bool isCSC() const { return CSC;} diff --git a/AnalysisDataFormats/TopObjects/interface/TopGenEvent.h b/AnalysisDataFormats/TopObjects/interface/TopGenEvent.h index 9e2da8b48b810..8565b7f05ad46 100644 --- a/AnalysisDataFormats/TopObjects/interface/TopGenEvent.h +++ b/AnalysisDataFormats/TopObjects/interface/TopGenEvent.h @@ -40,11 +40,11 @@ namespace WDecay { class TopGenEvent { public: /// empty constructor - TopGenEvent(){}; + TopGenEvent() {} /// default constructor TopGenEvent(reco::GenParticleRefProd& decaySubset, reco::GenParticleRefProd& iniSubset); /// default destructor - virtual ~TopGenEvent(){}; + virtual ~TopGenEvent() {} /// return particles of decay chain const reco::GenParticleCollection& particles() const { return *parts_; } diff --git a/AnalysisDataFormats/TopObjects/interface/TtEvent.h b/AnalysisDataFormats/TopObjects/interface/TtEvent.h index a460c142953d4..762a71c5e793f 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtEvent.h +++ b/AnalysisDataFormats/TopObjects/interface/TtEvent.h @@ -48,9 +48,9 @@ class TtEvent { public: /// empty constructor - TtEvent(){}; + TtEvent() {} /// default destructor - virtual ~TtEvent(){}; + virtual ~TtEvent() {} /// get leptonic decay channels std::pair lepDecays() const { return lepDecays_; } diff --git a/AnalysisDataFormats/TopObjects/interface/TtFullHadronicEvent.h b/AnalysisDataFormats/TopObjects/interface/TtFullHadronicEvent.h index 8b20674e0e813..41cce06e91723 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtFullHadronicEvent.h +++ b/AnalysisDataFormats/TopObjects/interface/TtFullHadronicEvent.h @@ -25,9 +25,9 @@ namespace TtFullHadDaughter { class TtFullHadronicEvent : public TtEvent { public: /// empty constructor - TtFullHadronicEvent(){}; + TtFullHadronicEvent() {} /// default destructor - ~TtFullHadronicEvent() override{}; + ~TtFullHadronicEvent() override {} /// get top of the given hypothesis const reco::Candidate* top(const std::string& key, const unsigned& cmb = 0) const { diff --git a/AnalysisDataFormats/TopObjects/interface/TtFullLeptonicEvent.h b/AnalysisDataFormats/TopObjects/interface/TtFullLeptonicEvent.h index 96c22f9c204ea..d101acd26ff2e 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtFullLeptonicEvent.h +++ b/AnalysisDataFormats/TopObjects/interface/TtFullLeptonicEvent.h @@ -24,9 +24,9 @@ namespace TtFullLepDaughter { class TtFullLeptonicEvent : public TtEvent { public: /// empty constructor - TtFullLeptonicEvent(){}; + TtFullLeptonicEvent() {} /// default destructor - ~TtFullLeptonicEvent() override{}; + ~TtFullLeptonicEvent() override {} /// get top of the given hypothesis const reco::Candidate* top(const std::string& key, const unsigned& cmb = 0) const { diff --git a/AnalysisDataFormats/TopObjects/interface/TtGenEvent.h b/AnalysisDataFormats/TopObjects/interface/TtGenEvent.h index e2d39b16eea25..9810bbd8f02b8 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtGenEvent.h +++ b/AnalysisDataFormats/TopObjects/interface/TtGenEvent.h @@ -18,11 +18,11 @@ class TtGenEvent : public TopGenEvent { public: /// empty constructor - TtGenEvent(){}; + TtGenEvent() {} /// default constructor from decaySubset and initSubset TtGenEvent(reco::GenParticleRefProd& decaySubset, reco::GenParticleRefProd& initSubset); /// default destructor - ~TtGenEvent() override{}; + ~TtGenEvent() override {} /// check if the event can be classified as ttbar bool isTtBar() const { return (top() && topBar()); } diff --git a/AnalysisDataFormats/TopObjects/interface/TtSemiLeptonicEvent.h b/AnalysisDataFormats/TopObjects/interface/TtSemiLeptonicEvent.h index c91c134694797..8842e34b8e10a 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtSemiLeptonicEvent.h +++ b/AnalysisDataFormats/TopObjects/interface/TtSemiLeptonicEvent.h @@ -24,9 +24,9 @@ namespace TtSemiLepDaughter { class TtSemiLeptonicEvent : public TtEvent { public: /// empty constructor - TtSemiLeptonicEvent(){}; + TtSemiLeptonicEvent() {} /// default destructor - ~TtSemiLeptonicEvent() override{}; + ~TtSemiLeptonicEvent() override {} /// get hadronic top of the given hypothesis const reco::Candidate* hadronicDecayTop(const std::string& key, const unsigned& cmb = 0) const { diff --git a/AnalysisDataFormats/TrackInfo/src/classes_def.xml b/AnalysisDataFormats/TrackInfo/src/classes_def.xml index 7f337a8c05c14..1ffc2e260f75e 100644 --- a/AnalysisDataFormats/TrackInfo/src/classes_def.xml +++ b/AnalysisDataFormats/TrackInfo/src/classes_def.xml @@ -1,6 +1,4 @@ - - diff --git a/BigProducts/Simulation/BuildFile.xml b/BigProducts/Simulation/BuildFile.xml index a8eae0f766fe2..fef5a4b1bc75b 100644 --- a/BigProducts/Simulation/BuildFile.xml +++ b/BigProducts/Simulation/BuildFile.xml @@ -29,7 +29,6 @@ - diff --git a/CUDADataFormats/HGCal/interface/HGCRecHitSoA.h b/CUDADataFormats/HGCal/interface/HGCRecHitSoA.h index 7d3fb850c9c7f..fe3fadabf5e3d 100644 --- a/CUDADataFormats/HGCal/interface/HGCRecHitSoA.h +++ b/CUDADataFormats/HGCal/interface/HGCRecHitSoA.h @@ -23,7 +23,7 @@ namespace memory { constexpr unsigned uint32_hgcrechits_soa = 2; //number of uint32_t pointers in the rechits SoA constexpr unsigned uint8_hgcrechits_soa = 1; //number of uint8_t pointers in the rechits SoA constexpr unsigned ntypes_hgcrechits_soa = 3; //number of different pointer types in the rechits SoA - } // namespace npointers + } // namespace npointers } // namespace memory #endif //CUDADataFormats_HGCal_HGCRecHitSoA_h diff --git a/CUDADataFormats/HGCal/interface/HGCUncalibRecHitSoA.h b/CUDADataFormats/HGCal/interface/HGCUncalibRecHitSoA.h index 9dadc6082ef0e..d2d0bcf810902 100644 --- a/CUDADataFormats/HGCal/interface/HGCUncalibRecHitSoA.h +++ b/CUDADataFormats/HGCal/interface/HGCUncalibRecHitSoA.h @@ -27,7 +27,7 @@ namespace memory { constexpr unsigned uint32_hgcuncalibrechits_soa = 3; //number of uint32_t pointers in the uncalibrated rechits SoA constexpr unsigned ntypes_hgcuncalibrechits_soa = 2; //number of different pointer types in the uncalibrated rechits SoA - } // namespace npointers + } // namespace npointers } // namespace memory #endif diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h index c9fa4bab7f27a..3f77c412a7cb7 100644 --- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h +++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h @@ -7,7 +7,7 @@ class MiscalibReaderFromXMLEcalBarrel : public MiscalibReaderFromXML { public: - MiscalibReaderFromXMLEcalBarrel(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map){}; + MiscalibReaderFromXMLEcalBarrel(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map) {} DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override; diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h index b2ee790f2994e..aaa8b92e654cc 100644 --- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h +++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h @@ -7,7 +7,7 @@ class MiscalibReaderFromXMLEcalEndcap : public MiscalibReaderFromXML { public: - MiscalibReaderFromXMLEcalEndcap(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map){}; + MiscalibReaderFromXMLEcalEndcap(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map) {} DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override; diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h index 2689a41d25079..052ef194df9ec 100644 --- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h +++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h @@ -7,7 +7,7 @@ class MiscalibReaderFromXMLHcal : public MiscalibReaderFromXML { public: - MiscalibReaderFromXMLHcal(CaloMiscalibMapHcal &map) : MiscalibReaderFromXML(map){}; + MiscalibReaderFromXMLHcal(CaloMiscalibMapHcal &map) : MiscalibReaderFromXML(map) {} DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override; diff --git a/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc b/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc index 99473986f4d62..72ce528c1563a 100644 --- a/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc +++ b/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc @@ -155,7 +155,8 @@ CaloTPGTranscoderULUTs::ReturnType CaloTPGTranscoderULUTs::produce(const CaloTPG const auto& lutMetadata = iRecord.get(lutMetadataToken); const auto& theTrigTowerGeometry = iRecord.get(theTrigTowerGeometryToken); - const auto& topo = iRecord.getRecord().get(topoToken); + const auto& topoRecord = iRecord.getRecord(); + const auto& topo = topoRecord.get(topoToken); HcalLutMetadata fullLut{lutMetadata}; fullLut.setTopo(&topo); diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc index 0f97bb2751411..ed80419a38058 100644 --- a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc +++ b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc @@ -41,7 +41,7 @@ class CastorHardcodeCalibrations : public edm::ESProducer, public edm::EventSetu CastorHardcodeCalibrations(const edm::ParameterSet&); ~CastorHardcodeCalibrations() override; - void produce(){}; + void produce() {} protected: void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&, diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc index cf6b8e1651a8b..c1a7f6f2871e8 100644 --- a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc +++ b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc @@ -37,7 +37,7 @@ class CastorTextCalibrations : public edm::ESProducer, public edm::EventSetupRec CastorTextCalibrations(const edm::ParameterSet&); ~CastorTextCalibrations() override; - void produce(){}; + void produce() {} protected: void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&, diff --git a/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc b/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc index 598f3f36eacbf..938b1f144b161 100644 --- a/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc +++ b/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc @@ -618,7 +618,7 @@ void CastorLedAnalysis::LedCastorHists(const HcalDetId& detid, if (adc < 0) { adc = 0; } // to prevent negative adcs after ped subtraction, which should really only happen - // if you're using the wrong peds. + // if you're using the wrong peds. double fC = m_coder->charge(*m_shape, adc, capid); //ta = (fC - m_ped->getValue(capid)); ta = fC; diff --git a/CalibCalorimetry/EBPhase2TPGTools/test/runEBPhase2TPParamProducer.py b/CalibCalorimetry/EBPhase2TPGTools/test/runEBPhase2TPParamProducer.py index eea149b2c2029..c35484ad7fed8 100644 --- a/CalibCalorimetry/EBPhase2TPGTools/test/runEBPhase2TPParamProducer.py +++ b/CalibCalorimetry/EBPhase2TPGTools/test/runEBPhase2TPParamProducer.py @@ -15,8 +15,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Generator_cff') process.load('IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi') diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc index 770f563b1c5e6..a9f8eb4688f18 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc @@ -2060,9 +2060,9 @@ void TEcnaHistos::ViewMatrix(const TMatrixD& arg_read_matrix, fStatusDataExist = kFALSE; } } // end of if ((BetweenWhat == fLFBetweenStins) || (BetweenWhat == fHFBetweenStins) ) || - //( (BetweenWhat == fBetweenSamples) && (i0StinEcha>= 0) && (i0StinEchaMaxCrysInStin())) || - //( (BetweenWhat == fLFBetweenChannels || BetweenWhat == fHFBetweenChannels) - // /* && (i0Sample >= 0) && (i0Sample < fFapNbOfSamples ) */ ) ) + //( (BetweenWhat == fBetweenSamples) && (i0StinEcha>= 0) && (i0StinEchaMaxCrysInStin())) || + //( (BetweenWhat == fLFBetweenChannels || BetweenWhat == fHFBetweenChannels) + // /* && (i0Sample >= 0) && (i0Sample < fFapNbOfSamples ) */ ) ) else { if (BetweenWhat == fBetweenSamples) { std::cout << "*TEcnaHistos::ViewMatrix(...)> *ERROR* ==> Wrong channel number in " << fFapStinName.Data() @@ -3638,7 +3638,7 @@ void TEcnaHistos::ViewStex(const TVectorD& arg_read_histo, const Int_t& arg_Alre // delete MainCanvas; fCdeleteRoot++; } // end of if OKData == kTRUE ) - } // end of if OKFileExists == kTRUE ) + } // end of if OKFileExists == kTRUE ) else { fStatusFileFound = kFALSE; @@ -5457,9 +5457,9 @@ void TEcnaHistos::ViewStas(const TVectorD& arg_read_histo, const Int_t& arg_Alre h_geo_bid->Fill((Double_t)i_xgeo, (Double_t)i_ygeo, (Double_t)read_matrix(i_xgeo, i_ygeo)); } } // end of if( fFlagSubDet == "EE" ) - } // end of if(i_xgeo >=0 && i_xgeo < nb_binx && i_ygeo >=0 && i_ygeo < nb_biny) - } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) - } // end of if ( fMyRootFile->DataExist() == kTRUE ) + } // end of if(i_xgeo >=0 && i_xgeo < nb_binx && i_ygeo >=0 && i_ygeo < nb_biny) + } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) + } // end of if ( fMyRootFile->DataExist() == kTRUE ) else { fStatusDataExist = kFALSE; @@ -7560,7 +7560,7 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, // << ". OUT OF RANGE ( range = [0,"<< SizeForPlot << "] " << std::endl; } } // end of if( fFlagSubDet == "EE" ) - } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) + } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) } else { std::cout << "!TEcnaHistos::ViewHisto(...)> " << " Data not available for " << fFapStexName << " " << iStasStex + 1 @@ -7756,7 +7756,7 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, << ". OUT OF RANGE ( range = [0," << SizeForPlot << "] " << std::endl; } } // end of if( read_histo[i0DeeEcha] > 0 ) - } // end of if( SC_in_DS >= 1 && SC_in_DS <= fEcalNumbering->GetMaxSCInDS(DataSector) ) + } // end of if( SC_in_DS >= 1 && SC_in_DS <= fEcalNumbering->GetMaxSCInDS(DataSector) ) else { std::cout << "!TEcnaHistos::ViewHisto(...)> SC_in_DS = " << SC_in_DS << ". OUT OF RANGE ( range = [1," << fEcalNumbering->GetMaxSCInDS(DataSector) @@ -7787,8 +7787,8 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, } } } // end of if( OKPlot == 1 && opt_plot != "ASCII" ) - } // end of if(fFlagSubDet == "EE") - } // end of if(ok_view_histo == kTRUE) + } // end of if(fFlagSubDet == "EE") + } // end of if(ok_view_histo == kTRUE) else { std::cout << "!TEcnaHistos::ViewHisto(...)> *ERROR* =====> " << " ok_view_histo != kTRUE " << fTTBELL << std::endl; @@ -8004,9 +8004,9 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, SetXsupMemoFromValue(XsupProj); } } // end of if( (opt_plot == fOnlyOnePlot) || - // (opt_plot == fSeveralPlot && GetMemoFlag(HistoCode, opt_plot) == "Free") || - // (opt_plot == fSameOnePlot && GetMemoFlag(HistoCode, opt_plot) == "Free") ) - } // end of if( HistoType == "Proj" || HistoType == "SampProj" || HistoType == "H1BasicProj" ) + // (opt_plot == fSeveralPlot && GetMemoFlag(HistoCode, opt_plot) == "Free") || + // (opt_plot == fSameOnePlot && GetMemoFlag(HistoCode, opt_plot) == "Free") ) + } // end of if( HistoType == "Proj" || HistoType == "SampProj" || HistoType == "H1BasicProj" ) //=============== H I S T O B O O K I N G A N D F I L L I N G ======== (ViewHisto) //.............................. prepa histogram booking (ViewHisto) @@ -10972,7 +10972,7 @@ void TEcnaHistos::HistoPlot(TH1D* h_his0, if (yinf >= ysup) { yinf = (Double_t)0.; ysup += ysup; - } // ROOT default if ymin >= ymax + } // ROOT default if ymin >= ymax Double_t MaxMarginFactor = (Double_t)0.05; // frame top line = 5% above the maximum ysup += (ysup - yinf) * MaxMarginFactor; // ROOT default if ymin < ymax } @@ -11221,7 +11221,7 @@ void TEcnaHistos::HistoPlot(TH1D* h_his0, } } } // end of if( ( opt_plot == fOnlyOnePlot ) - // || ( (opt_plot == fSeveralPlot || opt_plot == fSameOnePlot) && xMemoPlotSame == 0 ) ) + // || ( (opt_plot == fSeveralPlot || opt_plot == fSameOnePlot) && xMemoPlotSame == 0 ) ) //..............................................Top Axis (HistoPlot) Int_t min_value = 0; @@ -12186,7 +12186,7 @@ void TEcnaHistos::TopAxisForHistos(TH1D* h_his0, if (Minih >= Maxih) { Minih = (Double_t)0.; Maxih += Maxih; - } // ROOT default if ymin >= ymax + } // ROOT default if ymin >= ymax Double_t MaxMarginFactor = (Double_t)0.05; // frame top line = 5% above the maximum Maxih += (Maxih - Minih) * MaxMarginFactor; // ROOT default if ymin < ymax } @@ -13082,7 +13082,7 @@ TVectorD TEcnaHistos::GetHistoValues(const TVectorD& arg_read_histo, << ", HisSizePlot = " << HisSizePlot << fTTBELL << std::endl; } } // end of if( HistoCode == "D_MSp_SpNb" || HistoCode == "D_SSp_SpNb" " || - // HistoCode == "D_SSp_SpNb" || HistoCode == "D_SSp_SpDs" ) + // HistoCode == "D_SSp_SpNb" || HistoCode == "D_SSp_SpDs" ) if (!(HistoCode == "D_MSp_SpNb" || HistoCode == "D_SSp_SpNb" || HistoCode == "D_MSp_SpDs" || HistoCode == "D_SSp_SpDs")) // = else of previous if @@ -13166,7 +13166,7 @@ TVectorD TEcnaHistos::GetHistoValues(const TVectorD& arg_read_histo, << " HisSizeRead = " << HisSizeRead << ", HisSizePlot = " << HisSizePlot << fTTBELL << std::endl; } } // end of if( !(HistoCode == "D_MSp_SpNb" || HistoCode == "D_SSp_SpNb") ) - } // end of if( arg_AlreadyRead == 0 ) + } // end of if( arg_AlreadyRead == 0 ) if (i_data_exist == 0) { std::cout << "!TEcnaHistos::GetHistoValues(...)> Histo not found." << fTTBELL << std::endl; diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc index eb255701c3798..97d999d76ee31 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc @@ -2451,8 +2451,8 @@ TString TEcnaParHistos::GetHistoType(const TString& HistoCode) { HistoCode == "D_SCs_ChNb") { HistoType = "Global"; } // X coordinate = Xtals for SM or Dee - // Tower for EB - // SC for EE + // Tower for EB + // SC for EE //.(1b)............................ Proj if (HistoCode == "D_NOE_ChDs" || HistoCode == "D_Ped_ChDs" || HistoCode == "D_TNo_ChDs" || HistoCode == "D_LFN_ChDs" || HistoCode == "D_HFN_ChDs" || HistoCode == "D_MCs_ChDs" || diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc index 67e72405e3973..4b07885cf5958 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc @@ -1104,7 +1104,7 @@ Bool_t TEcnaRun::GetSampleAdcValues(const Int_t& n1EventNumber, << " fT1d_StexStinFromIndex[] ALLOCATION NOT DONE" << fTTBELL << std::endl; ret_code = kFALSE; } //.................................................................. (GetSampleAdcValues) - } // end of if( i0Sample >= 0 && i0Sample < fNbSampForFic ) + } // end of if( i0Sample >= 0 && i0Sample < fNbSampForFic ) else { //.......Reading data => Message and error only if sample >= fEcal->MaxSampADC() // (not fNbSampForFic, the later is used only for calculations) @@ -1117,7 +1117,7 @@ Bool_t TEcnaRun::GetSampleAdcValues(const Int_t& n1EventNumber, ret_code = kTRUE; } } // else of if( i0Sample >= 0 && i0Sample < fNbSampForFic ) - } // end of if( i0StinEcha >= 0 && i0StinEcha < fEcal->MaxCrysInStin() ) + } // end of if( i0StinEcha >= 0 && i0StinEcha < fEcal->MaxCrysInStin() ) else { std::cout << "!TEcnaRun::GetSampleAdcValues(...) *** ERROR ***> " << " channel number in " << fStinName.Data() << " = " << i0StinEcha << ". OUT OF BOUNDS" diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc index ae0c95df6d1ae..eb53c9b839897 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc @@ -687,7 +687,7 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet return; } } // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS ) - } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" + } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" // ...) //.................. Increment FedId counters @@ -860,22 +860,22 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet << "EcnaAnalyzer::analyze(...)> NbOfSamplesFromDigis out of bounds = " << NbOfSamplesFromDigis; } } // end of if( (fStexNumber > 0 && i0SM == fStexNumber-1) || - // (fStexNumber == 0) ) - } // end of if( fStexNbOfTreatedEvents[i0SM] >= 1 && - // fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts ) - } // end of if( fStexStatus[i0SM] < 2 ) - } // end of if( i0SM >= 0 && i0SMbegin(); - // digiItr != digisEB->end(); ++digiItr) + // (fStexNumber == 0) ) + } // end of if( fStexNbOfTreatedEvents[i0SM] >= 1 && + // fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts ) + } // end of if( fStexStatus[i0SM] < 2 ) + } // end of if( i0SM >= 0 && i0SMbegin(); + // digiItr != digisEB->end(); ++digiItr) for (Int_t i0SM = 0; i0SM < fMaxTreatedStexCounter; i0SM++) { fStexDigiOK[i0SM] = 0; // reset fStexDigiOK[i0SM] after loop on digis } } // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 && - // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) - } // end of if( fStexName == "SM" && fSMIndexBegin < fSMIndexStop ) + // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) + } // end of if( fStexName == "SM" && fSMIndexBegin < fSMIndexStop ) //=============================================================== Record // type EE (Dee) @@ -1014,8 +1014,8 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } } // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS ) - } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == - // "AdcSPeg12" .... ) + } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == + // "AdcSPeg12" .... ) else { fStexDigiOK[i0Dee]++; if (fStexDigiOK[i0Dee] == 1) { @@ -1100,16 +1100,16 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet << "EcnaAnalyzer::analyze(...)> NbOfSamplesFromDigis out of bounds = " << NbOfSamplesFromDigis; } } // end of if( (fStexNumber > 0 && i0Dee == fStexNumber-1) || - // (fStexNumber == 0) ) - } // end of if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] - // >= 1 && + // (fStexNumber == 0) ) + } // end of if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] + // >= 1 && // fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] <= // fReqNbOfEvts ) } // end of if( fStexStatus[i0Dee] < 2 ) - } // end of if( i0Dee >= 0 && i0Deebegin(); - // digiItr != digisEB->end(); ++digiItr) + } // end of if( i0Dee >= 0 && i0Deebegin(); + // digiItr != digisEB->end(); ++digiItr) // reset fStexDigiOK[i0Dee] or fFedDigiOK[i0Dee] to zero after loop on // digis @@ -1130,10 +1130,10 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 && - // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) + // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) } // end of if( fStexName == "Dee" && fDeeIndexBegin < fDeeIndexStop ) - } // end of if( (fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber == + } // end of if( (fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber == // 0 && fNbOfTreatedStexs < MaxNbOfStex) ) //============================================================================================= @@ -1325,7 +1325,7 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet edm::LogVerbatim("ecnaAnal") << "*---------------------------------------------------------------------------- "; } // end of if( fStexStatus[i0Stex] == 1 ) - } // end of for(Int_t i0Stex=fStexIndexBegin; i0Stex { /**Destructor */ - ~EcalDccWeightBuilder() override{}; + ~EcalDccWeightBuilder() override {} //method(s) public: diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc index d508a2a6a956a..58d1dd1f26edc 100644 --- a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc +++ b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc @@ -497,7 +497,7 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& ss << "INFO: DONE transparency correction files " << xtalcounter << "\n"; edm::LogInfo("TopInfo") << ss.str(); ss.str(""); - } // file + } // file else { // Jean 2018 edm::LogInfo("TopInfo") << "INFO: READING transparency correction tag" << "\n"; @@ -524,7 +524,7 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& edm::LogInfo("TopInfo") << ss.str(); ss.str(""); } // Jean 2018 - } //if transparency + } //if transparency // histo TFile saving("EcalTPGParam.root", "recreate"); diff --git a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc index 838d1f8b39b8b..495edb966fde0 100644 --- a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc +++ b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc @@ -1402,8 +1402,8 @@ std::unique_ptr EcalTrivialConditionRetriever::produceEcalLaser ical->setValue(ebid, laserAlphaMean_ + r * laserAlphaSigma_); } } // loop over iphi - } // loop over ieta - } // do not read a file + } // loop over ieta + } // do not read a file edm::LogInfo(" produceEcalLaserAlphas EE"); // read mean laser per ring per year @@ -1546,7 +1546,7 @@ std::unique_ptr EcalTrivialConditionRetriever::produceEcalLaser ical->setValue(eedetidneg, laserAlphaMean_ + r1 * laserAlphaSigma_); } } // loop over iY - } // loop over iX + } // loop over iX } return ical; diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h b/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h index a78ca29dc078c..91d6fd092b4e3 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h @@ -55,7 +55,7 @@ class HcalTimeSlew { tspar2_siPM(tspar2_siPMCon) {} }; - HcalTimeSlew(){}; + HcalTimeSlew() {} ~HcalTimeSlew() {} void addM2ParameterSet(float tzero, float slope, float tmax); diff --git a/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc b/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc index d14534442ca27..8ccee97bbde50 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc @@ -894,7 +894,7 @@ void HcalLedAnalysis::LedHFHists(const HcalDetId& detid, if (adc < 0) { adc = 0; } // to prevent negative adcs after ped subtraction, which should really only happen - // if you're using the wrong peds. + // if you're using the wrong peds. double fC = m_coder->charge(*m_shape, adc, capid); //ta = (fC - m_ped->getValue(capid)); ta = fC; diff --git a/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h b/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h index 49563dd526768..0bc60e8dd41d0 100644 --- a/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h +++ b/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h @@ -49,7 +49,7 @@ class HcalTextCalibrations : public edm::ESProducer, public edm::EventSetupRecor HcalTextCalibrations(const edm::ParameterSet&); ~HcalTextCalibrations() override; - void produce(){}; + void produce() {} template class CheckGetObject { diff --git a/CalibCalorimetry/HcalTPGAlgos/interface/HcalEmap.h b/CalibCalorimetry/HcalTPGAlgos/interface/HcalEmap.h index 1a3f9f7cb92b3..57e303d10aea0 100644 --- a/CalibCalorimetry/HcalTPGAlgos/interface/HcalEmap.h +++ b/CalibCalorimetry/HcalTPGAlgos/interface/HcalEmap.h @@ -54,7 +54,7 @@ class HcalEmap { topbottom = ""; subdet = ""; } - ~HcalEmapRow(){}; + ~HcalEmapRow() {} bool operator<(const HcalEmapRow& other) const; diff --git a/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc b/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc index 734de38f7d41e..db55452509611 100644 --- a/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc +++ b/CalibCalorimetry/HcalTPGAlgos/src/HcaluLUTTPGCoder.cc @@ -275,10 +275,10 @@ void HcaluLUTTPGCoder::update(const char* filename, bool appendMSB) { } else inputLUT_[lutId][adc] = lutFromFile[i][adc]; } // for adc - } // for depth - } // for iphi - } // for ieta - } // for nCol + } // for depth + } // for iphi + } // for ieta + } // for nCol } void HcaluLUTTPGCoder::updateXML(const char* filename) { diff --git a/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc b/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc index 70929abd31615..775a10cb76255 100644 --- a/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc +++ b/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc @@ -160,7 +160,8 @@ HcalTPGCoderULUT::ReturnType HcalTPGCoderULUT::produce(const HcalTPGRecord& iRec auto host = holder_.makeOrGet([]() { return new HostType; }); const auto& topo = iRecord.get(topoToken_); - const auto& delay = iRecord.getRecord().get(delayToken_); + const auto& delayRcd = iRecord.getRecord(); + const auto& delay = delayRcd.get(delayToken_); if (read_Ascii_ || read_XML_) { buildCoder(&topo, &delay, host.get()); } else { diff --git a/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h b/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h index 57dfc977ae095..f78a8268e51e1 100644 --- a/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h +++ b/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h @@ -8,7 +8,7 @@ */ class HcalCalibrationWidths { public: - HcalCalibrationWidths(){}; + HcalCalibrationWidths() {} HcalCalibrationWidths(const float fGain[4], const float fPedestal[4], const float fEffectivePedestal[4]); /// get gain width for capid=0..3 double gain(int fCapId) const { return mGain[fCapId]; } diff --git a/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h b/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h index 8440b59fdac16..546f8e8c7b189 100644 --- a/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h +++ b/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h @@ -22,9 +22,9 @@ namespace pos { */ class PixelFECConfigInterface { public: - PixelFECConfigInterface(){}; + PixelFECConfigInterface() {} - virtual ~PixelFECConfigInterface(){}; + virtual ~PixelFECConfigInterface() {} //Generate the commands needed to set the trim and mask bits that //are specified by the vector allPixels. diff --git a/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h b/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h index 6185cab716399..f3f87828f8314 100644 --- a/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h +++ b/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h @@ -41,7 +41,7 @@ namespace pos { PixelFEDCard(); // empty PixelFEDCard(std::string filename); // create from files PixelFEDCard(std::vector > &tab); // create from DB - ~PixelFEDCard() override{}; + ~PixelFEDCard() override {} void readDBTBMLevels(std::vector > &tableMat, int first, int last); void readDBROCLevels(std::vector > &tableMat, int first, int last); diff --git a/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc b/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc index 6ed5b750f5ad6..7daa3f07d1197 100644 --- a/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc +++ b/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc @@ -1148,7 +1148,7 @@ void PixelCalibConfiguration::nextFECState(std::map::iterator iPixelFEC = pixelFECs.begin(); diff --git a/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc b/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc index cfd81a124a322..5910b6c761d5d 100644 --- a/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc +++ b/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc @@ -356,7 +356,7 @@ PixelFEDCard::PixelFEDCard(vector > &tableMat) : PixelConfigBase( SPARE9 = atoi(tableMat[1][colM["SPARE9"]].c_str()); SPARE10 = atoi(tableMat[1][colM["SPARE10"]].c_str()); - } // end of 'first' condition + } // end of 'first' condition for (int r = 1; r < size[0]; r++) //Goes to every row of the FIRST Matrix (MUST BE 36, one for each FED channel) { //Number of ROCS per FED channel diff --git a/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc b/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc index 17641e5b6b453..8af5ea0182b6a 100644 --- a/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc +++ b/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc @@ -108,7 +108,7 @@ PixelFEDConfig::PixelFEDConfig(std::vector > &tableMat) fedconfig_.push_back(tmp); } } //end else - } //end for r + } //end for r /* std::cout << __LINE__ << "]\t" << mthn << std::endl; diff --git a/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc b/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc index afe9872c4d8ec..91ce3946fd189 100644 --- a/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc +++ b/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc @@ -71,7 +71,7 @@ PixelNameTranslation::PixelNameTranslation(std::vector } } } //end for - /* + /* for(unsigned int n=0; n> 0); // return bits 0 & 1 + return (((threeGainsValue) & 0x03) >> 0); // return bits 0 & 1 if (AOHNumber % 3 == 2) - return (((threeGainsValue)&0x0c) >> 2); // return bits 2 & 3 + return (((threeGainsValue) & 0x0c) >> 2); // return bits 2 & 3 if (AOHNumber % 3 == 0) - return (((threeGainsValue)&0x30) >> 4); // return bits 4 & 5 + return (((threeGainsValue) & 0x30) >> 4); // return bits 4 & 5 assert(0); } diff --git a/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc b/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc index c739fb7f5a1cd..6589b3d64b8a1 100644 --- a/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc +++ b/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc @@ -74,7 +74,7 @@ PixelTrimAllPixels::PixelTrimAllPixels(std::vector > &t tmp.read(rocid, base64_decode(tableMat[r][colM["TRIM_BITS"]])); trimbits_.push_back(tmp); } //end for r - //std::cout<channels[j].flag3; badStripWord_.set(chan - 1, true); // set bit 0-79 (111) in 80 (112)-bit // bitset representing this layer - } // j - } // i + } // j + } // i } void CSCConditions::fillBadWireWord(const CSCDetId &id) { @@ -216,8 +216,8 @@ void CSCConditions::fillBadWireWord(const CSCDetId &id) { // short f3 = theBadWires->channels[j].flag3; badWireWord_.set(chan - 1, true); // set bit 0-111 in 112-bit bitset representing this layer - } // j - } // i + } // j + } // i } bool CSCConditions::isInBadChamber(const CSCDetId &id) const { diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h index 1dd414d50b08b..76ea27088cd9b 100644 --- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h +++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h @@ -72,8 +72,8 @@ class CSCIndexerOldPostls1 { static const IndexType MAX_CHIP_INDEX = 17064; static const IndexType MAX_GAS_GAIN_INDEX = 57240; - CSCIndexerOldPostls1(){}; - ~CSCIndexerOldPostls1(){}; + CSCIndexerOldPostls1() {} + ~CSCIndexerOldPostls1() {} /** * Starting index for first chamber in ring 'ir' of station 'is' in endcap diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h index 1973a0f46ed63..97802fff23284 100644 --- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h +++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h @@ -54,8 +54,8 @@ class CSCIndexerOldStartup { typedef uint16_t IndexType; typedef uint32_t LongIndexType; - CSCIndexerOldStartup(){}; - ~CSCIndexerOldStartup(){}; + CSCIndexerOldStartup() {} + ~CSCIndexerOldStartup() {} /** * Linear index to label each CSC in CSC system. diff --git a/CalibMuon/DTCalibration/interface/DTTMax.h b/CalibMuon/DTCalibration/interface/DTTMax.h index 60f340b3b9bf3..f7f3e026d5d17 100644 --- a/CalibMuon/DTCalibration/interface/DTTMax.h +++ b/CalibMuon/DTCalibration/interface/DTTMax.h @@ -83,7 +83,7 @@ class DTTMax { InfoLayer*& getInfoLayer(int layer) { return theInfoLayers[layer - 1]; } private: - DTTMax(){}; // Hide default constructor + DTTMax() {} // Hide default constructor //debug flag bool debug; diff --git a/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc b/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc index 62462e6c70c59..2911af45b47de 100644 --- a/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc +++ b/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc @@ -55,15 +55,15 @@ void DTGeometryParserFromDDD::parseGeometry(DDFilteredView& fv, fv.parent(); doL = fv.nextSibling(); // go to next layer - } // layers + } // layers fv.parent(); doSL = fv.nextSibling(); // go to next SL - } // sls + } // sls fv.parent(); doChamber = fv.nextSibling(); // go to next chamber - } // chambers + } // chambers } void DTGeometryParserFromDDD::buildLayer(DDFilteredView& fv, diff --git a/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h b/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h index 386b785dfe6d4..6b2b1c6fff80e 100644 --- a/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h @@ -41,7 +41,7 @@ class DTNoiseCalibration : public edm::one::EDAnalyzer { void beginJob() override; void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; private: diff --git a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc index e9be264db4b63..75b9dd51a986f 100644 --- a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc +++ b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc @@ -203,9 +203,9 @@ void DTNoiseComputation::beginRun(const edm::Run &, const EventSetup &setup) { } } // done if the layer has digi - } // loop over layers - } // loop over superlayers - } // loop over chambers + } // loop over layers + } // loop over superlayers + } // loop over chambers count++; } diff --git a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h index 12e60796b08f3..b481f3b81ffd3 100644 --- a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h +++ b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h @@ -46,7 +46,7 @@ class DTNoiseComputation : public edm::one::EDAnalyzer { void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run&, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run&, const edm::EventSetup& setup) override {} /// Endjob void endJob() override; diff --git a/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h b/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h index f402b597861f0..bd8cec801bec1 100644 --- a/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h @@ -37,7 +37,7 @@ class DTResidualCalibration : public edm::one::EDAnalyzer { void beginJob() override; void beginRun(const edm::Run&, const edm::EventSetup&) override; void endJob() override; - void endRun(const edm::Run&, const edm::EventSetup&) override{}; + void endRun(const edm::Run&, const edm::EventSetup&) override {} void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc b/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc index ee9d5055e90b9..5be848d0714ab 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc +++ b/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc @@ -191,8 +191,8 @@ void DTT0Calibration::analyze(const edm::Event& event, const edm::EventSetup& ev mK[wireId] = mK[wireId] + (t0 - mK[wireId]) / nDigiPerWire[wireId]; } } //end if(nevents>1000) - } //end loop on digi - } //end loop on layer + } //end loop on digi + } //end loop on layer //Use the t0 per layer histos to have an indication about the t0 position if (nevents == eventsForLayerT0) { diff --git a/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc b/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc index bcfd9e027377f..df6afe69a325e 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc +++ b/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc @@ -224,8 +224,8 @@ void DTT0CalibrationRMS::analyze(const edm::Event& event, const edm::EventSetup& mK[wireId] = mK[wireId] + (t0 - mK[wireId]) / nDigiPerWire[wireId]; } } //end if(nevents>1000) - } //end loop on digi - } //end loop on layer + } //end loop on digi + } //end loop on layer //Use the t0 per layer histos to have an indication about the t0 position if (nevents == eventsForLayerT0) { diff --git a/CalibMuon/DTCalibration/plugins/DTT0Correction.cc b/CalibMuon/DTCalibration/plugins/DTT0Correction.cc index e006d01deb419..90e8f3919a594 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0Correction.cc +++ b/CalibMuon/DTCalibration/plugins/DTT0Correction.cc @@ -97,8 +97,8 @@ void DTT0Correction::endJob() { continue; } } // End of loop on wires - } // End of loop on layers - } // End of loop on superlayers + } // End of loop on layers + } // End of loop on superlayers //Write object to DB LogVerbatim("Calibration") << "[DTT0Correction]: Writing t0 object to DB!" << endl; diff --git a/CalibMuon/DTCalibration/plugins/DTT0Correction.h b/CalibMuon/DTCalibration/plugins/DTT0Correction.h index 7b32c526868ac..44a1a0e2eef25 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0Correction.h +++ b/CalibMuon/DTCalibration/plugins/DTT0Correction.h @@ -33,7 +33,7 @@ class DTT0Correction : public edm::one::EDAnalyzer { void beginJob() override {} void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h b/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h index 0151bc396f8a6..151fa9d3e6872 100644 --- a/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h +++ b/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h @@ -41,7 +41,7 @@ class DTTPDeadWriter : public edm::one::EDAnalyzer { /// Compute the ttrig by fiting the TB rising edge void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override; - void endRun(const edm::Run&, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run&, const edm::EventSetup& setup) override {} /// Write ttrig in the DB void endJob() override; diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h b/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h index e9d934f04a53d..84f9b94a22062 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h +++ b/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h @@ -37,7 +37,7 @@ class DTTTrigCorrection : public edm::one::EDAnalyzer { void beginJob() override {} void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h b/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h index b33327fa2a781..a13d693191715 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h +++ b/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h @@ -33,7 +33,7 @@ class DTTTrigCorrectionFirst : public edm::one::EDAnalyzer void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc index 3d2de78840d26..7121da94e1b82 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc +++ b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc @@ -126,7 +126,7 @@ void DTTTrigOffsetCalibration::analyze(const Event& event, const EventSetup& eve } } } // DTRecSegment4DCollection::const_iterator segment - } // DTRecSegment4DCollection::id_iterator chamberIdIt + } // DTRecSegment4DCollection::id_iterator chamberIdIt } // DTTTrigOffsetCalibration::analyze void DTTTrigOffsetCalibration::endJob() { diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h index 596519324f276..067c5c38b5552 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h @@ -37,7 +37,7 @@ class DTTTrigOffsetCalibration : public edm::one::EDAnalyzer { hTMaxCell* getHists() { return histos; } private: - cellInfo(){}; - cellInfo(const cellInfo&){}; + cellInfo() {} + cellInfo(const cellInfo&) {} std::vector addedCells; hTMaxCell* histos; diff --git a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc index fc3e4dd0a58ac..1648772a3d603 100644 --- a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc +++ b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc @@ -116,7 +116,7 @@ void DTVDriftSegmentCalibration::analyze(const Event& event, const EventSetup& e } } } // DTRecSegment4DCollection::const_iterator segment - } // DTRecSegment4DCollection::id_iterator chamberIdIt + } // DTRecSegment4DCollection::id_iterator chamberIdIt } // DTVDriftSegmentCalibration::analyze void DTVDriftSegmentCalibration::endJob() { diff --git a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h index 4c3b1a1e78eb0..a3dc05bc7b5e0 100644 --- a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h @@ -32,7 +32,7 @@ class DTVDriftSegmentCalibration : public edm::one::EDAnalyzer { // Operations void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; private: diff --git a/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h b/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h index 7290ada051a5a..6ad62e4390902 100644 --- a/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h +++ b/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h @@ -35,8 +35,8 @@ class FakeTTrig : public edm::one::EDAnalyzer(obj); } } // namespace fakeOTLA std::unique_ptr SiPhase2OuterTrackerFakeLorentzAngleESSource::produceOTLA( const SiPhase2OuterTrackerLorentzAngleRcd& rcd) { - const auto& geomDet = rcd.getRecord().get(m_geomDetToken); + const auto& geomDet = rcd.get(m_geomDetToken); return fakeOTLA::produceRecord(LAvalue_, geomDet); } std::unique_ptr SiPhase2OuterTrackerFakeLorentzAngleESSource::produceOTSimLA( const SiPhase2OuterTrackerLorentzAngleSimRcd& rcd) { - const auto& geomDet = rcd.getRecord().get(m_geomDetToken); + const auto& geomDet = rcd.get(m_geomDetToken); return fakeOTLA::produceRecord(LAvalue_, geomDet); } diff --git a/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc b/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc index 20a206a08d6e4..1377cb0e16b7d 100644 --- a/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc +++ b/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc @@ -14,8 +14,8 @@ PixelToFEDAssociateFromAscii::PixelToFEDAssociateFromAscii(const string& fn) { i std::string PixelToFEDAssociateFromAscii::version() const { return theVersion; } int PixelToFEDAssociateFromAscii::operator()(const PixelModuleName& id) const { - return id.isBarrel() ? operator()(dynamic_cast(id)) : - operator()(dynamic_cast(id)); + return id.isBarrel() ? operator()(dynamic_cast(id)) + : operator()(dynamic_cast(id)); } int PixelToFEDAssociateFromAscii::operator()(const PixelBarrelName& id) const { diff --git a/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc b/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc index 748d7816a4747..54ca0379bc5a7 100644 --- a/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc +++ b/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc @@ -461,7 +461,7 @@ void PixelToLNKAssociateFromAscii::addConnections(int fedId, int linkId, std::st theConnection.push_back(make_pair(detectorRocId, cablingRocId)); // cout <<"PLAQ:"< trackerGeomTokenBeginRun_; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h index 1618215f391b8..5d1a6bc33a447 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h @@ -23,7 +23,7 @@ class SiPixelGainCalibrationForHLTService final public: explicit SiPixelGainCalibrationForHLTService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter( - conf, std::move(iC)){}; + conf, std::move(iC)) {} void calibrate( uint32_t detID, DigiIterator b, DigiIterator e, float conversionFactor, float offset, int* electron) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h index f8a67dc0f834d..46d0a7d04a54e 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h @@ -25,7 +25,7 @@ class SiPixelGainCalibrationForHLTSimService public: explicit SiPixelGainCalibrationForHLTSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter( - conf, std::move(iC)){}; + conf, std::move(iC)) {} // column granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h index fca47397bccc2..b6d50266e1810 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h @@ -23,7 +23,7 @@ class SiPixelGainCalibrationOfflineService public: explicit SiPixelGainCalibrationOfflineService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter( - conf, std::move(iC)){}; + conf, std::move(iC)) {} // pixel granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h index 5566f4dd090d1..ac66f145157d8 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h @@ -24,7 +24,7 @@ class SiPixelGainCalibrationOfflineSimService SiPixelGainCalibrationOfflineSimRcd> { public: explicit SiPixelGainCalibrationOfflineSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) - : SiPixelGainCalibrationServicePayloadGetter(conf, iC){}; + : SiPixelGainCalibrationServicePayloadGetter(conf, iC) {} // pixel granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h index ba33864201dce..b302dd6947c38 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h @@ -23,7 +23,7 @@ class SiPixelGainCalibrationService public: explicit SiPixelGainCalibrationService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter(conf, - std::move(iC)){}; + std::move(iC)) {} // pixel granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h index b2cb324b171b8..cbe6721533929 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h @@ -31,8 +31,8 @@ class SiPixelGainCalibrationServiceBase { public: typedef edm::DetSet::const_iterator DigiIterator; - SiPixelGainCalibrationServiceBase(){}; - virtual ~SiPixelGainCalibrationServiceBase(){}; + SiPixelGainCalibrationServiceBase() {} + virtual ~SiPixelGainCalibrationServiceBase() {} static void fillPSetDescription(edm::ParameterSetDescription& desc) {} diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc index 2d9853aca49f5..9b08d5533e909 100644 --- a/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc +++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc @@ -169,7 +169,7 @@ std::unique_ptr SiPixelFakeLorentzAngleESSource::produce(co edm::LogError("SiPixelFakeLorentzAngleESSource") << "ERROR!: detid " << rawId << " already exists" << std::endl; } // if - } // for + } // for //modules already put are automatically skipped for (const auto& it : FPixParameters_) { @@ -203,9 +203,9 @@ std::unique_ptr SiPixelFakeLorentzAngleESSource::produce(co edm::LogError("SiPixelFakeLorentzAngleESSource") << "ERROR!: detid" << rawId << "already exists" << std::endl; } // for - } // if - } // bpix/fpix - } // iterate on detids + } // if + } // bpix/fpix + } // iterate on detids edm::LogInfo("SiPixelFakeLorentzAngleESSource") << "Modules = " << nmodules << std::endl; diff --git a/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc b/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc index f77b7928d542f..804c9d0a1c4c2 100644 --- a/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc +++ b/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc @@ -100,9 +100,9 @@ void PixelFEDChannelCollectionMapTestReader::analyze(const edm::Event& e, const ch.roc_last); //std::cout << disabledChannels.detId() << " "<< ch.fed << " " << ch.link << " " << ch.roc_first << " " << ch.roc_last << std::endl; } // loop over disable channels - } // loop over the detSetVector - } // main loop on the map - } // if file exists + } // loop over the detSetVector + } // main loop on the map + } // if file exists } void PixelFEDChannelCollectionMapTestReader::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h index 17f06edc7d653..30e54602e8aec 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h @@ -35,7 +35,7 @@ namespace cms { public: explicit SiPixelFakeGainForHLTReader(const edm::ParameterSet& iConfig); - ~SiPixelFakeGainForHLTReader(){}; + ~SiPixelFakeGainForHLTReader() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; virtual void endRun(const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h index 4f5e3a3732c0c..7caf080a7e764 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h @@ -35,7 +35,7 @@ namespace cms { public: explicit SiPixelFakeGainOfflineReader(const edm::ParameterSet& iConfig); - ~SiPixelFakeGainOfflineReader(){}; + ~SiPixelFakeGainOfflineReader() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; virtual void endRun(const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h index 6a08b1cbb555d..c7685373fa2e2 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h @@ -35,7 +35,7 @@ namespace cms { public: explicit SiPixelFakeGainReader(const edm::ParameterSet& iConfig); - ~SiPixelFakeGainReader(){}; + ~SiPixelFakeGainReader() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; virtual void endRun(const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc index 0bf04b7a8d266..77d2a89cb3d09 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc @@ -464,7 +464,7 @@ void SiPixelLorentzAngle::analyze(const edm::Event& e, const edm::EventSetup& es SiPixelLorentzAngleTreeForward_->Fill(); } } //end iteration over trajectory measurements - } //end iteration over trajectories + } //end iteration over trajectories } } diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc index 9894715da5094..9171b36accc7e 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc @@ -731,7 +731,7 @@ SiPixelLAHarvest::fitResults SiPixelLorentzAnglePCLHarvester::fitAndStore( } cov00 = result->CovMatrix(0, 0); } // if the covariance matrix is valid - } // compute the error on the drift-at-half width only for the regular polynomial fit + } // compute the error on the drift-at-half width only for the regular polynomial fit res.dSq = dSq; diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc index 0c11795ec573c..9ec0c51dc2a4a 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc @@ -502,7 +502,7 @@ void SiPixelLorentzAnglePCLHarvesterMCS::dqmEndJob(DQMStore::IBooker& iBooker, D fmh.bfield[2] = hists_.h_fpixMagField_[2][idx]->getMean(); fitMuH.add(fmh); } // if fut converged - } // loop over z sides + } // loop over z sides if (fitMuH.size() == hists_.nSides_) { std::string fpixPartNames = "R" + std::to_string(r + 1) + "_P" + std::to_string(p + 1); diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc index 732ec0febc758..75decdd6eae5a 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc @@ -719,7 +719,7 @@ void SiPixelLorentzAnglePCLWorker::analyze(edm::Event const& iEvent, edm::EventS } } } //end iteration over trajectory measurements - } //end iteration over trajectories + } //end iteration over trajectories } } @@ -903,8 +903,8 @@ void SiPixelLorentzAnglePCLWorker::bookHistograms(DQMStore::IBooker& iBooker, iHists.h_fpixMean_[idxBeta] = iBooker.book1D(name, title, 60, -3., 3.); } // loop over sides - } // loop over panels - } // loop over rings + } // loop over panels + } // loop over rings iBooker.setCurrentFolder(fmt::sprintf("%s/FPix", folder_.data())); for (int r = 0; r < iHists.nRings_; ++r) { for (int p = 0; p < iHists.nPanels_; ++p) { @@ -930,10 +930,10 @@ void SiPixelLorentzAnglePCLWorker::bookHistograms(DQMStore::IBooker& iBooker, title = fmt::sprintf("%s_magField%d;B_{%c} [T];Entries", baseTitle, m, bComp); iHists.h_fpixMagField_[m][idx] = iBooker.book1D(name, title, 10000, -5., 5.); } // mag. field comps - } // loop over sides - } // loop over panels - } // loop over rings - } // if MinimalClusterSize + } // loop over sides + } // loop over panels + } // loop over rings + } // if MinimalClusterSize // book the track monitoring plots iBooker.setCurrentFolder(fmt::sprintf("%s/TrackMonitoring", folder_.data())); diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc index e9288ca65c653..e6d8bbda02b51 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc @@ -500,7 +500,7 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet histo[PROMPTBADROC].fill(detId, nullptr, column, row); //, 1.0/nLumiBlock_); } } // if bad - } // loop over all ROCs + } // loop over all ROCs // errorType 0 means the full module is bad if (BadRocListPrompt.size() == sensorSize_[detid]) diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc index 812ced2a3b4a2..086ff92c85f9c 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc @@ -268,7 +268,7 @@ void SiPixelStatusProducer::endLuminosityBlock(edm::LuminosityBlock const&, edm: fDet_.fillFEDerror25(detid, chs[ich]); } } // loop over detIds - } // if non-empty FEDerror25 + } // if non-empty FEDerror25 } // only for non-zero events } diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h index 54d0eae8c2127..39f897e73aeec 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h @@ -115,8 +115,7 @@ class SiPixelStatusProducer : /* Do nothing */ } - static void globalEndJob(SiPixelStatusCache const*) { /* Do nothing */ - } + static void globalEndJob(SiPixelStatusCache const*) { /* Do nothing */ } static std::shared_ptr> globalBeginLuminosityBlockSummary( edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*) { diff --git a/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc b/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc index be64108c3c3e4..45bfa0063ef58 100644 --- a/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc +++ b/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc @@ -17,7 +17,7 @@ SiPixelModuleStatus::SiPixelModuleStatus(int detId, int nrocs) : fDetid_(detId), }; // ---------------------------------------------------------------------- -SiPixelModuleStatus::~SiPixelModuleStatus(){}; +SiPixelModuleStatus::~SiPixelModuleStatus() {} // ---------------------------------------------------------------------- void SiPixelModuleStatus::fillDIGI(int iroc) { diff --git a/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc b/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc index 8c01192c91068..7764f2752daef 100644 --- a/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc +++ b/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc @@ -68,7 +68,7 @@ void SiPixelTopoFinder::init(const TrackerGeometry* trackerGeometry, int value = roc; rocIdMap[key] = value; } // column - } // row + } // row fRocIds_[detid] = rocIdMap; diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc b/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc index 5c77407fdc2d9..56f38417e20e0 100644 --- a/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc +++ b/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc @@ -37,11 +37,11 @@ SiPixelFedFillerWordEventNumber ::~SiPixelFedFillerWordEventNumber() {} unsigned int SiPixelFedFillerWordEventNumber ::CalibStatFillWord(unsigned int totword, int status) { //===== Variables to get each filler word out of the totword and // to conform the last 16 bit filler word if Filler3 is zero. - unsigned int Filler1 = (totword)&0x000000ff; - unsigned int Filler2 = ((totword)&0x0000ff00) >> 8; - unsigned int Filler3 = ((totword)&0x00ff0000) >> 16; - unsigned int Filler4 = ((totword)&0xffff0000) >> 16; - unsigned int maskFiller4 = ((totword)&0xff000000) >> 16; + unsigned int Filler1 = (totword) & 0x000000ff; + unsigned int Filler2 = ((totword) & 0x0000ff00) >> 8; + unsigned int Filler3 = ((totword) & 0x00ff0000) >> 16; + unsigned int Filler4 = ((totword) & 0xffff0000) >> 16; + unsigned int maskFiller4 = ((totword) & 0xff000000) >> 16; unsigned int Filler14 = (Filler1 & maskFiller4); unsigned int Filler24 = (Filler2 & maskFiller4); unsigned int CalibFiller1 = 0; diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc index adc3d07fd2c65..040e34526340b 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc @@ -557,8 +557,8 @@ void SiStripGainsCalibTreeWorker::checkBookAPVColls(const TrackerGeometry* bareT Index++; histograms.NStripAPVs++; } // loop on APVs - } // if is Strips - } // loop on dets + } // if is Strips + } // loop on dets for (unsigned int i = 0; i < Det.size(); i++) { //Make two loop such that the Pixel information is added at the end --> make transition simpler @@ -605,10 +605,10 @@ void SiStripGainsCalibTreeWorker::checkBookAPVColls(const TrackerGeometry* bareT histograms.NPixelDets++; } // loop on ROC cols - } // loop on ROC rows - } // if Pixel - } // loop on Dets - } //if (!bareTkGeomPtr_) ... + } // loop on ROC rows + } // if Pixel + } // loop on Dets + } //if (!bareTkGeomPtr_) ... } //********************************************************************************// diff --git a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc index b029e7a4f485a..0d3aec7540b32 100644 --- a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc +++ b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc @@ -749,8 +749,8 @@ void SiStripGainsPCLHarvester::checkBookAPVColls(const edm::EventSetup& es) { Index++; NStripAPVs++; } // loop on APVs - } // if is Strips - } // loop on dets + } // if is Strips + } // loop on dets for (unsigned int i = 0; i < Det.size(); i++) { //Make two loop such that the Pixel information is added at the end --> make transition simpler @@ -799,10 +799,10 @@ void SiStripGainsPCLHarvester::checkBookAPVColls(const edm::EventSetup& es) { NPixelDets++; } // loop on ROC cols - } // loop on ROC rows - } // if Pixel - } // loop on Dets - } //if (!bareTkGeomPtr_) ... + } // loop on ROC rows + } // if Pixel + } // loop on Dets + } //if (!bareTkGeomPtr_) ... bareTkGeomPtr_ = newBareTkGeomPtr; } diff --git a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc index c30c0de70151a..63b033ca5775f 100644 --- a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc +++ b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc @@ -452,8 +452,8 @@ void SiStripGainsPCLWorker::checkBookAPVColls(const TrackerGeometry* bareTkGeomP Index++; histograms.NStripAPVs++; } // loop on APVs - } // if is Strips - } // loop on dets + } // if is Strips + } // loop on dets for (unsigned int i = 0; i < Det.size(); i++) { //Make two loop such that the Pixel information is added at the end --> make transition simpler @@ -501,10 +501,10 @@ void SiStripGainsPCLWorker::checkBookAPVColls(const TrackerGeometry* bareTkGeomP histograms.NPixelDets++; } // loop on ROC cols - } // loop on ROC rows - } // if Pixel - } // loop on Dets - } //if (!bareTkGeomPtr_) ... + } // loop on ROC rows + } // if Pixel + } // loop on Dets + } //if (!bareTkGeomPtr_) ... } //********************************************************************************// diff --git a/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h b/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h index 7cc980709cb7a..15c901ff99c0a 100644 --- a/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h +++ b/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h @@ -18,7 +18,7 @@ class SiStripFedCablingRcd; class SiStripDCSStatus { public: - SiStripDCSStatus(edm::ConsumesCollector&& iC) : SiStripDCSStatus(iC){}; + SiStripDCSStatus(edm::ConsumesCollector&& iC) : SiStripDCSStatus(iC) {} SiStripDCSStatus(edm::ConsumesCollector& iC); bool getStatus(edm::Event const& e, edm::EventSetup const& eSetup); diff --git a/CalibTracker/SiStripCommon/interface/poly.h b/CalibTracker/SiStripCommon/interface/poly.h index bdc1a5ecb81a0..9cf4b3bbed5c1 100644 --- a/CalibTracker/SiStripCommon/interface/poly.h +++ b/CalibTracker/SiStripCommon/interface/poly.h @@ -59,8 +59,8 @@ class poly columns.back().insert(R.begin(), R.end()); return *this; } - friend poly operator+<>(const poly&, const char*); - friend poly operator+<>(const char*, const poly&); + friend poly operator+ <>(const poly&, const char*); + friend poly operator+ <>(const char*, const poly&); const_iterator begin() const { return const_iterator(*this); } const_iterator end() const { return const_iterator::end_of(*this); } diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc index d8494b7bb3d4d..93f29c6cd04b2 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc @@ -263,7 +263,7 @@ void ShallowTrackClustersProducer::produce(edm::Event& iEvent, const edm::EventS ontrk_cluster_idx++; } //for(unsigned h=0; h<2; h++) { //loop over possible Hit options (1D, 2D) - } //for(auto const& measurement : traj->measurements() ) + } //for(auto const& measurement : traj->measurements() ) onTrkClustersBegin->at(trk_idx) = trk_strt_idx; onTrkClustersEnd->at(trk_idx) = ontrk_cluster_idx; diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTree.h b/CalibTracker/SiStripCommon/plugins/ShallowTree.h index 26f2b11dc740f..5f6a77ccf7b7e 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTree.h +++ b/CalibTracker/SiStripCommon/plugins/ShallowTree.h @@ -41,7 +41,7 @@ class ShallowTree : public edm::one::EDAnalyzer { class BranchConnector { public: - virtual ~BranchConnector(){}; + virtual ~BranchConnector() {} virtual void connect(const edm::Event&) = 0; }; diff --git a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc index e85d85cf9a99c..cd9ea67120d4f 100644 --- a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc +++ b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc @@ -39,8 +39,8 @@ class SiStripDetInfoFileWriter : public edm::one::EDAnalyzer TkDetMapESProducer::produce(const TrackerTopologyRcd& tTopoRcd) { - const auto& geomDet = tTopoRcd.getRecord().get(geomDetToken_); + const auto& geomDet = tTopoRcd.get(geomDetToken_); const auto TkDetIdList = TrackerGeometryUtils::getSiStripDetIds(geomDet); const auto& tTopo = tTopoRcd.get(tTopoToken_); diff --git a/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h b/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h index d46846614082b..7a56ac3898e4a 100644 --- a/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h +++ b/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h @@ -19,8 +19,8 @@ class DummyCondDBWriter : public edm::one::EDAnalyzer { public: explicit SiStripApvGainBuilderFromTag(const edm::ParameterSet& iConfig); - ~SiStripApvGainBuilderFromTag() override{}; + ~SiStripApvGainBuilderFromTag() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc index cef3b4a83774c..cf089d0f24a20 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc @@ -65,7 +65,8 @@ SiStripBackPlaneCorrectionFakeESSource::ReturnType SiStripBackPlaneCorrectionFak const SiStripBackPlaneCorrectionRcd& iRecord) { using namespace edm::es; - const auto& geomDet = iRecord.getRecord().get(m_geomDetToken); + const auto& geomDetRcd = iRecord.getRecord(); + const auto& geomDet = geomDetRcd.get(m_geomDetToken); const auto& tTopo = iRecord.get(m_tTopoToken); auto backPlaneCorrection = std::make_unique(); diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc index a82168bc842d4..39793a014c857 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc @@ -31,7 +31,8 @@ std::unique_ptr SiStripHashedDetIdFakeESSource::produce(cons edm::LogVerbatim("HashedDetId") << "[SiStripHashedDetIdFakeESSource::" << __func__ << "]" << " Building \"fake\" hashed DetId map from IdealGeometry"; - const auto& geomDet = record.getRecord().get(geomDetToken_); + const auto& geomDetRcd = record.getRecord(); + const auto& geomDet = geomDetRcd.get(geomDetToken_); const std::vector dets = TrackerGeometryUtils::getSiStripDetIds(geomDet); edm::LogVerbatim("HashedDetId") << "[SiStripHashedDetIdFakeESSource::" << __func__ << "]" diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc index 920cf6df72dbd..5c1710758a318 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc @@ -183,7 +183,8 @@ SiStripLorentzAngleFakeESSource::ReturnType SiStripLorentzAngleFakeESSource::pro const SiStripLorentzAngleRcd& iRecord) { using namespace edm::es; - const auto& geomDet = iRecord.getRecord().get(m_geomDetToken); + const auto& geomDetRcd = iRecord.getRecord(); + const auto& geomDet = geomDetRcd.get(m_geomDetToken); const auto& tTopo = iRecord.get(m_tTopoToken); auto lorentzAngle = std::make_unique(); diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h index b9e16ca61b6c1..4858943be91c9 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h @@ -32,7 +32,7 @@ class SiStripNoiseNormalizedWithApvGainBuilder : public edm::one::EDAnalyzer<> { public: explicit SiStripNoiseNormalizedWithApvGainBuilder(const edm::ParameterSet& iConfig); - ~SiStripNoiseNormalizedWithApvGainBuilder() override{}; + ~SiStripNoiseNormalizedWithApvGainBuilder() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h index 56bfc2af9c20f..de898d0190fdc 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h @@ -22,7 +22,7 @@ class SiStripQualityFakeESSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder { public: SiStripQualityFakeESSource(const edm::ParameterSet&); - ~SiStripQualityFakeESSource() override{}; + ~SiStripQualityFakeESSource() override {} SiStripQualityFakeESSource(const SiStripQualityFakeESSource&) = delete; const SiStripQualityFakeESSource& operator=(const SiStripQualityFakeESSource&) = delete; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h index d01290de1bdba..9a1e68ebc3b29 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h @@ -22,7 +22,7 @@ class SiStripTemplateEmptyFakeESSource : public edm::ESProducer, public edm::Eve SiStripTemplateEmptyFakeESSource(const edm::ParameterSet&); SiStripTemplateEmptyFakeESSource(const SiStripTemplateEmptyFakeESSource&) = delete; const SiStripTemplateEmptyFakeESSource& operator=(const SiStripTemplateEmptyFakeESSource&) = delete; - ~SiStripTemplateEmptyFakeESSource() override{}; + ~SiStripTemplateEmptyFakeESSource() override {} std::unique_ptr produce(const TRecord&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc index 4800d1df277ed..2f3370356365c 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc @@ -34,7 +34,7 @@ class SiStripDelayESProducer : public edm::ESProducer { public: SiStripDelayESProducer(const edm::ParameterSet&); - ~SiStripDelayESProducer() override{}; + ~SiStripDelayESProducer() override {} std::unique_ptr produce(const SiStripDelayRcd&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc index cf4e45d023535..121c977a50ae5 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc @@ -23,7 +23,7 @@ class SiStripGainESProducer : public edm::ESProducer { public: SiStripGainESProducer(const edm::ParameterSet&); - ~SiStripGainESProducer() override{}; + ~SiStripGainESProducer() override {} std::unique_ptr produce(const SiStripGainRcd&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc index 37f5e4f82ae37..a99f3545424e6 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc @@ -20,7 +20,7 @@ class SiStripGainSimESProducer : public edm::ESProducer { public: SiStripGainSimESProducer(const edm::ParameterSet&); - ~SiStripGainSimESProducer() override{}; + ~SiStripGainSimESProducer() override {} std::unique_ptr produce(const SiStripGainSimRcd&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc index b3b7d31aaf246..b0b57c6d9390d 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc @@ -62,7 +62,7 @@ namespace { class SiStripQualityESProducer : public edm::ESProducer { public: SiStripQualityESProducer(const edm::ParameterSet&); - ~SiStripQualityESProducer() override{}; + ~SiStripQualityESProducer() override {} std::unique_ptr produce(const SiStripQualityRcd&); diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc index be8c1f37c7618..526aae56bab30 100644 --- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc +++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc @@ -325,10 +325,10 @@ void SiStripHitEfficiencyHarvester::dqmEndJob(DQMStore::IBooker& booker, DQMStor t_threshold = 0; tree->Fill(); } // if storing tree - } // if not autoInefModTagging - } // if there are no bad APVs - } // if denom - } // loop on DetIds + } // if not autoInefModTagging + } // if there are no bad APVs + } // if denom + } // loop on DetIds if (autoIneffModTagging_) { for (unsigned int i = 1; i <= k_LayersAtTECEnd; i++) { @@ -442,10 +442,10 @@ void SiStripHitEfficiencyHarvester::dqmEndJob(DQMStore::IBooker& booker, DQMStor } } } // if denom - } // layer = i - } // loop on detids - } // loop on layers - } // if auto tagging + } // layer = i + } // loop on detids + } // loop on layers + } // if auto tagging tkMap.save(true, 0, 0, "SiStripHitEffTKMap_NEW.png"); tkMapBad.save(true, 0, 0, "SiStripHitEffTKMapBad_NEW.png"); diff --git a/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h b/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h index 9dc5e3b338d9f..895bc18b5f113 100644 --- a/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h +++ b/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h @@ -32,7 +32,7 @@ class SiStripOverlapHit { // constructes an overlap from 2 hits and a track. Hits are internally sorted inside-out explicit SiStripOverlapHit(TrajectoryMeasurement const& measA, TrajectoryMeasurement const& measB); // destructor - virtual ~SiStripOverlapHit(){}; + virtual ~SiStripOverlapHit() {} // access to indivitual hits and to the trajectory state inline ConstRecHitPointer const& hitA() const { return measA_.recHit(); } diff --git a/CalibTracker/SiStripHitResolution/src/HitResol.cc b/CalibTracker/SiStripHitResolution/src/HitResol.cc index 16437e3d2a8cf..02c4833313ffc 100644 --- a/CalibTracker/SiStripHitResolution/src/HitResol.cc +++ b/CalibTracker/SiStripHitResolution/src/HitResol.cc @@ -442,9 +442,9 @@ void HitResol::analyze(const edm::Event& e, const edm::EventSetup& es) { reso->Fill(); } } //itTraj2 != TMeas.end() - } //hit1->isValid().... - } // itm - } // it + } //hit1->isValid().... + } // itm + } // it } void HitResol::endJob() { diff --git a/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc b/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc index 9f2bafdb5dc26..a6b3cef172e23 100644 --- a/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc +++ b/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc @@ -20,7 +20,7 @@ namespace sistrip { vMethods(conf.getParameter >("Methods")), tTopoToken_(esConsumes()) {} - EnsembleCalibrationLA::~EnsembleCalibrationLA(){}; + EnsembleCalibrationLA::~EnsembleCalibrationLA() {} void EnsembleCalibrationLA::endJob() { Book book("la_ensemble"); diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc index 148db5be79083..d295875dab308 100644 --- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc +++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc @@ -435,7 +435,7 @@ void SiStripLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS throw cms::Exception("SiStripLorentzAnglePCLHarvester") << "Trying to fill an inexistent module location from " << loc.second << "!"; } // - } // ends loop on location types + } // ends loop on location types // book the TkDetMaps const auto tkDetMapFolderIn = (fmt::format("{}Harvesting/TkDetMaps_LAInput", dqmDir_)); diff --git a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h index baa9cdd77394d..b926273102397 100644 --- a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h +++ b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h @@ -77,7 +77,7 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy { const SiStripQuality*); struct pHisto { - pHisto() : _NEntries(0), _NBins(0){}; + pHisto() : _NEntries(0), _NBins(0) {} TH1F* _th1f; int _NEntries; int _NBins; diff --git a/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h index 1b2906c65f54f..230a54068d5c9 100644 --- a/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h +++ b/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h @@ -72,7 +72,7 @@ class SiStripHotStripAlgorithmFromClusterOccupancy { private: struct pHisto { - pHisto() : _NEntries(0), _NEmptyBins(0), _SubdetId(0){}; + pHisto() : _NEntries(0), _NEmptyBins(0), _SubdetId(0) {} TH1F* _th1f; int _NEntries; int _NEmptyBins; diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc index ebb3c0a177d1f..fb9d9c0a0a1ca 100644 --- a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc +++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc @@ -167,7 +167,8 @@ void SiStripQualityHotStripIdentifier::resetHistos() { void SiStripQualityHotStripIdentifier::bookHistos() { edm::LogInfo("SiStripQualityHotStripIdentifier") << " [SiStripQualityHotStripIdentifier::bookHistos] " << std::endl; char hname[1024]; - for (const auto& it : SiStripDetInfoFileReader::read(fp_.fullPath()).getAllData()) { + const SiStripDetInfo& info = SiStripDetInfoFileReader::read(fp_.fullPath()); + for (const auto& it : info.getAllData()) { sprintf(hname, "h_%d", it.first); auto ref = ClusterPositionHistoMap.find(it.first); if (ref == ClusterPositionHistoMap.end()) { diff --git a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc index 86ba4d48d4c8e..ef4f72bb734c2 100644 --- a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc +++ b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc @@ -520,7 +520,7 @@ void SelectedElectronFEDListProducer::produce(edm::Event& iEvent, c fedList_.push_back(hitFED); } } // end endcap - } // end loop on SC hit + } // end loop on SC hit // check HCAL behind each hit if (dumpSelectedHCALFed_) { @@ -552,7 +552,7 @@ void SelectedElectronFEDListProducer::produce(edm::Event& iEvent, c } } } // End Hcal - } // End Ecal + } // End Ecal // get the electron track if (!dumpAllTrackerFed_) { @@ -635,10 +635,10 @@ void SelectedElectronFEDListProducer::produce(edm::Event& iEvent, c } } } // end tracker analysis - } // end loop on the electron candidate - } // end loop on the electron collection collection - } // end loop on the recoEcal candidate - } // end loop on the recoEcal candidate collection + } // end loop on the electron candidate + } // end loop on the electron collection collection + } // end loop on the recoEcal candidate + } // end loop on the recoEcal candidate collection // add a set of chosen FED for (unsigned int iFed = 0; iFed < addThisSelectedFEDs_.size(); iFed++) { if (addThisSelectedFEDs_.at(iFed) == -1) diff --git a/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h b/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h index 06a1b911b35ac..110c1efde282a 100644 --- a/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h +++ b/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h @@ -49,7 +49,7 @@ class Pi0FixedMassWindowCalibration : public edm::ESProducerLooper { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); /// Dummy implementation (job done in duringLoop) - virtual void produce(edm::Event&, const edm::EventSetup&){}; + virtual void produce(edm::Event&, const edm::EventSetup&) {} /// Called at beginning of job void beginOfJob() override; diff --git a/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h b/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h index 3a04d0ab3b1bb..4a1f1842ce5fa 100644 --- a/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h +++ b/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h @@ -13,9 +13,9 @@ class VEcalCalibBlock { public: //! ctor - VEcalCalibBlock(int numberOfElements) : m_numberOfElements(numberOfElements){}; + VEcalCalibBlock(int numberOfElements) : m_numberOfElements(numberOfElements) {} //! dtor - virtual ~VEcalCalibBlock(){}; + virtual ~VEcalCalibBlock() {} //! insert an entry virtual void Fill(std::map::const_iterator, diff --git a/Calibration/EcalCalibAlgos/interface/VFillMap.h b/Calibration/EcalCalibAlgos/interface/VFillMap.h index 4cabe6323eeeb..5a0867aa32204 100644 --- a/Calibration/EcalCalibAlgos/interface/VFillMap.h +++ b/Calibration/EcalCalibAlgos/interface/VFillMap.h @@ -22,7 +22,7 @@ class VFillMap { EcalIntercalibConstantMap *); //!dtor - virtual ~VFillMap(){}; + virtual ~VFillMap() {} //! The Map filler virtual void fillMap(const std::vector > &, const DetId, diff --git a/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h b/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h index 9e78f35854233..5ab4bd3fa39fa 100644 --- a/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h +++ b/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h @@ -74,7 +74,7 @@ class ZeeCalibration : public edm::ESProducerLooper { ~ZeeCalibration() override; /// Dummy implementation (job done in duringLoop) - virtual void produce(edm::Event&, const edm::EventSetup&){}; + virtual void produce(edm::Event&, const edm::EventSetup&) {} /// Called at beginning of job void beginOfJob() override; diff --git a/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc b/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc index d0b302cf42b9f..94d85a3b0bf99 100644 --- a/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc +++ b/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc @@ -69,7 +69,7 @@ struct ConfigCache { class EcalPhiSymRecHitProducerBase { public: explicit EcalPhiSymRecHitProducerBase(const edm::ParameterSet& pSet, edm::ConsumesCollector&& cc); - ~EcalPhiSymRecHitProducerBase(){}; + ~EcalPhiSymRecHitProducerBase() {} //---methods // job @@ -372,7 +372,7 @@ class EcalPhiSymRecHitProducerLumi : public edm::global::EDProducer globalBeginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override; - void globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override{}; + void globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override {} std::shared_ptr globalBeginLuminosityBlockSummary(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override; void globalEndLuminosityBlockSummary(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup, - PhiSymCache* cache) const override{}; + PhiSymCache* cache) const override {} void globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumi, edm::EventSetup const& setup, PhiSymCache const* cache) const override; @@ -504,7 +504,7 @@ class EcalPhiSymRecHitProducerRun : public edm::global::EDProducer globalBeginRun(edm::Run const& run, edm::EventSetup const& setup) const override; std::shared_ptr globalBeginRunSummary(edm::Run const& run, edm::EventSetup const& setup) const override; - void globalEndRun(edm::Run const& run, edm::EventSetup const& setup) const override{}; - void globalEndRunSummary(edm::Run const& run, edm::EventSetup const& setup, PhiSymCache* cache) const override{}; + void globalEndRun(edm::Run const& run, edm::EventSetup const& setup) const override {} + void globalEndRunSummary(edm::Run const& run, edm::EventSetup const& setup, PhiSymCache* cache) const override {} void globalEndRunProduce(edm::Run& run, edm::EventSetup const& setup, PhiSymCache const* cache) const override; // stream std::unique_ptr beginStream(edm::StreamID stream) const override; diff --git a/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc b/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc index f3bb31fdb3755..96edf2beb5d7c 100644 --- a/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc +++ b/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc @@ -127,8 +127,8 @@ void EcalGeomPhiSymHelper::setup(const CaloGeometry* geometry, const EcalChannel } //sign } //if - } //ix - } //iy + } //ix + } //iy meanCellArea_[ring] /= nRing_[ring]; @@ -148,9 +148,9 @@ void EcalGeomPhiSymHelper::setup(const CaloGeometry* geometry, const EcalChannel if (cellPhi_[ix][iy] < phimin && cellPhi_[ix][iy] > philast) { phimin = cellPhi_[ix][iy]; } //if edges - } //if ring - } //iy - } //ix + } //if ring + } //iy + } //ix phi_endc_[ip][ring] = phimin; philast = phimin; } //ip diff --git a/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc b/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc index 543a5554440cb..29c32ebc50a8a 100644 --- a/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc +++ b/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc @@ -62,7 +62,7 @@ void IMACalibBlock::complete() { aft = (j * m_numberOfElements + i); m_kaliMatrix.at(aft) = m_kaliMatrix.at(bef); } //LP second loop over xtals - } //LP first loop over xtals + } //LP first loop over xtals return; } diff --git a/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc b/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc index fbbf6fee60c54..35e3e43ddc647 100644 --- a/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc +++ b/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc @@ -609,7 +609,7 @@ edm::EDLooper::Status Pi0FixedMassWindowCalibration::duringLoop(const edm::Event } } // End of the "j" loop over BCEB - } // End of the "i" loop over BCEB + } // End of the "i" loop over BCEB } else { cout << " Not enough ECAL Barrel Basic Clusters: " << nIslandBCEB << endl; diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc index b98c55fc120b8..377fa1e7497c5 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc @@ -924,7 +924,7 @@ void AlCaHOCalibProducer::fillHOStore(const reco::TrackRef& ncosm, Noccu++; hostore->push_back(tmpHOCalib); } // if (ipath) - } // Cut on calo energy + } // Cut on calo energy } void AlCaHOCalibProducer::findHOEtaPhi(int iphisect, int& ietaho, int& iphiho) { diff --git a/Calibration/HcalCalibAlgos/interface/TCell.h b/Calibration/HcalCalibAlgos/interface/TCell.h index e5420dc221156..ce0a79ff1f6c4 100644 --- a/Calibration/HcalCalibAlgos/interface/TCell.h +++ b/Calibration/HcalCalibAlgos/interface/TCell.h @@ -22,7 +22,7 @@ class TCell : public TObject { _id = 0; _e = 0.0; } - ~TCell() override{}; + ~TCell() override {} TCell(UInt_t i, Float_t e) { _id = i; _e = e; diff --git a/Calibration/HcalCalibAlgos/macros/CalibCorr.C b/Calibration/HcalCalibAlgos/macros/CalibCorr.C index 1a056ac43ee6e..e271f4010a419 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibCorr.C +++ b/Calibration/HcalCalibAlgos/macros/CalibCorr.C @@ -34,6 +34,17 @@ // double getCorr(entry): Entry # (in the file) dependent correction // bool absent(entry) : if correction factor absent // bool present(entry): or present (relevant for ML motivated) +// double getPhiCorr(unsigned int id): correction factor from phi +// symmery studies +// double getPhiCorrs(int run, unsigned int id): era-dependent correction +// factor from phi symmetry studies +// *infile* is the name of the input file +// *flag* can have a value between 0:5 specifying the type of correction +// 5 for run-dependent correctons using results from several phi +// symmetry studies; 4 for using results from one phi-symmetry +// study; 3 for pileup correction using machine learning method; +// 2 for overall response corrections; 1 for depth dependence +// corrections; 0 for raddam corrections) // CalibSelectRBX(rbxFile, debug) // A class for selecting a given set of Read Out Box's and provides // bool isItRBX(detId): if it/they is in the chosen RBXs @@ -42,12 +53,17 @@ // A class for either rejecting duplicate entries or giving depth // dependent weight. flag is 0 for keeping a list of duplicate // emtries; 1 is to keep depth dependent weight for each ieta; -// 2 is to keep a list of ieta, iphi for channels to be selected. +// 2 is to keep a list of ieta, iphi for channels to be selected; +// 3 is to read the gain correction file // bool isDuplicate(entry): if it is a duplicate entry // double getWeight(ieta, depth): get the dependent weight // bool select(int ieta, int iphi): channels to be selected +// double getCorr(int run, int ieta, int depth): correction factor +// to modify the rechit energy due to change in gain fctor // void CalibCorrTest(infile, flag) // Tests a file which contains correction factors used by CalibCorr +// if *flag* is >= 0; for negative values it initializes CalibDuplicate +// with -flag and *debug* = tue // void CalibCorrScale(infile, oufile, scale) // Scales all contents of correction factors by "scale" from "infile" // to "outfile" @@ -591,16 +607,19 @@ public: double getCorr(const Long64_t& entry); double getTrueCorr(const Long64_t& entry); double getPhiCorr(unsigned int id); + double getPhiCorrs(int run, unsigned int id); bool absent(const Long64_t& entry); bool absent() { return (good_ == 0); } bool present(const Long64_t& entry); private: + unsigned int runId(const int& run); unsigned int readCorrRun(const char* infile); unsigned int readCorrDepth(const char* infile); unsigned int readCorrResp(const char* infile); unsigned int readCorrPU(const char* infile); unsigned int readCorrPhi(const char* infile); + unsigned int readCorrPhis(const char* infile); unsigned int getDetIdHE(int ieta, int iphi, int depth); unsigned int getDetId(int subdet, int ieta, int iphi, int depth); unsigned int correctDetId(const unsigned int& detId); @@ -613,6 +632,8 @@ private: std::map cfactors_; std::vector runlow_; std::map corrPhiSym_; + std::vector > runs_, ids_; + std::map, double> corrPhiSyms_; }; class CalibSelectRBX { @@ -636,15 +657,22 @@ public: bool isDuplicate(long entry); double getWeight(const unsigned int); - bool doCorr() { return ((flag_ == 1) && ok_); } + bool doCorr() { return (((flag_ == 1) || (flag_ == 3)) && ok_); } + bool doCorr(int flag) { return ((flag_ == flag) && ok_); } bool select(int ieta, int iphi); + double getCorr(int run, int ieta, int depth); private: + bool readCorrFactor(const char* fName); + unsigned int runId(const int& run); + int flag_; double debug_, ok_; std::vector entries_; std::map > weights_; std::vector > etaphi_; + std::vector > runs_, ids_; + std::map, std::vector > corrs_; }; CalibCorrFactor::CalibCorrFactor(const char* infile, int useScale, double scale, bool etamax, bool marina, bool debug) @@ -758,6 +786,8 @@ CalibCorr::CalibCorr(const char* infile, int flag, bool debug) : flag_(flag), de good_ = readCorrPU(infile); else if (flag == 4) good_ = readCorrPhi(infile); + else if (flag == 5) + good_ = readCorrPhis(infile); else good_ = readCorrRun(infile); } @@ -776,9 +806,9 @@ float CalibCorr::getCorr(int run, unsigned int id) { if (itr != corrFacResp_.end()) cfac = itr->second; } else if (flag_ == 4) { - std::map::iterator itr = corrPhiSym_.find(idx); - if (itr != corrPhiSym_.end()) - cfac = itr->second; + cfac = getPhiCorr(idx); + } else if (flag_ == 5) { + cfac = getPhiCorrs(run, idx); } else { int ip(-1); for (unsigned int k = 0; k < runlow_.size(); ++k) { @@ -842,6 +872,24 @@ double CalibCorr::getPhiCorr(unsigned int idx) { return cfac; } +double CalibCorr::getPhiCorrs(int run, unsigned int idx) { + double cfac(1.0); + if (good_ == 0) + return cfac; + unsigned int runid = runId(run); + std::map, double>::iterator itr = + corrPhiSyms_.find(std::pair(runid, idx)); + if (itr != corrPhiSyms_.end()) + cfac = itr->second; + if (debug_) { + int subdet, zside, ieta, iphi, depth; + unpackDetId(idx, subdet, zside, ieta, iphi, depth); + std::cout << "Run " << run << " ID " << runid << ":" << std::hex << idx << std::dec << " (Sub " << subdet << " eta " + << zside * ieta << " phi " << iphi << " depth " << depth << ") Factor " << cfac << std::endl; + } + return cfac; +} + bool CalibCorr::absent(const Long64_t& entry) { return (cfactors_.find(entry) == cfactors_.end()); } bool CalibCorr::present(const Long64_t& entry) { return (cfactors_.find(entry) != cfactors_.end()); } @@ -1057,6 +1105,82 @@ unsigned int CalibCorr::readCorrPhi(const char* infile) { return good; } +unsigned int CalibCorr::readCorrPhis(const char* infile0) { + std::cout << "Enters readCorrPhis for " << infile0 << std::endl; + unsigned int all(0), good(0); + std::ifstream fIn(infile0); + if (!fIn.good()) { + std::cout << "Cannot open file " << infile0 << std::endl; + } else { + char buffer0[1024]; + while (fIn.getline(buffer0, 1024)) { + std::string bufferString0(buffer0); + if (bufferString0.substr(0, 1) == "#") { + continue; //ignore other comments + } else { + std::vector item = splitString(bufferString0); + if (item.size() > 2) { + int run1 = std::atoi(item[0].c_str()); + int run2 = std::atoi(item[1].c_str()); + std::string infile(item[2]); + unsigned int runid = runs_.size(); + runs_.push_back(std::pair(run1, run2)); + std::ifstream fInput(infile.c_str()); + if (!fInput.good()) { + std::cout << "Cannot open file " << infile << std::endl; + } else { + char buffer[1024]; + while (fInput.getline(buffer, 1024)) { + ++all; + std::string bufferString(buffer); + if (bufferString.substr(0, 1) == "#") { + continue; //ignore other comments + } else { + std::vector items = splitString(bufferString); + if (items.size() < 5) { + std::cout << "Ignore line: " << buffer << " Size " << items.size(); + for (unsigned int k = 0; k < items.size(); ++k) + std::cout << " [" << k << "] : " << items[k]; + std::cout << std::endl; + } else { + ++good; + int subdet = std::atoi(items[0].c_str()); + int ieta = std::atoi(items[1].c_str()); + int iphi = std::atoi(items[2].c_str()); + int depth = std::atoi(items[3].c_str()); + double corrf = std::atof(items[4].c_str()); + unsigned int id = packDetId(subdet, ieta, iphi, depth); + corrPhiSyms_[std::pair(runid, id)] = corrf; + if (debug_) + std::cout << "ID " << runid << ":" << std::hex << id << std::dec << ":" << id << " (subdet " + << subdet << " eta " << ieta << " phi " << iphi << " depth " << depth << ") " + << corrPhiSym_[id] << std::endl; + } + } + } + fInput.close(); + } + } + } + } + fIn.close(); + std::cout << "Reads total of " << all << " and " << good << " good records of phi-symmetry factors from " + << runs_.size() << " files as given in " << infile0 << std::endl; + } + return good; +} + +unsigned int CalibCorr::runId(const int& run) { + unsigned int id(runs_.size()); + for (unsigned int k = 0; k < runs_.size(); ++k) { + if ((run >= runs_[k].first) && (run <= runs_[k].second)) { + id = k; + break; + } + } + return id; +} + unsigned int CalibCorr::getDetIdHE(int ieta, int iphi, int depth) { return getDetId(2, ieta, iphi, depth); } unsigned int CalibCorr::getDetId(int subdet, int ieta, int iphi, int depth) { @@ -1256,6 +1380,8 @@ CalibDuplicate::CalibDuplicate(const char* fname, int flag, bool debug) : flag_( ok_ = true; } } + } else if (flag_ == 3) { + ok_ = readCorrFactor(fname); } else { flag_ = 2; if (strcmp(fname, "") != 0) { @@ -1330,16 +1456,87 @@ bool CalibDuplicate::select(int ieta, int iphi) { return flag; } +double CalibDuplicate::getCorr(int run, int ieta, int depth) { + std::map, std::vector >::const_iterator itr = + corrs_.find(std::pair(ieta, depth)); + double corr(1.0); + if (itr != corrs_.end()) { + unsigned int irun = runId(run); + corr = (itr->second)[irun]; + } + return corr; +} + +bool CalibDuplicate::readCorrFactor(const char* infile) { + bool flag(false); + std::ifstream fInput(infile); + if (!fInput.good()) { + std::cout << "CalibDuplicate::readCorrFactor:Cannot open file " << infile << std::endl; + } else { + int nrun, neta; + fInput >> nrun >> neta; + int indx, run1, run2; + for (int k = 0; k < nrun; ++k) { + fInput >> indx >> run1 >> run2; + runs_.push_back(std::pair(run1, run2)); + } + int eta, depth; + double corr; + for (int k = 0; k < neta; ++k) { + fInput >> eta >> depth; + std::vector corrs; + for (int i = 0; i < nrun; ++i) { + fInput >> corr; + corrs.push_back(corr); + } + corrs_[std::pair(eta, depth)] = corrs; + } + fInput.close(); + std::cout << "CalibDuplicate::readCorrFactor:Reads information of " << runs_.size() << " runs and " << corrs_.size() + << " channels from " << infile << std::endl; + flag = true; + if (debug_) { + for (unsigned int k = 0; k < runs_.size(); ++k) + std::cout << "Run range[" << k << "] " << runs_[k].first << ":" << runs_[k].second << std::endl; + std::map, std::vector >::const_iterator itr; + for (itr = corrs_.begin(); itr != corrs_.end(); ++itr) { + std::cout << "eta:depth [" << (itr->first).first << ":" << (itr->first).second << "]"; + for (unsigned int i = 0; i < (itr->second).size(); ++i) + std::cout << " " << (itr->second)[i]; + std::cout << std::endl; + } + } + } + return flag; +} + +unsigned int CalibDuplicate::runId(const int& run) { + unsigned int id(runs_.size()); + for (unsigned int k = 0; k < runs_.size(); ++k) { + if ((run >= runs_[k].first) && (run <= runs_[k].second)) { + id = k; + break; + } + } + return id; +} + void CalibCorrTest(const char* infile, int flag) { - CalibCorr* c1 = new CalibCorr(infile, flag, true); - for (int ieta = 1; ieta < 29; ++ieta) { - int subdet = (ieta > 16) ? 2 : 1; - int depth = (ieta > 16) ? 2 : 1; - unsigned int id1 = ((4 << 28) | ((subdet & 0x7) << 25)); - id1 |= ((0x1000000) | ((depth & 0xF) << 20) | (ieta << 10) | 1); - c1->getCorr(0, id1); - id1 |= (0x80000); - c1->getCorr(0, id1); + if (flag >= 0) { + CalibCorr* c1 = new CalibCorr(infile, flag, true); + for (int ieta = 1; ieta < 29; ++ieta) { + int subdet = (ieta > 16) ? 2 : 1; + int depth = (ieta > 16) ? 2 : 1; + unsigned int id1 = ((4 << 28) | ((subdet & 0x7) << 25)); + id1 |= ((0x1000000) | ((depth & 0xF) << 20) | (ieta << 10) | 1); + c1->getCorr(0, id1); + id1 |= (0x80000); + c1->getCorr(0, id1); + } + delete c1; + } else { + CalibDuplicate* c1 = new CalibDuplicate(infile, -flag, true); + delete c1; } } diff --git a/Calibration/HcalCalibAlgos/macros/CalibMain.C b/Calibration/HcalCalibAlgos/macros/CalibMain.C index d479a301ac3cd..2cb8862ba5878 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibMain.C +++ b/Calibration/HcalCalibAlgos/macros/CalibMain.C @@ -30,7 +30,7 @@ // // Other parameters for CalibSplit: // -// +// // // //////////////////////////////////////////////////////////////////////////////// @@ -371,8 +371,10 @@ int main(Int_t argc, Char_t* argv[]) { // CalibSplit double pmin = (argc > 10) ? std::atof(argv[10]) : 40.0; double pmax = (argc > 11) ? std::atof(argv[11]) : 60.0; - bool debug = (argc > 12) ? (std::atoi(argv[12]) > 0) : false; - CalibSplit c1(infile, dirname, histfile, pmin, pmax, debug); + int runMin = (argc > 12) ? std::atoi(argv[12]) : -1; + int runMax = (argc > 13) ? std::atoi(argv[13]) : -1; + bool debug = (argc > 14) ? (std::atoi(argv[14]) > 0) : false; + CalibSplit c1(infile, dirname, histfile, pmin, pmax, runMin, runMax, debug); c1.Loop(nmax); } return 0; diff --git a/Calibration/HcalCalibAlgos/macros/CalibMonitor.C b/Calibration/HcalCalibAlgos/macros/CalibMonitor.C index c39ba3262be10..b1fb65e41eb73 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibMonitor.C +++ b/Calibration/HcalCalibAlgos/macros/CalibMonitor.C @@ -27,6 +27,7 @@ // (use "HcalIsoTrkAnalyzer") // dupFileName (char*) = name of the file containing list of entries // of duplicate events or depth dependent weights +// or weights coming due to change in gains // (driven by flag) // comFileName (char*) = name of the file with list of run and event // number to be selected @@ -40,7 +41,7 @@ // rcorFileName (char*) = name of the text file having the correction // factors as a function of run numbers or depth // or entry number to be used for raddam/depth/ -// pileup/phisym dependent correction +// pileup/phisym/phisym(s) dependent correction // (default="", no correction) // puCorr (int) = PU correction to be applied or not: 0 no // correction; < 0 use eDelta; > 0 rho dependent @@ -48,14 +49,18 @@ // flag (int) = 8 digit integer (xymlthdo) with control // information (x=3/2/1/0 for having 1000/500/50/ // 100 bins for response distribution in (0:5); -// y=2/1/0 containing list of ieta, iphi of -// channels to be selected (2); list containing -// depth dependent weights for each ieta (1); -// list of duplicate entries (0) in dupFileName; +// y=3/2/1/0 containing list of run ranges and +// ieta, depth for gain changes (3): list of +// ieta, iphi of channels to be selected (2); +// list containing depth dependent weights for +// each ieta (1); list of duplicate entries (0) +// in the dupFileName; // m=1/0 for (not) making plots for each RBX; -// l=4/3/2/1/0 for type of rcorFileName (4 for -// using results from phi-symmetry; 3 for -// pileup correction using machine learning +// l=5/4/3/2/1/0 for type of rcorFileName (5 +// for run-dependent correctons using results +// from several phi symmetry studies; 4 for +// using results from one phi-symmetry study; +// 3 for pileup correction using machine learning // method; 2 for overall response corrections; // 1 for depth dependence corrections; // 0 for raddam corrections); @@ -1156,8 +1161,13 @@ void CalibMonitor::Loop(Long64_t nmax, bool debug) { } if ((cFactor_ != nullptr) && (ifDepth_ != 3) && (ifDepth_ > 0)) cfac *= cFactor_->getCorr(t_Run, (*t_DetIds)[k]); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) cfac *= cDuplicate_->getWeight((*t_DetIds)[k]); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds)[k], subdet, zside, ieta, iphi, depth); + cfac *= cDuplicate_->getCorr(t_Run, ieta, depth); + } eHcal += (cfac * ((*t_HitEnergies)[k])); if (debug) { int subdet, zside, ieta, iphi, depth; @@ -1757,8 +1767,13 @@ void CalibMonitor::correctEnergy(double &eHcal, const Long64_t &entry) { double cfac = corrFactor_->getCorr(id); if ((cFactor_ != 0) && (ifDepth_ != 3) && (ifDepth_ > 0)) cfac *= cFactor_->getCorr(t_Run, (*t_DetIds1)[idet]); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) cfac *= cDuplicate_->getWeight((*t_DetIds1)[idet]); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds1)[idet], subdet, zside, ieta, iphi, depth); + cfac *= cDuplicate_->getCorr(t_Run, ieta, depth); + } double hitEn = cfac * (*t_HitEnergies1)[idet]; Etot1 += hitEn; } @@ -1771,8 +1786,13 @@ void CalibMonitor::correctEnergy(double &eHcal, const Long64_t &entry) { double cfac = corrFactor_->getCorr(id); if ((cFactor_ != 0) && (ifDepth_ != 3) && (ifDepth_ > 0)) cfac *= cFactor_->getCorr(t_Run, (*t_DetIds3)[idet]); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) cfac *= cDuplicate_->getWeight((*t_DetIds3)[idet]); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds3)[idet], subdet, zside, ieta, iphi, depth); + cfac *= cDuplicate_->getCorr(t_Run, ieta, depth); + } double hitEn = cfac * (*t_HitEnergies3)[idet]; Etot3 += hitEn; } diff --git a/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C b/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C index 9eb328b8a7ed8..b6834a5079929 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C +++ b/Calibration/HcalCalibAlgos/macros/CalibPlotProperties.C @@ -22,7 +22,7 @@ // pLow and pHigh and save the canvases // // .L CalibPlotProperties.C+g -// CalibSplit c1(fname, dirname, outFileName, pmin, pmax, debug); +// CalibSplit c1(fname, dirname, outFileName, pmin, pmax, runMin, runMax, debug); // c1.Loop(nentries); // // This will split the tree and keep for tacks with momenta between @@ -36,26 +36,33 @@ // dirname (const char*) = name of the directory where Tree resides // (use "HcalIsoTrkAnalyzer") // dupFileName (const char*) = name of the file containing list of entries -// of duplicate events +// of duplicate events or depth dependent weights +// or weights coming due to change in gains +// (driven by flag) // prefix (std::string) = String to be added to the name of histogram // (usually a 4 character string; default="") // corrFileName (const char*)= name of the text file having the correction // factors to be used (default="", no corr.) // rcorFileName (const char*)= name of the text file having the correction // factors as a function of run numbers or depth -// to be used for raddam/depth/pileup/phisym -// dependent correction (default="", no corr.) +// to be used for raddam/depth/pileup/phisym/ +// phisym(s) dependent correction +// (default="", no corr.) // puCorr (int) = PU correction to be applied or not: 0 no // correction; < 0 use eDelta; > 0 rho dependent // correction (-8) // flag (int) = 7 digit integer (ymlthdo) with control -// information (y=2/1/0 containing list of -// ieta, iphi of channels to be selected (2); -// list containing depth dependent weights for -// each ieta (1); list of duplicate entries -// (0) in dupFileName; m=0/1 for controlling -// creation of depth depedendent histograms; -// l=4/3/2/1/0 for type of rcorFileName (4 for +// information (y=3/2/1/0 containing list of +// run ranges and ieta, depth for gain changes +// (3): list of ieta, iphi of channels to be +// selected (2); list containing depth dependent +// weights for each ieta (1); list of duplicate +// entries (0) in the dupFileName; +// m=0/1 for controlling creation of depth +// depedendent histograms; +// l=5/4/3/2/1/0 for type of rcorFileName ((5 +// for run-dependent correctons using results +// from several phi symmetry studies; 4 for // using results from phi-symmetry; 3 for // pileup correction using machine learning // method; 2 for overall response corrections; @@ -138,6 +145,8 @@ // outFileName (std::string)= name of the file containing saved tree // pmin (double) = minimum track momentum (40.0) // pmax (double) = maximum track momentum (60.0) +// runMin (int) = minimum run number (-1) | if -1, no check on +// runMax (int) = maximum run number (-1) | run number not done // debug (bool) = debug flag (false) ////////////////////////////////////////////////////////////////////////////// #include @@ -918,8 +927,13 @@ void CalibPlotProperties::Loop(Long64_t nentries) { double cfac = corrFactor_->getCorr(id); if ((cFactor_ != 0) && (ifDepth_ != 3) && (ifDepth_ > 0)) cfac *= cFactor_->getCorr(t_Run, (*t_DetIds)[k]); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) cfac *= cDuplicate_->getWeight((*t_DetIds)[k]); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds)[k], subdet, zside, ieta, iphi, depth); + cfac *= cDuplicate_->getCorr(t_Run, ieta, depth); + } eHcal += (cfac * ((*t_HitEnergies)[k])); if (debug) { int subdet, zside, ieta, iphi, depth; @@ -1013,8 +1027,13 @@ void CalibPlotProperties::Loop(Long64_t nentries) { double cfac = corrFactor_->getCorr(id); if ((cFactor_ != 0) && (ifDepth_ != 3) && (ifDepth_ > 0)) cfac *= cFactor_->getCorr(t_Run, (*t_DetIds)[k]); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) cfac *= cDuplicate_->getWeight((*t_DetIds)[k]); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds)[k], subdet, zside, ieta, iphi, depth); + cfac *= cDuplicate_->getCorr(t_Run, ieta, depth); + } double ener = cfac * (*t_HitEnergies)[k]; if (corrPU_) correctEnergy(ener); @@ -1242,8 +1261,13 @@ void CalibPlotProperties::correctEnergy(double &eHcal) { double cfac = corrFactor_->getCorr(id); if ((cFactor_ != 0) && (ifDepth_ != 3) && (ifDepth_ > 0)) cfac *= cFactor_->getCorr(t_Run, (*t_DetIds1)[idet]); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) cfac *= cDuplicate_->getWeight((*t_DetIds1)[idet]); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds1)[idet], subdet, zside, ieta, iphi, depth); + cfac *= cDuplicate_->getCorr(t_Run, ieta, depth); + } double hitEn = cfac * (*t_HitEnergies1)[idet]; Etot1 += hitEn; } @@ -1256,8 +1280,13 @@ void CalibPlotProperties::correctEnergy(double &eHcal) { double cfac = corrFactor_->getCorr(id); if ((cFactor_ != 0) && (ifDepth_ != 3) && (ifDepth_ > 0)) cfac *= cFactor_->getCorr(t_Run, (*t_DetIds3)[idet]); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) cfac *= cDuplicate_->getWeight((*t_DetIds)[idet]); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds3)[idet], subdet, zside, ieta, iphi, depth); + cfac *= cDuplicate_->getCorr(t_Run, ieta, depth); + } double hitEn = cfac * (*t_HitEnergies3)[idet]; Etot3 += hitEn; } @@ -1812,6 +1841,8 @@ public: const std::string &outFileName, double pmin = 40.0, double pmax = 60.0, + int runMin = -1, + int runMax = -1, bool debug = false); virtual ~CalibSplit(); virtual Int_t Cut(Long64_t entry); @@ -1827,23 +1858,34 @@ public: private: const std::string fname_, dirnm_, outFileName_; const double pmin_, pmax_; + const int runMin_, runMax_; const bool debug_; + bool checkRun_; TFile *outputFile_; TDirectoryFile *outputDir_; TTree *outputTree_; }; -CalibSplit::CalibSplit( - const char *fname, const std::string &dirnm, const std::string &outFileName, double pmin, double pmax, bool debug) +CalibSplit::CalibSplit(const char *fname, + const std::string &dirnm, + const std::string &outFileName, + double pmin, + double pmax, + int runMin, + int runMax, + bool debug) : fname_(fname), dirnm_(dirnm), outFileName_(outFileName), pmin_(pmin), pmax_(pmax), + runMin_(runMin), + runMax_(runMax), debug_(debug), outputFile_(nullptr), outputDir_(nullptr), outputTree_(nullptr) { + checkRun_ = ((runMin_ < 0) || (runMax_ < 0)) ? false : true; char treeName[400]; sprintf(treeName, "%s/CalibTree", dirnm.c_str()); TChain *chain = new TChain(treeName); @@ -2075,6 +2117,10 @@ void CalibSplit::Loop(Long64_t nentries) { std::cout << "Entry " << jentry << " Run " << t_Run << " Event " << t_Event << std::endl; ++kount; bool select = ((t_p >= pmin_) && (t_p < pmax_)); + if (select && checkRun_) { + if ((t_Run < runMin_) || (t_Run > runMax_)) + select = false; + } if (!select) { ++reject; if (debug_) diff --git a/Calibration/HcalCalibAlgos/macros/CalibTree.C b/Calibration/HcalCalibAlgos/macros/CalibTree.C index 786cc0add83cf..128ee12ea4db6 100644 --- a/Calibration/HcalCalibAlgos/macros/CalibTree.C +++ b/Calibration/HcalCalibAlgos/macros/CalibTree.C @@ -74,11 +74,13 @@ // (1) for depth dependent corrections; (2) for // RespCorr corrections; (3) use machine learning // method for pileup correction; (4) use results -// from phi-symmetry. +// from phi-symmetry; (5) use reults from several +// phi-symmetry studies drive by run numeber. // For dupFileName d: (0) contains list of // duplicate entries; (1) depth dependent weights; // (2) list of (ieta, iphi) of channels to be -// selected. +// selected; (3) list of run ranges and for each +// range, ieta, depth where gain has changed. // For threshold h: the format for threshold // application, 0: no threshold; 1: 2022 prompt // data; 2: 2022 reco data; 3: 2023 prompt data. @@ -858,8 +860,13 @@ Double_t CalibTree::Loop(int loop, hitEn = (*t_HitEnergies)[idet]; if ((rcorForm_ != 3) && (rcorForm_ >= 0) && (cFactor_)) hitEn *= cFactor_->getCorr(t_Run, id); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) hitEn *= cDuplicate_->getWeight(id); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds)[idet], subdet, zside, ieta, iphi, depth); + hitEn *= cDuplicate_->getCorr(t_Run, ieta, depth); + } double Wi = evWt * hitEn / en.Etot; double Fac = (inverse) ? (en.ehcal / (pmom - t_eMipDR)) : ((pmom - t_eMipDR) / en.ehcal); double Fac2 = Wi * Fac * Fac; @@ -1480,8 +1487,13 @@ CalibTree::energyCalor CalibTree::energyHcal(double pmom, const Long64_t &entry, hitEn = (*t_HitEnergies)[idet]; if ((rcorForm_ != 3) && (rcorForm_ >= 0) && (cFactor_)) hitEn *= cFactor_->getCorr(t_Run, id); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) hitEn *= cDuplicate_->getWeight(id); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds)[idet], subdet, zside, ieta, iphi, depth); + hitEn *= cDuplicate_->getCorr(t_Run, ieta, depth); + } etot += hitEn; etot2 += ((*t_HitEnergies)[idet]); } @@ -1502,8 +1514,13 @@ CalibTree::energyCalor CalibTree::energyHcal(double pmom, const Long64_t &entry, hitEn = (*t_HitEnergies1)[idet]; if ((rcorForm_ != 3) && (rcorForm_ >= 0) && (cFactor_)) hitEn *= cFactor_->getCorr(t_Run, id); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(1))) hitEn *= cDuplicate_->getWeight(id); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds1)[idet], subdet, zside, ieta, iphi, depth); + hitEn *= cDuplicate_->getCorr(t_Run, ieta, depth); + } etot1 += hitEn; } } @@ -1520,8 +1537,13 @@ CalibTree::energyCalor CalibTree::energyHcal(double pmom, const Long64_t &entry, hitEn = (*t_HitEnergies3)[idet]; if ((rcorForm_ != 3) && (rcorForm_ >= 0) && (cFactor_)) hitEn *= cFactor_->getCorr(t_Run, id); - if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr())) + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) hitEn *= cDuplicate_->getWeight(id); + if ((cDuplicate_ != nullptr) && (cDuplicate_->doCorr(3))) { + int subdet, zside, ieta, iphi, depth; + unpackDetId((*t_DetIds3)[idet], subdet, zside, ieta, iphi, depth); + hitEn *= cDuplicate_->getCorr(t_Run, ieta, depth); + } etot3 += hitEn; } } diff --git a/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc b/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc index 8d5f00804114d..d812734332fee 100644 --- a/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc @@ -282,8 +282,8 @@ namespace cms { hCalo2mom2[i][j] = fs->make(str11, "h11", 320, 0., 120.); } } // HE/HF boundary - } // j - } // i + } // j + } // i hbheNoiseE = fs->make("hbheNoiseE", "hbheNoiseE", 320, -10., 10.); hfNoiseE = fs->make("hfNoiseE", "hfNoiseE", 320, -10., 10.); @@ -392,10 +392,10 @@ namespace cms { ii++; } // Min>0 - } // ieta - } // iphi - } // depth - } //subd + } // ieta + } // iphi + } // depth + } //subd edm::LogVerbatim("AnalyzerMB") << " Number of cells " << ii; diff --git a/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc b/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc index e5f5757a2cc26..a2b81b36a6113 100644 --- a/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc @@ -43,8 +43,8 @@ class SimAnalyzerMinbias : public edm::one::EDAnalyzer>::const_iterator ith = hfreco->begin(); @@ -823,12 +823,12 @@ void DiJetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& evS tpfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } } // Test if ieta,iphi match - } // Loop over rechits - } // Loop over hits - } // Test if element is HO - } // Test for right element index - } // Loop over elements - } // Loop over elements in blocks + } // Loop over rechits + } // Loop over hits + } // Test if element is HO + } // Test for right element index + } // Loop over elements + } // Loop over elements in blocks switch (candidateType) { case reco::PFCandidate::h_HF: @@ -1085,10 +1085,10 @@ void DiJetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& evS } ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } - } // Test if ieta,iphi matches - } // Loop over rechits - } // Loop over hits - } // Test if element is from HCAL + } // Test if ieta,iphi matches + } // Loop over rechits + } // Loop over hits + } // Test if element is from HCAL else if (elements[iEle].type() == reco::PFBlockElement::HFHAD) { // Element is HF for (edm::SortedCollection>::const_iterator ith = hfreco->begin(); @@ -1238,12 +1238,12 @@ void DiJetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& evS ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } } // Test if ieta,iphi match - } // Loop over rechits - } // Loop over hits - } // Test if element is from HO - } // Test for right element index - } // Loop over elements - } // Loop over elements in blocks + } // Loop over rechits + } // Loop over hits + } // Test if element is from HO + } // Test for right element index + } // Loop over elements + } // Loop over elements in blocks switch (candidateType) { case reco::PFCandidate::h_HF: ppfjet_had_emf_.push_back(HFEM_E / (HFEM_E + HFHAD_E)); diff --git a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc index fe8676a990161..22b1eaf140001 100644 --- a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc +++ b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc @@ -1459,10 +1459,10 @@ void GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& } ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } - } // Test if ieta,iphi matches - } // Loop over rechits - } // Loop over hits - } // Test if element is from HCAL + } // Test if ieta,iphi matches + } // Loop over rechits + } // Loop over hits + } // Test if element is from HCAL else if (elements[iEle].type() == reco::PFBlockElement::HFHAD) { // Element is HF //// h_etaHFHAD_->Fill((*it)->eta()); @@ -1623,12 +1623,12 @@ void GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } } // Test if ieta,iphi match - } // Loop over rechits - } // Loop over hits - } // Test if element is from HO - } // Test for right element index - } // Loop over elements - } // Loop over elements in blocks + } // Loop over rechits + } // Loop over hits + } // Test if element is from HO + } // Test for right element index + } // Loop over elements + } // Loop over elements in blocks switch (candidateType) { case reco::PFCandidate::h_HF: ppfjet_had_emf_.push_back(HFEM_E / (HFEM_E + HFHAD_E)); diff --git a/Calibration/IsolatedParticles/interface/CaloSimInfo.icc b/Calibration/IsolatedParticles/interface/CaloSimInfo.icc index 78c3f95d33b85..f7307b9bb1fe6 100644 --- a/Calibration/IsolatedParticles/interface/CaloSimInfo.icc +++ b/Calibration/IsolatedParticles/interface/CaloSimInfo.icc @@ -680,8 +680,8 @@ namespace spr { if (debug) edm::LogVerbatim("IsoTrack") << "Hit " << ihit << ": " << *hit[ihit]; } // else condition, i.e. (hit[ihit]->geantTrackId() != (int)matchSimTrk ) - } // loop over hits - } // if (trkInfo != SimTk->end()) + } // loop over hits + } // if (trkInfo != SimTk->end()) double energyTot = energySum + energyGamma + energyNeutral + energyCharged + energyRest; multiplicityVector.push_back(uniqueIds_matched.size()); diff --git a/Calibration/IsolatedParticles/interface/eECALMatrix.icc b/Calibration/IsolatedParticles/interface/eECALMatrix.icc index 8a57d5931d8f9..35c4fac9ee137 100644 --- a/Calibration/IsolatedParticles/interface/eECALMatrix.icc +++ b/Calibration/IsolatedParticles/interface/eECALMatrix.icc @@ -126,7 +126,7 @@ namespace spr { } } // iphi - } // ieta + } // ieta } template diff --git a/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc b/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc index 14fc021645e4c..8cc59cdf97272 100644 --- a/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc +++ b/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc @@ -419,8 +419,8 @@ void IsoTrackCalibration::analyze(const edm::Event &iEvent, const edm::EventSetu } tree->Fill(); } // end of conditions on t_eMipDR and t_hmaxNearP - } // end of loose check of track quality - } // end of loop over tracks + } // end of loose check of track quality + } // end of loop over tracks h_nTrk->Fill(nTracks); } // end of triggerOK diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc index 9363fde7f1ca7..742a9cec9ae52 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc @@ -462,7 +462,7 @@ void IsolatedGenParticles::analyze(const edm::Event &iEvent, const edm::EventSet h_L1AlgoNames->GetXaxis()->SetBinLabel(itrig + 1, algoBitToName_[itrig].c_str()); } // end of for loop - } // end of initL1 + } // end of initL1 // save L1 decision for each event for (unsigned int iBit = 0; iBit < numberTriggerBits; ++iBit) { diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc index 0aafb0b9c9440..5fa811c36c7d9 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc @@ -657,7 +657,7 @@ void IsolatedTracksNxN::analyze(const edm::Event &iEvent, const edm::EventSetup << (*recVtxs)[ind].tracksSize() << " sumPt " << vtxTrkSumPt; } } // if vtx is not Fake - } // loop over PVs + } // loop over PVs //=================================================================================== // Get the beamspot @@ -1650,8 +1650,8 @@ void IsolatedTracksNxN::analyze(const edm::Event &iEvent, const edm::EventSetup } } // if loosely isolated track - } // check p1/eta - } // loop over track collection + } // check p1/eta + } // loop over track collection if (haveIsoTrack) tree_->Fill(); diff --git a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc index 908f612b5d92b..906b5a112c434 100644 --- a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc +++ b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc @@ -1,80 +1,66 @@ /**_________________________________________________________________ class: AlcaPCCEventProducer.cc - - authors: Sam Higginbotham (shigginb@cern.ch), Chris Palmer (capalmer@cern.ch), Attila Radl (attila.radl@cern.ch) - ________________________________________________________________**/ // C++ standard #include // CMS -#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/Luminosity/interface/PixelClusterCountsInEvent.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/MakerMacros.h" +#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" #include "FWCore/Framework/interface/ConsumesCollector.h" -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/stream/EDProducer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/EDGetToken.h" -#include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/LuminosityBlock.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Framework/interface/global/EDProducer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/ServiceRegistry/interface/Service.h" +#include "FWCore/Utilities/interface/EDGetToken.h" #include "TMath.h" //The class -class AlcaPCCEventProducer : public edm::stream::EDProducer<> { +class AlcaPCCEventProducer : public edm::global::EDProducer<> { public: explicit AlcaPCCEventProducer(const edm::ParameterSet&); - ~AlcaPCCEventProducer() override; + ~AlcaPCCEventProducer() override = default; + void produce(edm::StreamID id, edm::Event& e, edm::EventSetup const& c) const final; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; + const edm::InputTag pixelClusterLabel_; + const std::string trigstring_; //specifies the trigger Rand or ZeroBias + const edm::EDGetTokenT > pixelToken_; - edm::EDGetTokenT > pixelToken; - edm::InputTag fPixelClusterLabel; - - std::string trigstring_; //specifies the trigger Rand or ZeroBias - int countEvt_; //counter - int countLumi_; //counter - - const int rowsperroc = 52; - const int colsperroc = 80; - const int nROCcolumns = 8; - - std::unique_ptr thePCCob; + static constexpr int rowsperroc = 52; + static constexpr int colsperroc = 80; + static constexpr int nROCcolumns = 8; }; //-------------------------------------------------------------------------------------------------- -AlcaPCCEventProducer::AlcaPCCEventProducer(const edm::ParameterSet& iConfig) { - fPixelClusterLabel = iConfig.getParameter("pixelClusterLabel"); - trigstring_ = iConfig.getUntrackedParameter("trigstring", "alcaPCCEvent"); +AlcaPCCEventProducer::AlcaPCCEventProducer(const edm::ParameterSet& iConfig) + : pixelClusterLabel_(iConfig.getParameter("pixelClusterLabel")), + trigstring_(iConfig.getUntrackedParameter("trigstring", "alcaPCCEvent")), + pixelToken_(consumes >(pixelClusterLabel_)) { produces(trigstring_); - pixelToken = consumes >(fPixelClusterLabel); } //-------------------------------------------------------------------------------------------------- -AlcaPCCEventProducer::~AlcaPCCEventProducer() {} - -//-------------------------------------------------------------------------------------------------- -void AlcaPCCEventProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { - countEvt_++; - thePCCob = std::make_unique(); - +void AlcaPCCEventProducer::produce(edm::StreamID id, edm::Event& iEvent, edm::EventSetup const& iSetup) const { + std::unique_ptr thePCCob = std::make_unique(); unsigned int bx = iEvent.bunchCrossing(); //Looping over the clusters and adding the counts up edm::Handle > hClusterColl; - iEvent.getByToken(pixelToken, hClusterColl); + iEvent.getByToken(pixelToken_, hClusterColl); const edmNew::DetSetVector& clustColl = *(hClusterColl.product()); // ---------------------------------------------------------------------- diff --git a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc index 77adc0f8981e6..f6b99eee911b3 100644 --- a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc +++ b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc @@ -66,7 +66,7 @@ class NearbyPixelClustersAnalyzer : public edm::one::EDAnalyzer bookModuleHistograms(const TrackerTopology* tTopo); std::tuple setTopoInfo(uint32_t detId, const TrackerTopology* tTopo); void endJob() override; diff --git a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc index 0411b72144457..42250ba02de6d 100644 --- a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc +++ b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc @@ -238,7 +238,7 @@ const trajCrossings_t NearbyPixelClustersProducer::findAllTrajectoriesCrossings( treatedIds.push_back(rawId); } } // loop on measurements in trajectory - } // loop on trajectories + } // loop on trajectories return crossings; } @@ -374,7 +374,7 @@ const std::vector::const_iterator> NearbyPixelClu outputClusters.push_back(closest); } } // loop on all clusters - } // loop on the trajectory crossings + } // loop on the trajectory crossings return outputClusters; } diff --git a/Calibration/Tools/interface/CalibElectron.h b/Calibration/Tools/interface/CalibElectron.h index 28f6137cca740..cc8c3cf0f379a 100644 --- a/Calibration/Tools/interface/CalibElectron.h +++ b/Calibration/Tools/interface/CalibElectron.h @@ -16,9 +16,9 @@ namespace calib { CalibElectron(const reco::GsfElectron* ele, const EcalRecHitCollection* theHits, const EcalRecHitCollection* theEEHits) - : theElectron_(ele), theHits_(theHits), theEEHits_(theEEHits){}; + : theElectron_(ele), theHits_(theHits), theEEHits_(theEEHits) {} - ~CalibElectron(){}; + ~CalibElectron() {} std::vector > getCalibModulesWeights(TString calibtype); const reco::GsfElectron* getRecoElectron() { return theElectron_; } diff --git a/Calibration/Tools/interface/DetIdAssociator.h b/Calibration/Tools/interface/DetIdAssociator.h index cfda758ba9e1b..bc6d6b553b659 100644 --- a/Calibration/Tools/interface/DetIdAssociator.h +++ b/Calibration/Tools/interface/DetIdAssociator.h @@ -31,11 +31,11 @@ class HDetIdAssociator { public: - HDetIdAssociator() : theMap_(nullptr), nPhi_(0), nEta_(0), etaBinSize_(0), ivProp_(nullptr){}; + HDetIdAssociator() : theMap_(nullptr), nPhi_(0), nEta_(0), etaBinSize_(0), ivProp_(nullptr) {} HDetIdAssociator(const int nPhi, const int nEta, const double etaBinSize) - : theMap_(nullptr), nPhi_(nPhi), nEta_(nEta), etaBinSize_(etaBinSize), ivProp_(nullptr){}; + : theMap_(nullptr), nPhi_(nPhi), nEta_(nEta), etaBinSize_(etaBinSize), ivProp_(nullptr) {} - virtual ~HDetIdAssociator(){}; + virtual ~HDetIdAssociator() {} virtual std::vector getTrajectory(const FreeTrajectoryState&, const std::vector&); // find DetIds arround given direction // idR is a number of the adjacent bins to retrieve diff --git a/Calibration/Tools/interface/EcalIndexingTools.h b/Calibration/Tools/interface/EcalIndexingTools.h index 0e8b87983955f..9c98165b1caa7 100644 --- a/Calibration/Tools/interface/EcalIndexingTools.h +++ b/Calibration/Tools/interface/EcalIndexingTools.h @@ -9,7 +9,7 @@ class EcalIndexingTools { private: EcalIndexingTools() - : totNumberOfBins_(-1), nBinsEt_(-1), nBinsEta_(-1), maxEta_(-1.), maxEt_(-1.), minEta_(-1.), minEt_(-1.){}; + : totNumberOfBins_(-1), nBinsEt_(-1), nBinsEta_(-1), maxEta_(-1.), maxEt_(-1.), minEta_(-1.), minEt_(-1.) {} static EcalIndexingTools* instance_; @@ -18,7 +18,7 @@ class EcalIndexingTools { double maxEta_, maxEt_, minEta_, minEt_; public: - ~EcalIndexingTools(){}; + ~EcalIndexingTools() {} static EcalIndexingTools* getInstance() { if (instance_ == nullptr) { diff --git a/Calibration/Tools/interface/EcalRingCalibrationTools.h b/Calibration/Tools/interface/EcalRingCalibrationTools.h index f311c2bfecca4..b5b59e231c183 100644 --- a/Calibration/Tools/interface/EcalRingCalibrationTools.h +++ b/Calibration/Tools/interface/EcalRingCalibrationTools.h @@ -22,8 +22,8 @@ class CaloGeometry; class EcalRingCalibrationTools { public: - EcalRingCalibrationTools(){}; - ~EcalRingCalibrationTools(){}; + EcalRingCalibrationTools() {} + ~EcalRingCalibrationTools() {} /// Retrieve the phi-ring index corresponding to a DetId static short getRingIndex(DetId aDetId); diff --git a/Calibration/Tools/src/EcalRingCalibrationTools.cc b/Calibration/Tools/src/EcalRingCalibrationTools.cc index d1e7b4dd50d00..42d6c8c511b64 100644 --- a/Calibration/Tools/src/EcalRingCalibrationTools.cc +++ b/Calibration/Tools/src/EcalRingCalibrationTools.cc @@ -172,8 +172,8 @@ std::vector EcalRingCalibrationTools::getDetIdsInModule(short moduleIndex // std::cout<<"Putting Xtal with ieta: "< *output, const std::string &dati) { if (buffer != -1) output->push_back(buffer); } // loop over the line - } // loop over the file + } // loop over the file return output->size(); } diff --git a/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h b/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h index 0bd1b3db4ab4b..e2287d14de316 100644 --- a/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h +++ b/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h @@ -19,8 +19,8 @@ class HcalChannelId { public: - HcalChannelId(){}; - ~HcalChannelId(){}; + HcalChannelId() {} + ~HcalChannelId() {} int eta, phi, depth; std::string subdetector; @@ -30,8 +30,8 @@ class HcalChannelId { class HcalQIECaps { public: - HcalQIECaps(){}; - ~HcalQIECaps(){}; + HcalQIECaps() {} + ~HcalQIECaps() {} // cap0 offset x 4, cap1 offset x 4... // cap0 slope x 4, cap1 slope x 4... diff --git a/CaloOnlineTools/HcalOnlineDb/interface/LMap.h b/CaloOnlineTools/HcalOnlineDb/interface/LMap.h index 6c92a29ae357a..14a595e9f884f 100644 --- a/CaloOnlineTools/HcalOnlineDb/interface/LMap.h +++ b/CaloOnlineTools/HcalOnlineDb/interface/LMap.h @@ -30,8 +30,8 @@ class LMapRow { public: - LMapRow(){}; - ~LMapRow(){}; + LMapRow() {} + ~LMapRow() {} int side; int eta, phi, dphi, depth; @@ -55,8 +55,8 @@ class LMapRow { class LMapDetId { public: - LMapDetId(){}; - ~LMapDetId(){}; + LMapDetId() {} + ~LMapDetId() {} int side; int eta, phi, depth; @@ -110,7 +110,7 @@ class EMap { zdc_channel = 0; zdc_section = "UNKNOWN"; } - ~EMapRow(){}; + ~EMapRow() {} bool operator<(const EMapRow& other) const; diff --git a/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc b/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc index 7319de22cac22..cd3e4d42ececa 100644 --- a/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc +++ b/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc @@ -49,7 +49,7 @@ class HcalLutAnalyzer : public edm::one::EDAnalyzer { public: explicit HcalLutAnalyzer(const edm::ParameterSet&); - ~HcalLutAnalyzer() override{}; + ~HcalLutAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/CommonTools/Clustering1D/interface/Clustering1DException.h b/CommonTools/Clustering1D/interface/Clustering1DException.h index d8655a340322a..7803636569899 100644 --- a/CommonTools/Clustering1D/interface/Clustering1DException.h +++ b/CommonTools/Clustering1D/interface/Clustering1DException.h @@ -9,8 +9,8 @@ class Clustering1DException : public cms::Exception { public: - Clustering1DException(const char *reason) : cms::Exception(reason){}; - Clustering1DException(const Clustering1DException &ex) : cms::Exception(ex){}; + Clustering1DException(const char *reason) : cms::Exception(reason) {} + Clustering1DException(const Clustering1DException &ex) : cms::Exception(ex) {} }; #endif diff --git a/CommonTools/Clustering1D/interface/Clusterizer1D.h b/CommonTools/Clustering1D/interface/Clusterizer1D.h index 178b83fd59992..f7c6959d94167 100644 --- a/CommonTools/Clustering1D/interface/Clusterizer1D.h +++ b/CommonTools/Clustering1D/interface/Clusterizer1D.h @@ -15,7 +15,7 @@ template class Clusterizer1D { public: - virtual ~Clusterizer1D(){}; + virtual ~Clusterizer1D() {} virtual std::pair >, std::vector > operator()( const std::vector >&) const = 0; diff --git a/CommonTools/Clustering1D/interface/WeightEstimator.h b/CommonTools/Clustering1D/interface/WeightEstimator.h index ddbece6a0cce3..d3ce7bbc2ca9d 100644 --- a/CommonTools/Clustering1D/interface/WeightEstimator.h +++ b/CommonTools/Clustering1D/interface/WeightEstimator.h @@ -14,7 +14,7 @@ class WeightEstimator { virtual double weight(const std::vector&) const = 0; virtual WeightEstimator* clone() const = 0; - virtual ~WeightEstimator(){}; + virtual ~WeightEstimator() {} }; #endif diff --git a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h index 7cd0e05bd23a2..560b68561c70d 100644 --- a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h +++ b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h @@ -33,17 +33,17 @@ * The user can optionally implement the following methods * * //Will be called at the beginning of the job - * virtual void algoBeginJob(const edm::EventSetup&){}; + * virtual void algoBeginJob(const edm::EventSetup&){} * //Will be called at the beginning of each run in the job - * virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){}; + * virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){} * //Will be called at the beginning of each luminosity block in the run - * virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){}; + * virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){} * //Will be called at every event - * virtual void algoAnalyze(const edm::Event&, const edm::EventSetup&){}; + * virtual void algoAnalyze(const edm::Event&, const edm::EventSetup&){} * //Will be called at the end of each run in the job - * virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){}; + * virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){} * //Will be called at the end of the job - * virtual void algoEndJob(){}; + * virtual void algoEndJob(){} * * where he can access information needed to build his object. For instance, if * he is computing a calibration that is computed as the mean of a certain @@ -202,17 +202,17 @@ class ConditionDBWriter // Optional methods that may be implemented (technically "overridden") in the derived classes if needed //Will be called at the beginning of the job - virtual void algoBeginJob(const edm::EventSetup &){}; + virtual void algoBeginJob(const edm::EventSetup &) {} //Will be called at the beginning of each run in the job - virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){}; + virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &) {} //Will be called at the beginning of each luminosity block in the run - virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){}; + virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) {} //Will be called at every event - virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &){}; + virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &) {} //Will be called at the end of each run in the job - virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){}; + virtual void algoEndRun(const edm::Run &, const edm::EventSetup &) {} //Will be called at the end of the job - virtual void algoEndJob(){}; + virtual void algoEndJob() {} void beginJob() override {} @@ -268,7 +268,7 @@ class ConditionDBWriter } } - virtual void algoEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){}; + virtual void algoEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) {} void endRun(const edm::Run &run, const edm::EventSetup &es) override { edm::LogInfo("ConditionDBWriter") << "endRun"; diff --git a/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc b/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc index 2dd54670c5a82..9f68e2d2aba36 100644 --- a/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc +++ b/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc @@ -29,8 +29,8 @@ class PCLMetadataWriter : public edm::one::EDAnalyzer { ~PCLMetadataWriter() override = default; // Operations - void analyze(const edm::Event &, const edm::EventSetup &) override{}; - void beginRun(const edm::Run &, const edm::EventSetup &) override{}; + void analyze(const edm::Event &, const edm::EventSetup &) override {} + void beginRun(const edm::Run &, const edm::EventSetup &) override {} void endRun(const edm::Run &, const edm::EventSetup &) override; protected: diff --git a/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.h b/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.h index ff22c35c20a8a..638a5d81427ec 100644 --- a/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.h +++ b/CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.h @@ -19,7 +19,7 @@ class PFCandWithSuperClusterExtractor : public reco::isodeposit::IsoDepositExtractor { public: - PFCandWithSuperClusterExtractor(){}; + PFCandWithSuperClusterExtractor() {} PFCandWithSuperClusterExtractor(const edm::ParameterSet &par, edm::ConsumesCollector &&iC); ~PFCandWithSuperClusterExtractor() override {} diff --git a/CommonTools/ParticleFlow/plugins/PFCandidateMuonUntagger.cc b/CommonTools/ParticleFlow/plugins/PFCandidateMuonUntagger.cc index d1dc6e5bb43a0..963a154480c61 100644 --- a/CommonTools/ParticleFlow/plugins/PFCandidateMuonUntagger.cc +++ b/CommonTools/ParticleFlow/plugins/PFCandidateMuonUntagger.cc @@ -24,7 +24,7 @@ class PFCandidateMuonUntagger : public edm::global::EDProducer<> { public: PFCandidateMuonUntagger(const edm::ParameterSet &); - ~PFCandidateMuonUntagger() override{}; + ~PFCandidateMuonUntagger() override {} void produce(edm::StreamID iID, edm::Event &, const edm::EventSetup &) const override; diff --git a/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc b/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc index 1e6956d62cc58..4b440ac18d451 100644 --- a/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc +++ b/CommonTools/ParticleFlow/plugins/PFCandidateRecalibrator.cc @@ -50,7 +50,7 @@ struct HFChannel { class PFCandidateRecalibrator : public edm::stream::EDProducer<> { public: PFCandidateRecalibrator(const edm::ParameterSet&); - ~PFCandidateRecalibrator() override{}; + ~PFCandidateRecalibrator() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/CommonTools/ParticleFlow/plugins/PFMuonUntagger.cc b/CommonTools/ParticleFlow/plugins/PFMuonUntagger.cc index 19ca5e716b35f..44a25af51193d 100644 --- a/CommonTools/ParticleFlow/plugins/PFMuonUntagger.cc +++ b/CommonTools/ParticleFlow/plugins/PFMuonUntagger.cc @@ -21,7 +21,7 @@ class PFMuonUntagger : public edm::global::EDProducer<> { public: PFMuonUntagger(const edm::ParameterSet &); - ~PFMuonUntagger() override{}; + ~PFMuonUntagger() override {} void produce(edm::StreamID iID, edm::Event &, const edm::EventSetup &) const override; diff --git a/CommonTools/RecoAlgos/interface/MultiVectorManager.h b/CommonTools/RecoAlgos/interface/MultiVectorManager.h index 97e8a7285039c..90985db042446 100644 --- a/CommonTools/RecoAlgos/interface/MultiVectorManager.h +++ b/CommonTools/RecoAlgos/interface/MultiVectorManager.h @@ -53,6 +53,12 @@ class MultiVectorManager { class Iterator { public: + using iterator_category = std::forward_iterator_tag; + using difference_type = std::ptrdiff_t; + using value_type = T; + using pointer = T*; + using reference = T&; + Iterator(const MultiVectorManager& manager, size_t index) : manager(manager), currentIndex(index) {} bool operator!=(const Iterator& other) const { return currentIndex != other.currentIndex; } diff --git a/CommonTools/RecoAlgos/src/MuonSelector.cc b/CommonTools/RecoAlgos/src/MuonSelector.cc index d2af24a89aaa3..269e1abebf6bf 100644 --- a/CommonTools/RecoAlgos/src/MuonSelector.cc +++ b/CommonTools/RecoAlgos/src/MuonSelector.cc @@ -170,7 +170,7 @@ namespace helper { trk.setExtra(TrackExtraRef(rSATrackExtras_, isadx_++)); } // SA trkRef.isNonnull() - } // end of track, and function + } // end of track, and function //------------------------------------------------------------------------- //! Check if all references to silicon strip/pixel clusters are available. diff --git a/CommonTools/RecoUtils/interface/PF_PU_AssoMapAlgos.h b/CommonTools/RecoUtils/interface/PF_PU_AssoMapAlgos.h index aebdf1998aafb..43b15fedf8c04 100644 --- a/CommonTools/RecoUtils/interface/PF_PU_AssoMapAlgos.h +++ b/CommonTools/RecoUtils/interface/PF_PU_AssoMapAlgos.h @@ -84,10 +84,10 @@ typedef std::vector VertexPtsumVector; class PF_PU_AssoMapAlgos { public: //dedicated constructor for the algorithms - PF_PU_AssoMapAlgos(const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iC) : PF_PU_AssoMapAlgos(iConfig, iC){}; + PF_PU_AssoMapAlgos(const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iC) : PF_PU_AssoMapAlgos(iConfig, iC) {} PF_PU_AssoMapAlgos(const edm::ParameterSet&, edm::ConsumesCollector&); // virtual destructor needed when virtual functions declared - virtual ~PF_PU_AssoMapAlgos() noexcept(false){}; + virtual ~PF_PU_AssoMapAlgos() noexcept(false) {} //get all needed collections at the beginning virtual void GetInputCollections(edm::Event&, const edm::EventSetup&); diff --git a/CommonTools/Statistics/interface/StatisticsException.h b/CommonTools/Statistics/interface/StatisticsException.h index c9eecf76c20c8..c23235f685b44 100644 --- a/CommonTools/Statistics/interface/StatisticsException.h +++ b/CommonTools/Statistics/interface/StatisticsException.h @@ -9,8 +9,8 @@ class StatisticsException : public cms::Exception { public: - StatisticsException(const char *reason) : cms::Exception(reason){}; - StatisticsException(const StatisticsException &ex) : cms::Exception(ex){}; + StatisticsException(const char *reason) : cms::Exception(reason) {} + StatisticsException(const StatisticsException &ex) : cms::Exception(ex) {} }; #endif diff --git a/CommonTools/TrackerMap/interface/TrackerMap.h b/CommonTools/TrackerMap/interface/TrackerMap.h index e05e980ae2ace..723466482bf94 100644 --- a/CommonTools/TrackerMap/interface/TrackerMap.h +++ b/CommonTools/TrackerMap/interface/TrackerMap.h @@ -377,7 +377,7 @@ class TrackerMap { int xoffset = XPSUOFFSET; int yoffset = YPSUOFFSET; xmin = 0; - xmax = (NUMPSUCRATE_INCOLUMN)*1.5; + xmax = (NUMPSUCRATE_INCOLUMN) * 1.5; ymin = 0; ymax = NUMPSUCH_INROW; diff --git a/CommonTools/TrackerMap/src/TrackerMap.cc b/CommonTools/TrackerMap/src/TrackerMap.cc index 1f58256cda982..3517f1b22c25a 100644 --- a/CommonTools/TrackerMap/src/TrackerMap.cc +++ b/CommonTools/TrackerMap/src/TrackerMap.cc @@ -728,14 +728,13 @@ void TrackerMap::drawModule(TmModule *mod, int key, int mlay, bool print_total, nams.erase(found, 1); found = nams.find(" ", found); } - std::replace_if( - nams.begin(), nams.end(), [](char c) { return c == ' '; }, '_'); + std::replace_if(nams.begin(), nams.end(), [](char c) { return c == ' '; }, '_'); if (mod->red < 0) { //use count to compute color int color = getcolor(mod->value, palette); red = (color >> 16) & 0xFF; green = (color >> 8) & 0xFF; - blue = (color)&0xFF; + blue = (color) & 0xFF; if (!print_total) mod->value = mod->value * mod->count; //restore mod->value @@ -1289,7 +1288,7 @@ void TrackerMap::drawApvPair( color = getcolor(apvPair->value, palette); red = (color >> 16) & 0xFF; green = (color >> 8) & 0xFF; - blue = (color)&0xFF; + blue = (color) & 0xFF; if (!print_total) apvPair->value = apvPair->value * apvPair->count; //restore mod->value if (temporary_file) @@ -1344,7 +1343,7 @@ void TrackerMap::drawApvPair( color = getcolor(apvPair->mod->value, palette); red = (color >> 16) & 0xFF; green = (color >> 8) & 0xFF; - blue = (color)&0xFF; + blue = (color) & 0xFF; if (temporary_file) *svgfile << nams << " " << vals << " " << red << " " << green << " " << blue << " "; else @@ -1453,7 +1452,7 @@ void TrackerMap::drawCcu( color = getcolor(ccu->value, palette); red = (color >> 16) & 0xFF; green = (color >> 8) & 0xFF; - blue = (color)&0xFF; + blue = (color) & 0xFF; if (!print_total) ccu->value = ccu->value * ccu->count; //restore mod->value if (temporary_file) @@ -1564,7 +1563,7 @@ void TrackerMap::drawPsu( color = getcolor(psu->value, palette); red = (color >> 16) & 0xFF; green = (color >> 8) & 0xFF; - blue = (color)&0xFF; + blue = (color) & 0xFF; if (!print_total) psu->value = psu->value * psu->count; //restore mod->value if (temporary_file) @@ -1668,7 +1667,7 @@ void TrackerMap::drawHV2( color = getcolor(psu->valueHV2, palette); redHV2 = (color >> 16) & 0xFF; greenHV2 = (color >> 8) & 0xFF; - blueHV2 = (color)&0xFF; + blueHV2 = (color) & 0xFF; if (!print_total) psu->valueHV2 = psu->valueHV2 * psu->countHV2; //restore mod->value if (temporary_file) @@ -1771,7 +1770,7 @@ void TrackerMap::drawHV3( color = getcolor(psu->valueHV3, palette); redHV3 = (color >> 16) & 0xFF; greenHV3 = (color >> 8) & 0xFF; - blueHV3 = (color)&0xFF; + blueHV3 = (color) & 0xFF; if (!print_total) psu->valueHV3 = psu->valueHV3 * psu->countHV3; //restore mod->value if (temporary_file) @@ -2119,7 +2118,7 @@ void TrackerMap::save_as_fectrackermap( } } //if(temporary_file) - } //if(enabledFecProcessing) + } //if(enabledFecProcessing) } void TrackerMap::save_as_HVtrackermap( bool print_total, float minval, float maxval, std::string s, int width, int height) { @@ -2441,7 +2440,7 @@ void TrackerMap::save_as_HVtrackermap( } } //if(temporary_file) - } //if(enabledHVProcessing) + } //if(enabledHVProcessing) } void TrackerMap::save_as_psutrackermap( @@ -2749,7 +2748,7 @@ void TrackerMap::save_as_psutrackermap( } } //if(temporary_file) - } //if(enabledFedProcessing) + } //if(enabledFedProcessing) } void TrackerMap::save_as_fedtrackermap( @@ -3056,7 +3055,7 @@ void TrackerMap::save_as_fedtrackermap( } } //if(temporary_file) - } //if(enabledFedProcessing) + } //if(enabledFedProcessing) } void TrackerMap::load(std::string inputfilename) { @@ -3180,7 +3179,7 @@ void TrackerMap::drawPalette(std::ofstream *svgfile, int xoffset, int yoffset) { color = getcolor(val, palette); red = (color >> 16) & 0xFF; green = (color >> 8) & 0xFF; - blue = (color)&0xFF; + blue = (color) & 0xFF; // if(!temporary_file)*svgfile <<"\n"; // else *svgfile << red << " " << green << " " << blue << " 4 " << (6*i)+40 << " 3010. " <

" << outs.str() << "

" << std::endl; } //ifccu->nmod==0 - } //if ccu!=0 - } //for i_ccu + } //if ccu!=0 + } //for i_ccu *txtfile << "" << std::endl; txtfile->close(); delete txtfile; @@ -4158,8 +4157,8 @@ void TrackerMap::printall(bool print_total, float minval1, float maxval1, std::s *txtfile << "

" << outs.str() << "

" << std::endl; } //ifccu->nmod==0 - } //if ccu!=0 - } //for i_ccu + } //if ccu!=0 + } //for i_ccu *txtfile << "" << std::endl; txtfile->close(); } //for int crate diff --git a/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc b/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc index 72603305423c5..5cbdd06beb68b 100644 --- a/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc +++ b/CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc @@ -210,7 +210,8 @@ void GenericTriggerEventFlag::initRun(const edm::Run& run, const edm::EventSetup algoNames.push_back(ip.first); } else { l1Gt_->getL1GtRunCache(run, setup, useL1EventSetup, useL1GtTriggerMenuLite); - L1GtTriggerMenu const& l1GtTriggerMenu = setup.get().get(l1GtTriggerMenuToken_); + const auto& l1GtTriggerMenuRcd = setup.get(); + L1GtTriggerMenu const& l1GtTriggerMenu = l1GtTriggerMenuRcd.get(l1GtTriggerMenuToken_); const AlgorithmMap& l1GtPhys(l1GtTriggerMenu.gtAlgorithmMap()); for (CItAlgo iAlgo = l1GtPhys.begin(); iAlgo != l1GtPhys.end(); ++iAlgo) { diff --git a/CommonTools/UtilAlgos/interface/InputTagDistributor.h b/CommonTools/UtilAlgos/interface/InputTagDistributor.h index 996ad75fbbc00..49a66aa55ae0c 100644 --- a/CommonTools/UtilAlgos/interface/InputTagDistributor.h +++ b/CommonTools/UtilAlgos/interface/InputTagDistributor.h @@ -45,7 +45,7 @@ class InputTagDistributorService { InputTagDistributorService(const edm::ParameterSet& iConfig, edm::ActivityRegistry& r) { r.watchPreModuleConstruction(this, &InputTagDistributorService::preModule); }; - ~InputTagDistributorService(){}; + ~InputTagDistributorService() {} InputTagDistributor& init(std::string user, const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iC) { if (multipleInstance_.find(user) != multipleInstance_.end()) { diff --git a/CommonTools/UtilAlgos/interface/OverlapExclusionSelector.h b/CommonTools/UtilAlgos/interface/OverlapExclusionSelector.h index 218adce1559bc..429f3b4c9d7d7 100644 --- a/CommonTools/UtilAlgos/interface/OverlapExclusionSelector.h +++ b/CommonTools/UtilAlgos/interface/OverlapExclusionSelector.h @@ -14,7 +14,7 @@ template class OverlapExclusionSelector { public: OverlapExclusionSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC) - : OverlapExclusionSelector(cfg, iC){}; + : OverlapExclusionSelector(cfg, iC) {} OverlapExclusionSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC); void newEvent(const edm::Event&, const edm::EventSetup&) const; bool operator()(const T&) const; diff --git a/CommonTools/Utils/interface/ExpressionEvaluatorTemplates.h b/CommonTools/Utils/interface/ExpressionEvaluatorTemplates.h index 82a5e448d657c..152efef6ebc1a 100644 --- a/CommonTools/Utils/interface/ExpressionEvaluatorTemplates.h +++ b/CommonTools/Utils/interface/ExpressionEvaluatorTemplates.h @@ -12,19 +12,19 @@ namespace reco { template struct genericExpression { virtual Ret operator()(Args...) const = 0; - virtual ~genericExpression(){}; + virtual ~genericExpression() {} }; template struct CutOnObject { virtual bool eval(Object const&) const = 0; - virtual ~CutOnObject(){}; + virtual ~CutOnObject() {} }; template struct ValueOnObject { virtual double eval(Object const&) const = 0; - virtual ~ValueOnObject(){}; + virtual ~ValueOnObject() {} }; template @@ -38,7 +38,7 @@ namespace reco { cands.begin(), cands.end(), mask.begin(), [&](typename Collection::value_type const& c) { return f(*c); }); } virtual void eval(Collection const&, Mask&) const = 0; - virtual ~MaskCollection(){}; + virtual ~MaskCollection() {} }; template @@ -51,7 +51,7 @@ namespace reco { cands.end()); } virtual void eval(Collection&) const = 0; - virtual ~SelectInCollection(){}; + virtual ~SelectInCollection() {} }; template @@ -68,7 +68,7 @@ namespace reco { } } virtual void eval(Collection const&, Indices&) const = 0; - virtual ~SelectIndecesInCollection(){}; + virtual ~SelectIndecesInCollection() {} }; } // namespace reco diff --git a/CommonTools/Utils/src/FormulaEvaluator.cc b/CommonTools/Utils/src/FormulaEvaluator.cc index b811b9fe8edfa..fdbeeccfa4d3d 100644 --- a/CommonTools/Utils/src/FormulaEvaluator.cc +++ b/CommonTools/Utils/src/FormulaEvaluator.cc @@ -200,7 +200,7 @@ namespace { class FunctionFinder : public ExpressionElementFinderBase { public: - FunctionFinder(ExpressionFinder const* iEF) : m_expressionFinder(iEF){}; + FunctionFinder(ExpressionFinder const* iEF) : m_expressionFinder(iEF) {} bool checkStart(char iSymbol) const final { return std::isalpha(iSymbol); } diff --git a/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h b/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h index 69f126e719999..e10b2d44ff966 100644 --- a/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h +++ b/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h @@ -1100,8 +1100,8 @@ namespace AlignmentPI { edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << coord << std::endl; break; } // switch on the coordinate - } // check on the same detID - } // loop on the components + } // check on the same detID + } // loop on the components } /*--------------------------------------------------------------------*/ @@ -1181,7 +1181,7 @@ namespace AlignmentPI { } } // if it's the same detid - } // loop on detids + } // loop on detids } /*--------------------------------------------------------------------*/ diff --git a/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc index 1fa0aafc23f6b..9cd9c8b9d7981 100644 --- a/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc +++ b/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc @@ -87,8 +87,8 @@ namespace { // to be used to fill the histogram fillWithValue(sqrt(errMatrix[indices.first][indices.second]) * AlignmentPI::cmToUm); } // loop on the vector of modules - } // payload - } // iovs + } // payload + } // iovs return true; } // fill }; @@ -430,7 +430,7 @@ namespace { APE_spectraByRegion[hash]->Fill(sqrt(errMatrix[indices.first][indices.second]) * AlignmentPI::cmToUm); } // loop on the coordinate indices - } // loop over detIds + } // loop over detIds // plotting section diff --git a/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc index 38c5e5a9ce363..6841e0e4baf38 100644 --- a/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc +++ b/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc @@ -1143,8 +1143,8 @@ namespace { edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << myCoord << std::endl; break; } // switch on the coordinate - } // check on the same detID - } // loop on the components + } // check on the same detID + } // loop on the components } }; @@ -1215,7 +1215,7 @@ namespace { edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << coord << std::endl; break; } // switch on the coordinate (only X,Y,Z are interesting) - } // ends loop on the alignments + } // ends loop on the alignments edm::LogInfo("TrackerAlignment_PayloadInspector") << "barycenter (" << barycenter << ")/n. modules (" << nmodules << ") = " << barycenter / nmodules << std::endl; diff --git a/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc index 0f9f366fdaf8b..db903115d5534 100644 --- a/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc +++ b/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc @@ -77,7 +77,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -135,7 +135,7 @@ namespace { summaries[nPar]->Fill(par); nPar++; } // ends loop on the parameters - } // ends loop on the item vector + } // ends loop on the item vector TLatex t1; @@ -603,8 +603,8 @@ namespace { surfDefMap[f_entry.first] = delta; } } // if not phase-0 - } // loop on the last payload map - } // loop on the first payload map + } // loop on the last payload map + } // loop on the first payload map //========================= @@ -772,8 +772,8 @@ namespace { surfDefMap[f_entry.first] = delta; } } // if not phase-0 - } // loop on the last payload map - } // loop on the first payload map + } // loop on the last payload map + } // loop on the first payload map //========================= diff --git a/CondCore/CondDB/src/CoralMsgReporter.h b/CondCore/CondDB/src/CoralMsgReporter.h index 7d51372c58b43..ef88fc6dd9c0d 100644 --- a/CondCore/CondDB/src/CoralMsgReporter.h +++ b/CondCore/CondDB/src/CoralMsgReporter.h @@ -34,7 +34,7 @@ namespace cond { CoralMsgReporter(); /// Destructor - ~CoralMsgReporter() override{}; + ~CoralMsgReporter() override {} /// Release reference to reporter void release() override { delete this; } diff --git a/CondCore/CondDB/src/blowfish.h b/CondCore/CondDB/src/blowfish.h index dba9e6150f68a..190a9ff0419d6 100644 --- a/CondCore/CondDB/src/blowfish.h +++ b/CondCore/CondDB/src/blowfish.h @@ -31,7 +31,7 @@ typedef unsigned int uInt32; #endif #ifndef S_ISREG -#define S_ISREG(x) (((x)&S_IFMT) == S_IFREG) +#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) #endif #define MAXKEYBYTES 56 /* 448 bits */ diff --git a/CondCore/DBOutputService/interface/OnlineDBOutputService.h b/CondCore/DBOutputService/interface/OnlineDBOutputService.h index 0346b287689ae..1a977289b12a7 100644 --- a/CondCore/DBOutputService/interface/OnlineDBOutputService.h +++ b/CondCore/DBOutputService/interface/OnlineDBOutputService.h @@ -89,6 +89,6 @@ namespace cond { bool m_debug; }; //OnlineDBOutputService - } // namespace service + } // namespace service } // namespace cond #endif diff --git a/CondCore/DBOutputService/interface/PoolDBOutputService.h b/CondCore/DBOutputService/interface/PoolDBOutputService.h index e96919c91cd09..835bce1731352 100644 --- a/CondCore/DBOutputService/interface/PoolDBOutputService.h +++ b/CondCore/DBOutputService/interface/PoolDBOutputService.h @@ -311,6 +311,6 @@ namespace cond { std::map m_logheaders; }; //PoolDBOutputService - } // namespace service + } // namespace service } // namespace cond #endif diff --git a/CondCore/ESSources/interface/registration_macros.h b/CondCore/ESSources/interface/registration_macros.h index f7417ef7cb6b9..fbe9971014ba1 100644 --- a/CondCore/ESSources/interface/registration_macros.h +++ b/CondCore/ESSources/interface/registration_macros.h @@ -63,7 +63,7 @@ #define REGISTER_KEYLIST_PLUGIN(record_, type_, source_) \ template class ProductResolverWrapper; \ struct EDM_PLUGIN_SYM(ProductResolver, record_) : public ProductResolverWrapper { \ - EDM_PLUGIN_SYM(ProductResolver, record_)() : ProductResolverWrapper(#source_){}; \ + EDM_PLUGIN_SYM(ProductResolver, record_)() : ProductResolverWrapper(#source_) {} \ }; \ DEFINE_EDM_PLUGIN(cond::ProductResolverFactory, EDM_PLUGIN_SYM(ProductResolver, record_), #record_ "@NewProxy") diff --git a/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc index 1f02e9b428bd2..66e4bb1200fda 100644 --- a/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc @@ -70,7 +70,7 @@ namespace { } } } // validHashIndex - } // payload + } // payload gStyle->SetOptStat(0); gStyle->SetPalette(1); @@ -189,9 +189,9 @@ namespace { } } } // 2nd IOV - } // validHashIndex - } // payload - } // loop over IOVs + } // validHashIndex + } // payload + } // loop over IOVs gStyle->SetOptStat(0); gStyle->SetPalette(1); diff --git a/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc index d04270dcc2c26..e403c4ab60707 100644 --- a/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc @@ -66,7 +66,7 @@ namespace { valmin = value; } } // validHashIndex - } // payload + } // payload gStyle->SetOptStat(0); gStyle->SetPalette(1); @@ -180,9 +180,9 @@ namespace { valmin = diff; } } // 2nd IOV - } // validHashIndex - } // payload - } // loop over IOVs + } // validHashIndex + } // payload + } // loop over IOVs gStyle->SetOptStat(0); gStyle->SetPalette(1); @@ -228,7 +228,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class ESIntercalibConstantsDiffBase + }; // class ESIntercalibConstantsDiffBase using ESIntercalibConstantsDiffOneTag = ESIntercalibConstantsDiffBase; using ESIntercalibConstantsDiffTwoTags = ESIntercalibConstantsDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc index 58251537869de..f450fc486da89 100644 --- a/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc @@ -25,7 +25,7 @@ namespace { MIN_IPHI = 1, MAX_IETA = 85, MAX_IPHI = 360 - }; // barrel (EB) lower and upper bounds on eta and phi + }; // barrel (EB) lower and upper bounds on eta and phi enum { IX_MIN = 1, IY_MIN = 1, IX_MAX = 100, IY_MAX = 100 }; // endcaps (EE) lower and upper bounds on x and y /***************************************** @@ -257,7 +257,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalAlignmentDiffBase + }; // class EcalAlignmentDiffBase using EcalAlignmentDiffOneTag = EcalAlignmentDiffBase; using EcalAlignmentDiffTwoTags = EcalAlignmentDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc index 1238ad2d4ec29..0963d3a693e97 100644 --- a/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc @@ -64,7 +64,7 @@ namespace { ebmap_coarse->Fill(phi, eta); } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; @@ -181,7 +181,7 @@ namespace { } } } // validDetId - } // payload + } // payload gStyle->SetOptStat(0); //set the background color to white @@ -337,7 +337,7 @@ namespace { } } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOV's @@ -489,11 +489,11 @@ namespace { eecount++; eemap_coarse->Fill(ix + IX_MAX - 1, iy - 1, tmp3); } // z side - } // any difference ? - } // 2nd IOV, fill the plots - } // validDetId - } // get the payload - } // loop over payloads + } // any difference ? + } // 2nd IOV, fill the plots + } // validDetId + } // get the payload + } // loop over payloads gStyle->SetOptStat(0); //set the background color to white diff --git a/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc index 2756f2101c5a8..6d529aa61e65e 100644 --- a/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc @@ -67,7 +67,7 @@ namespace { ebmap_coarse->Fill(phi, eta); } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; @@ -350,7 +350,7 @@ namespace { } } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOV's @@ -421,7 +421,7 @@ namespace { c1.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalDQMChannelStatusEBDiffBase + }; // class EcalDQMChannelStatusEBDiffBase using EcalDQMChannelStatusEBDiffOneTag = EcalDQMChannelStatusEBDiffBase; using EcalDQMChannelStatusEBDiffTwoTags = EcalDQMChannelStatusEBDiffBase; @@ -499,11 +499,11 @@ namespace { eecount++; eemap_coarse->Fill(ix + IX_MAX - 1, iy - 1, tmp3); } // z side - } // any difference ? - } // 2nd IOV, fill the plots - } // validDetId - } // get the payload - } // loop over payloads + } // any difference ? + } // 2nd IOV, fill the plots + } // validDetId + } // get the payload + } // loop over payloads gStyle->SetOptStat(0); //set the background color to white @@ -593,7 +593,7 @@ namespace { c1.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalDQMChannelStatusEEDiffBase + }; // class EcalDQMChannelStatusEEDiffBase using EcalDQMChannelStatusEEDiffOneTag = EcalDQMChannelStatusEEDiffBase; using EcalDQMChannelStatusEEDiffTwoTags = EcalDQMChannelStatusEEDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc index 5eaee06035cc2..66aa1b914919a 100644 --- a/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc @@ -281,7 +281,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalDQMTowerStatusDiffBase + }; // class EcalDQMTowerStatusDiffBase using EcalDQMTowerStatusDiffOneTag = EcalDQMTowerStatusDiffBase; using EcalDQMTowerStatusDiffTwoTags = EcalDQMTowerStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc index bf3aa9c15c0bc..8a719073244e9 100644 --- a/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc @@ -76,9 +76,9 @@ namespace { else endc_m->Fill(ix, iy, val); } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload double vt = (double)EBtot; EBmean = EBmean / vt; EBrms = EBrms / vt - (EBmean * EBmean); @@ -219,9 +219,9 @@ namespace { endc_m->Fill(ix, iy, diff); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload else return false; } // loop over IOVs @@ -279,7 +279,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalFloatCondObjectContainerDiffBase + }; // class EcalFloatCondObjectContainerDiffBase using EcalFloatCondObjectContainerDiffOneTag = EcalFloatCondObjectContainerDiffBase; using EcalFloatCondObjectContainerDiffTwoTags = diff --git a/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc index b4ba47864b8d6..866eb91b87dd0 100644 --- a/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc @@ -79,7 +79,7 @@ namespace { e_12O6->Fill((*payload)[rawid].gain12Over6()); e_6O1->Fill((*payload)[rawid].gain6Over1()); } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -261,7 +261,7 @@ namespace { e_6O1->Fill(diff2); } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOVs @@ -352,7 +352,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalGainRatiosDiffBase + }; // class EcalGainRatiosDiffBase using EcalGainRatiosDiffOneTag = EcalGainRatiosDiffBase; using EcalGainRatiosDiffTwoTags = EcalGainRatiosDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc index b49f84e172529..acca25d126256 100644 --- a/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc @@ -86,7 +86,7 @@ namespace { } // loop over cellid } // if payload.get() - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; @@ -144,10 +144,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -274,7 +274,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -324,7 +324,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalIntercalibConstantsMCDiffBase + }; // class EcalIntercalibConstantsMCDiffBase using EcalIntercalibConstantsMCDiffOneTag = EcalIntercalibConstantsMCBase; using EcalIntercalibConstantsMCDiffTwoTags = EcalIntercalibConstantsMCBase; using EcalIntercalibConstantsMCRatioOneTag = EcalIntercalibConstantsMCBase; diff --git a/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc index 45feb502be069..a21f3e3afa7ee 100644 --- a/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc @@ -80,8 +80,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method @@ -131,9 +131,9 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid - } // payload - } // loop over IOV's (1 in this case) + } // loop over cellid + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -256,7 +256,7 @@ namespace { return false; fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -303,7 +303,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalIntercalibConstantsDiffBase + }; // class EcalIntercalibConstantsDiffBase using EcalIntercalibConstantsDiffOneTag = EcalIntercalibConstantsBase; using EcalIntercalibConstantsDiffTwoTags = EcalIntercalibConstantsBase; using EcalIntercalibConstantsRatioOneTag = EcalIntercalibConstantsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc index f80d29238b246..75996339b43f5 100644 --- a/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc @@ -84,8 +84,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -140,10 +140,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -264,7 +264,7 @@ namespace { return false; fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -314,7 +314,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalIntercalibErrorsDiffBase + }; // class EcalIntercalibErrorsDiffBase using EcalIntercalibErrorsDiffOneTag = EcalIntercalibErrorsBase; using EcalIntercalibErrorsDiffTwoTags = EcalIntercalibErrorsBase; using EcalIntercalibErrorsRatioOneTag = EcalIntercalibErrorsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc index 1e645f7380352..47dc22b0d3394 100644 --- a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc @@ -81,8 +81,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -137,10 +137,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -267,7 +267,7 @@ namespace { if (!payload->endcapItems().empty()) fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); diff --git a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc index 1dcf99fed7acb..cbbc41cc9234d 100644 --- a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc @@ -72,8 +72,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), p2); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method @@ -118,8 +118,8 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), p2); } // loop over cellid - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -208,7 +208,7 @@ namespace { endc_m[2]->Fill(myEEId.ix(), myEEId.iy(), p3); } } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -464,7 +464,7 @@ namespace { } } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOVs @@ -572,7 +572,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLaserAPDPNRatiosDiffBase + }; // class EcalLaserAPDPNRatiosDiffBase using EcalLaserAPDPNRatiosDiffOneTag = EcalLaserAPDPNRatiosBase; using EcalLaserAPDPNRatiosDiffTwoTags = EcalLaserAPDPNRatiosBase; using EcalLaserAPDPNRatiosRatioOneTag = EcalLaserAPDPNRatiosBase; diff --git a/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc index 0f821cfd8c9ac..cfe232e4e8040 100644 --- a/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc @@ -80,8 +80,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -136,10 +136,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -263,7 +263,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -312,7 +312,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLaserAlphasDiffBase + }; // class EcalLaserAlphasDiffBase using EcalLaserAlphasDiffOneTag = EcalLaserAlphasBase; using EcalLaserAlphasDiffTwoTags = EcalLaserAlphasBase; using EcalLaserAlphasRatioOneTag = EcalLaserAlphasBase; diff --git a/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc index 6c676367a200c..b59a94db5e33b 100644 --- a/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc @@ -91,7 +91,7 @@ namespace { EBrms[2] = EBrms[2] + val * val; EBtot[2]++; } // iphi - } // ieta + } // ieta for (int sign = 0; sign < kSides; sign++) { int thesign = sign == 1 ? 1 : -1; @@ -125,9 +125,9 @@ namespace { else endc_m[2]->Fill(ix, iy, val); } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; @@ -200,7 +200,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLinearCorrectionsPlot + }; // class EcalLinearCorrectionsPlot /**************************************************************** 2d plot of ECAL LinearCorrections difference between 2 IOVs @@ -312,7 +312,7 @@ namespace { EBtot[2]++; } } // iphi - } // ieta + } // ieta for (int sign = 0; sign < kSides; sign++) { int thesign = sign == 1 ? 1 : -1; @@ -362,9 +362,9 @@ namespace { endc_m[2]->Fill(ix, iy, diff); } } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; } // loop over IOVs @@ -454,7 +454,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLinearCorrectionsDiffBase + }; // class EcalLinearCorrectionsDiffBase using EcalLinearCorrectionsDiffOneTag = EcalLinearCorrectionsDiffBase; using EcalLinearCorrectionsDiffTwoTags = EcalLinearCorrectionsDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc index 88c846b191586..7954193cb8852 100644 --- a/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc @@ -83,8 +83,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -142,10 +142,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -271,7 +271,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -317,7 +317,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPFRecHitThresholdsDiffBase + }; // class EcalPFRecHitThresholdsDiffBase using EcalPFRecHitThresholdsDiffOneTag = EcalPFRecHitThresholdsBase; using EcalPFRecHitThresholdsDiffTwoTags = EcalPFRecHitThresholdsBase; using EcalPFRecHitThresholdsRatioOneTag = EcalPFRecHitThresholdsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc index aaab0deb4b4a5..1c80115f7e322 100644 --- a/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc @@ -83,7 +83,7 @@ namespace { endcap_m[2]->Fill((*payload)[rawid].mean_x1); endcap_r[2]->Fill((*payload)[rawid].rms_x1); } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -125,7 +125,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPedestalsHist + }; // class EcalPedestalsHist /************************************** 2d plot of ECAL pedestal of 1 IOV @@ -310,7 +310,7 @@ namespace { } } } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -605,7 +605,7 @@ namespace { } } } // loop over cellid - } // barrel data present + } // barrel data present if (payload->endcapItems().empty()) { // looping over the EE channels for (int iz = -1; iz < 2; iz = iz + 2) { // -1 or +1 @@ -730,12 +730,12 @@ namespace { EEtot[2]++; } } // second run - } // validDetId - } // loop over ix - } // loop over iy - } // loop over iz - } // endcap data present - } // if payload.get() + } // validDetId + } // loop over ix + } // loop over iy + } // loop over iz + } // endcap data present + } // if payload.get() else return false; } // loop over IOVs @@ -823,7 +823,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPedestalsBase + }; // class EcalPedestalsBase using EcalPedestalsDiffOneTag = EcalPedestalsBase; using EcalPedestalsDiffTwoTags = EcalPedestalsBase; using EcalPedestalsRatioOneTag = EcalPedestalsBase; @@ -881,8 +881,8 @@ namespace { // if(valped < 150.) valped = 150.; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valped); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -929,8 +929,8 @@ namespace { // if(valped < 150.) valped = 150.; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valped); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -977,8 +977,8 @@ namespace { // if(valped < 150.) valped = 150.; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valped); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1030,8 +1030,8 @@ namespace { fillWithValue(ix + IX_MAX + 20, iy, valped); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1081,8 +1081,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valped); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1132,8 +1132,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valped); } // validDetId - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1184,8 +1184,8 @@ namespace { valrms = 4.0; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valrms); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1231,8 +1231,8 @@ namespace { valrms = 2.5; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valrms); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1278,8 +1278,8 @@ namespace { valrms = 1.2; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valrms); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1330,8 +1330,8 @@ namespace { fillWithValue(ix + IX_MAX + 20, iy, valrms); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1380,8 +1380,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valrms); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1430,8 +1430,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valrms); } // validDetId - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; diff --git a/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc index 8dc01b8aff950..6670d169764f0 100644 --- a/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc @@ -124,9 +124,9 @@ namespace { endc_m[s]->Fill(ix, iy, val); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload /* for(int s = 0; s < TEMPLATESAMPLES; ++s) { std::cout << "EB sample " << s << " mean " << EBmean[s] << " rms " << EBrms[s] << " entries " << EBtot[s] @@ -260,9 +260,9 @@ namespace { } } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload TH2F* barrel_m = new TH2F("EBm", "EB mean", TEMPLATESAMPLES, 0, TEMPLATESAMPLES, TEMPLATESAMPLES, 0., TEMPLATESAMPLES); diff --git a/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc index a7656d9b6f7b1..ca6caf0af5290 100644 --- a/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc @@ -104,9 +104,9 @@ namespace { endc_m[s]->Fill(ix, iy, val); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload for (int s = 0; s < TEMPLATESAMPLES; s++) { std::cout << "EB sample " << s << " mean " << EBmean[s] << " rms " << EBrms[s] << " entries " << EBtot[s] @@ -228,9 +228,9 @@ namespace { endcap->Fill(s, val); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload gStyle->SetPalette(1); gStyle->SetOptStat(0); diff --git a/CondCore/EcalPlugins/plugins/EcalSimComponentShape_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalSimComponentShape_PayloadInspector.cc index fbb2e0a2e64ef..d19325f0c62d9 100644 --- a/CondCore/EcalPlugins/plugins/EcalSimComponentShape_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalSimComponentShape_PayloadInspector.cc @@ -46,7 +46,7 @@ namespace { profiles.push_back(new TProfile(nameBuffer, "", EBnbins[iShape], 0, EBxmaxs[iShape])); for (int s = 0; s < EBnbins[iShape]; s++) { double val = EBshape[s]; - profiles[iShape]->Fill(s, val); + profiles[iShape]->Fill(s * time, val); } ++iShape; } diff --git a/CondCore/EcalPlugins/plugins/EcalSimPulseShape_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalSimPulseShape_PayloadInspector.cc index 55493cc51dc35..235c23e987147 100644 --- a/CondCore/EcalPlugins/plugins/EcalSimPulseShape_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalSimPulseShape_PayloadInspector.cc @@ -55,15 +55,15 @@ namespace { apd = new TProfile("APDshape", "", APDnbin, 0, APDxmax); for (int s = 0; s < EBnbin; s++) { double val = EBshape[s]; - barrel->Fill(s, val); + barrel->Fill(s * time, val); } for (int s = 0; s < EEnbin; s++) { double val = EEshape[s]; - endcap->Fill(s, val); + endcap->Fill(s * time, val); } for (int s = 0; s < APDnbin; s++) { double val = APDshape[s]; - apd->Fill(s, val); + apd->Fill(s * time, val); } } // if payload.get() else diff --git a/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc index 071b35d6dab00..c45d218743cee 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc @@ -78,9 +78,9 @@ namespace { EEstat[0]++; } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -213,9 +213,9 @@ namespace { } } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload else return false; } // loop over IOVs @@ -270,7 +270,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGCrystalStatusDiffBase + }; // class EcalTPGCrystalStatusDiffBase using EcalTPGCrystalStatusDiffOneTag = EcalTPGCrystalStatusDiffBase; using EcalTPGCrystalStatusDiffTwoTags = EcalTPGCrystalStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc index 3078529cc851d..ec5f51a7988d9 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc @@ -64,7 +64,7 @@ namespace { minEE = weight; } } //tower map - } //payload + } //payload TCanvas canvas("CC map", "CC map", 800, 800); TLatex t1; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc index 75cdfcb4a91f5..427cdfbc55dc7 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc @@ -154,7 +154,7 @@ namespace { if (val > rEBmax[2]) rEBmax[2] = val; } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -217,9 +217,9 @@ namespace { rEEmax[2] = val; // fout << " x " << ix << " y " << " val " << val << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; // std::cout << " min " << rEEmin[2] << " max " << rEEmax[2] << std::endl; @@ -510,7 +510,7 @@ namespace { rEBmax[2] = dr; } } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -664,9 +664,9 @@ namespace { } // fout << " x " << ix << " y " << " dr " << dr << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; } // loop over IOVs @@ -727,7 +727,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPedestalsDiffBase + }; // class EcalPedestalsDiffBase using EcalTPGLinearizationConstDiffOneTag = EcalTPGLinearizationConstBase; using EcalTPGLinearizationConstDiffTwoTags = EcalTPGLinearizationConstBase; using EcalTPGLinearizationConstRatioOneTag = EcalTPGLinearizationConstBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc index 51ccd78a58935..f4d3bb6e4fa61 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc @@ -27,7 +27,7 @@ namespace { IY_MAX = 100, EEhistXMax = 220 }; // endcaps lower and upper bounds on x and y - /*********************************************** + /*********************************************** 2d plot of EcalTPGLutGroup of 1 IOV ************************************************/ class EcalTPGLutGroupPlot : public cond::payloadInspector::PlotImage { diff --git a/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc index f918fe1df145e..01fd23d13bb54 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc @@ -103,7 +103,7 @@ namespace { if (val > mEBmax[2]) mEBmax[2] = val; } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -139,9 +139,9 @@ namespace { mEEmax[2] = val; // fout << " x " << ix << " y " << " val " << val << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; // std::cout << " min " << rEEmin[2] << " max " << rEEmax[2] << std::endl; @@ -328,7 +328,7 @@ namespace { mEBmax[2] = dr; } } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -410,9 +410,9 @@ namespace { } // fout << " x " << ix << " y " << " dr " << dr << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; } // loop over IOVs @@ -467,7 +467,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGPedestalsDiffBase + }; // class EcalTPGPedestalsDiffBase using EcalTPGPedestalsDiffOneTag = EcalTPGPedestalsBase; using EcalTPGPedestalsDiffTwoTags = EcalTPGPedestalsBase; using EcalTPGPedestalsRatioOneTag = EcalTPGPedestalsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc index dea0df97092c2..cf49e9572236e 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc @@ -285,11 +285,11 @@ namespace { } // std::cout << " x " << x << " y " << y << " z " << iz << std::endl; } // loop over crystals in strip - } // new strip - } // second run + } // new strip + } // second run } } // loop over strips - } // payload + } // payload else return false; // std::cout << " nb of strips " << istat << std::endl; @@ -328,8 +328,8 @@ namespace { } // std::cout << " x " << x << " y " << y << " z " << iz << std::endl; } // loop over crystals in strip - } // new strip - } // loop over run 1 strips + } // new strip + } // loop over run 1 strips gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -385,7 +385,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGStripStatusDiffBase + }; // class EcalTPGStripStatusDiffBase using EcalTPGStripStatusDiffOneTag = EcalTPGStripStatusDiffBase; using EcalTPGStripStatusDiffTwoTags = EcalTPGStripStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc index 24734b898d9d1..39cb72562eef6 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc @@ -155,8 +155,8 @@ namespace { if (towerId >= kEBTotalTowers) std::cout << " strange tower Id " << towerId << std::endl; } - } // barrel - } // 1st run + } // barrel + } // 1st run else { // 2nd run if (ttId.subDet() == 1) { // barrel if (stat > 0) { // bad tower @@ -172,9 +172,9 @@ namespace { // vEB[towerId] = 0; EBstat += diff; } // barrel - } // 2nd run - } // loop over towers - } // payload + } // 2nd run + } // loop over towers + } // payload else return false; } // loop over IOVs @@ -242,7 +242,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGTowerStatusDiffBase + }; // class EcalTPGTowerStatusDiffBase using EcalTPGTowerStatusDiffOneTag = EcalTPGTowerStatusDiffBase; using EcalTPGTowerStatusDiffTwoTags = EcalTPGTowerStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc index e27ebe7b91612..6129fe30fb15f 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc @@ -27,7 +27,7 @@ namespace { IY_MAX = 100, EEhistXMax = 220 }; // endcaps lower and upper bounds on x and y - /*********************************************** + /*********************************************** 2d plot of EcalTPGWeightGroup of 1 IOV ************************************************/ class EcalTPGWeightGroupPlot : public cond::payloadInspector::PlotImage { diff --git a/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc index 64384b0718b5b..97196ddf78611 100644 --- a/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc @@ -84,8 +84,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -141,10 +141,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -270,7 +270,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -316,7 +316,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTimeCalibConstantsDiffBase + }; // class EcalTimeCalibConstantsDiffBase using EcalTimeCalibConstantsDiffOneTag = EcalTimeCalibConstantsBase; using EcalTimeCalibConstantsDiffTwoTags = EcalTimeCalibConstantsBase; using EcalTimeCalibConstantsRatioOneTag = EcalTimeCalibConstantsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc index 05cd1fd2d580e..13b322a400c0b 100644 --- a/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc @@ -84,8 +84,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -143,10 +143,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -271,7 +271,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -320,7 +320,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTimeCalibErrorsDiffBase + }; // class EcalTimeCalibErrorsDiffBase using EcalTimeCalibErrorsDiffOneTag = EcalTimeCalibErrorsBase; using EcalTimeCalibErrorsDiffTwoTags = EcalTimeCalibErrorsBase; using EcalTimeCalibErrorsRatioOneTag = EcalTimeCalibErrorsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc index 1294c4b47f890..e3e2049e20c68 100644 --- a/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc @@ -89,7 +89,7 @@ namespace { else endc_m->Fill(ix, iy, weight); } // validDetId - } // payload + } // payload gStyle->SetPalette(1); gStyle->SetOptStat(0); diff --git a/CondCore/HLTPlugins/plugins/AlCaRecoTriggerBits_PayloadInspector.cc b/CondCore/HLTPlugins/plugins/AlCaRecoTriggerBits_PayloadInspector.cc index 6a283545caa45..e0a19b97ad082 100644 --- a/CondCore/HLTPlugins/plugins/AlCaRecoTriggerBits_PayloadInspector.cc +++ b/CondCore/HLTPlugins/plugins/AlCaRecoTriggerBits_PayloadInspector.cc @@ -360,8 +360,8 @@ namespace { y_line.push_back(y - 0.008); } // close if there is at least a difference - } // if there is a common key - } //loop on the keys + } // if there is a common key + } //loop on the keys TCanvas canvas("AlCaRecoTriggerBits", "AlCaRecoTriggerBits", 2500., std::max(y_x1.size(), y_x2.size()) * 40); diff --git a/CondCore/HcalPlugins/interface/HcalObjRepresent.h b/CondCore/HcalPlugins/interface/HcalObjRepresent.h index 38f51b84d4be3..1f0fa83d9433f 100644 --- a/CondCore/HcalPlugins/interface/HcalObjRepresent.h +++ b/CondCore/HcalPlugins/interface/HcalObjRepresent.h @@ -42,7 +42,7 @@ namespace HcalObjRepresent { PlotMode_ = "Map"; } - virtual ~HcalDataContainer(){}; + virtual ~HcalDataContainer() {} // For easier channel mapping typedef std::tuple Coord; typedef std::map tHcalValCont; @@ -1006,8 +1006,8 @@ namespace HcalObjRepresent { hh[d].SetBinContent(eta + 1, (iphi + 2) % 72 + 1, hh[d].GetBinContent(eta + 1, iphi)); } } // for (int phi...) - } // for (int eta...) - } // for (int d=0;...) + } // for (int eta...) + } // for (int d=0;...) // no corrections needed for HO (depth 4) return; } // FillUnphysicalHEHFBins(MonitorElement* hh) @@ -1037,7 +1037,7 @@ namespace HcalObjRepresent { { binval = hh.GetBinContent(eta + 1, iphi); hh.SetBinContent(eta + 1, iphi + 1, binval); - } // if (iphi%2==1...) + } // if (iphi%2==1...) else if (abs(ieta) > 39 && iphi % 4 == 3 && iphi < 73) // 20 degree phi binning condition { // Set last two eta strips where each cell spans 20 degrees in phi @@ -1046,7 +1046,7 @@ namespace HcalObjRepresent { hh.SetBinContent(eta + 1, (iphi + 1) % 72 + 1, hh.GetBinContent(eta + 1, iphi)); hh.SetBinContent(eta + 1, (iphi + 2) % 72 + 1, hh.GetBinContent(eta + 1, iphi)); } // else if (abs(ieta)>39 ...) - } // for (int phi=0;phi<72;++phi) + } // for (int phi=0;phi<72;++phi) } // for (int eta=0; eta< (etaBins_-2);++eta) @@ -1207,8 +1207,8 @@ namespace HcalObjRepresent { class ADataRepr //Sample base class for c++ inheritance tutorial { public: - ADataRepr(unsigned int d) : m_total(d){}; - virtual ~ADataRepr(){}; + ADataRepr(unsigned int d) : m_total(d) {} + virtual ~ADataRepr() {} unsigned int nr, id; std::stringstream filename, rootname, plotname; diff --git a/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc b/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc index 20e3bab7bef06..ff7f9154baba3 100644 --- a/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc +++ b/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc @@ -293,7 +293,7 @@ namespace { } // for iovs return false; } // fill - }; // class + }; // class class JetCorrectorVsEtaSummary : public cond::payloadInspector::PlotImage { diff --git a/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc b/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc index 5c5a1a96aafdd..14ff5796ab544 100644 --- a/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc +++ b/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc @@ -528,7 +528,7 @@ namespace JME { } // for return true; } // fill - }; // class + }; // class typedef JetScaleFactorVsEta JetScaleFactorVsEtaNORM; typedef JetScaleFactorVsEta JetScaleFactorVsEtaDOWN; @@ -590,7 +590,7 @@ namespace JME { } // for return true; } // fill - }; // class + }; // class typedef JetScaleFactorVsPt JetScaleFactorVsPtNORM; typedef JetScaleFactorVsPt JetScaleFactorVsPtDOWN; diff --git a/CondCore/L1TPlugins/interface/L1TUtmTriggerMenuPayloadInspectorHelper.h b/CondCore/L1TPlugins/interface/L1TUtmTriggerMenuPayloadInspectorHelper.h index 5bcea2aeae87d..9a1af3ae19213 100644 --- a/CondCore/L1TPlugins/interface/L1TUtmTriggerMenuPayloadInspectorHelper.h +++ b/CondCore/L1TPlugins/interface/L1TUtmTriggerMenuPayloadInspectorHelper.h @@ -159,20 +159,20 @@ namespace L1TUtmTriggerMenuInspectorHelper { const auto& vec_only_in_this = m_info.template onlyInThis(other); const auto& vec_only_in_other = m_info.template onlyInOther(other); - // preparations for plotting - // starting table at y=1.0 (top of the canvas) - // first column is at 0.03, second column at 0.22 NDC + // Calculate the total number of entries unsigned int mapsize = vec_only_in_this.size() + vec_only_in_other.size(); - float pitch = 1. / (mapsize * 1.1); - float y, x1, x2; + + // Dynamically calculate the pitch based on the number of entries + float canvasHeight = std::max(800.0f, mapsize * 30.0f); // Adjust canvas height based on the number of entries + float pitch = 1.0 / (mapsize + 3.0); // Pitch for spacing between lines (extra space for headers) + + float y = 1.0; + float x1 = 0.02, x2 = x1 + 0.37; std::vector y_x1, y_x2, y_line; - std::vector s_x1, s_x2, s_x3; - y = 1.0; - x1 = 0.02; - x2 = x1 + 0.37; - y -= pitch; + std::vector s_x1, s_x2; - // title for plot + // Title for plot + y -= pitch; y_x1.push_back(y); s_x1.push_back(getLabel()); y_x2.push_back(y); @@ -184,65 +184,61 @@ namespace L1TUtmTriggerMenuInspectorHelper { y_x2.push_back(y); s_x2.push_back("#scale[1.1]{Refer tag / IOV: #color[4]{" + theRefTag + "} / " + theRefIOV + "}"); - y -= pitch / 2.; + y -= pitch / 2.0; y_line.push_back(y); - // First, check if there are records in reference which are not in target + // Records only in reference (not in target) for (const auto& ref : vec_only_in_other) { y -= pitch; y_x1.push_back(y); s_x1.push_back("#scale[0.7]{" + ref + "}"); y_x2.push_back(y); s_x2.push_back("#color[4]{#bf{Only in reference, not in target.}}"); - y_line.push_back(y - (pitch / 2.)); + y_line.push_back(y - (pitch / 2.0)); } - // Second, check if there are records in target which are not in reference + // Records only in target (not in reference) for (const auto& tar : vec_only_in_this) { y -= pitch; y_x1.push_back(y); s_x1.push_back("#scale[0.7]{" + tar + "}"); y_x2.push_back(y); s_x2.push_back("#color[2]{#bf{Only in target, not in reference.}}"); - y_line.push_back(y - (pitch / 2.)); + y_line.push_back(y - (pitch / 2.0)); } - // Finally, print text to TCanvas - TCanvas canvas("L1TUtmMenuData", "L1TUtmMenuData", 2000, std::max(y_x1.size(), y_x2.size()) * 40); + // Adjust canvas size dynamically + TCanvas canvas("L1TUtmMenuData", "L1TUtmMenuData", 2000, static_cast(canvasHeight)); TLatex l; - // Draw the columns titles l.SetTextAlign(12); - float newpitch = 1 / (std::max(y_x1.size(), y_x2.size()) * 1.1); - float factor = newpitch / pitch; - l.SetTextSize(newpitch - 0.002); + // Set the text size dynamically based on pitch + float textSize = std::clamp(pitch, 0.015f, 0.035f); + l.SetTextSize(textSize); + canvas.cd(); for (unsigned int i = 0; i < y_x1.size(); i++) { - l.DrawLatexNDC(x1, 1 - (1 - y_x1[i]) * factor, s_x1[i].c_str()); + l.DrawLatexNDC(x1, y_x1[i], s_x1[i].c_str()); } - for (unsigned int i = 0; i < y_x2.size(); i++) { - l.DrawLatexNDC(x2, 1 - (1 - y_x2[i]) * factor, s_x2[i].c_str()); + l.DrawLatexNDC(x2, y_x2[i], s_x2[i].c_str()); } - canvas.cd(); - canvas.Update(); - // Draw horizontal lines separating records TLine lines[y_line.size()]; - unsigned int iL = 0; - for (const auto& line : y_line) { - lines[iL] = TLine(gPad->GetUxmin(), 1 - (1 - line) * factor, gPad->GetUxmax(), 1 - (1 - line) * factor); - lines[iL].SetLineWidth(1); - lines[iL].SetLineStyle(9); - lines[iL].SetLineColor(2); - lines[iL].Draw("same"); - iL++; + for (unsigned int i = 0; i < y_line.size(); i++) { + lines[i] = TLine(gPad->GetUxmin(), y_line[i], gPad->GetUxmax(), y_line[i]); + lines[i].SetLineWidth(1); + lines[i].SetLineStyle(9); + lines[i].SetLineColor(2); + lines[i].Draw("same"); } - std::string fileName("L1UtmMenuData_Compare.png"); - if (!m_imageFileName.empty()) + // Save the canvas as an image + std::string fileName = "L1UtmMenuData_Compare.png"; + if (!m_imageFileName.empty()) { fileName = m_imageFileName; + } canvas.SaveAs(fileName.c_str()); } diff --git a/CondCore/L1TPlugins/plugins/BuildFile.xml b/CondCore/L1TPlugins/plugins/BuildFile.xml index 2bd2abfb824cc..05b49ca1912ac 100644 --- a/CondCore/L1TPlugins/plugins/BuildFile.xml +++ b/CondCore/L1TPlugins/plugins/BuildFile.xml @@ -3,3 +3,11 @@ + + + + + + + + diff --git a/CondCore/L1TPlugins/plugins/L1TMuonGlobalParams_PayloadInspector.cc b/CondCore/L1TPlugins/plugins/L1TMuonGlobalParams_PayloadInspector.cc new file mode 100644 index 0000000000000..3e50b65cd9799 --- /dev/null +++ b/CondCore/L1TPlugins/plugins/L1TMuonGlobalParams_PayloadInspector.cc @@ -0,0 +1,113 @@ +/*! + \file L1TMuonGlobalParams_PayloadInspector + \Payload Inspector Plugin for L1TMuonGlobalParams payloads + \author Y. Chao + \version $Revision: 1.0 $ + \date $Date: 2024/05/15 12:00:00 $ +*/ + +#include "FWCore/MessageLogger/interface/MessageLogger.h" + +#include "CondCore/Utilities/interface/PayloadInspectorModule.h" +#include "CondCore/Utilities/interface/PayloadInspector.h" +#include "CondCore/CondDB/interface/Time.h" + +// the data format of the condition to be inspected +#include "CondFormats/L1TObjects/interface/L1TMuonGlobalParams.h" + +#include "L1Trigger/L1TMuon/interface/L1TMuonGlobalParamsHelper.h" +#include "L1Trigger/L1TMuon/interface/L1TMuonGlobalParams_PUBLIC.h" + +#include + +// include ROOT +#include "TH1F.h" +#include "TLine.h" +#include "TLegend.h" +#include "TCanvas.h" +#include "TLatex.h" + +namespace { + + using namespace cond::payloadInspector; + + class L1TMuonGlobalParamsInputBits : public PlotImage { + public: + L1TMuonGlobalParamsInputBits() : PlotImage("L1TMuonGlobalParams plot") {} + + bool fill() override { + auto tag = PlotBase::getTag<0>(); + auto iov = tag.iovs.front(); + + std::string IOVsince = std::to_string(std::get<0>(iov)); + std::shared_ptr payload = fetchPayload(std::get<1>(iov)); + if (payload.get()) { + /// Create a canvas + edm::LogInfo("L1TMG") << "absIsoCheckMemLUTPath: " << payload->absIsoCheckMemLUTPath(); + TCanvas canvas("L1TMuonGlobal", "L1TMuonGlobal", 800, 600); + + L1TMuonGlobalParams l1tmg = (L1TMuonGlobalParams)*payload; + L1TMuonGlobalParamsHelper l1tmgph(l1tmg); + + canvas.cd(); + canvas.Update(); + + TLatex tl; + // Draw the columns titles + tl.SetTextAlign(12); + tl.SetTextSize(0.03); + + TH1F input1("InputsToDisable", "", 72, 0, 72); + TH1F input2("MaskedInputs", "", 72, 0, 72); + + TLegend leg(0.60, 0.65, 0.85, 0.85); + + TLine lzero(0.0, 2.0, 72., 2.0); + lzero.SetLineWidth(1); + lzero.SetLineColor(1); + lzero.SetLineStyle(2); + + leg.AddEntry(&input2, "MaskedInputs", "l"); + leg.AddEntry(&input1, "InputsToDisable", "l"); + leg.SetLineColor(0); + leg.SetFillColor(0); + + input1.SetStats(0); + input1.SetMaximum(5); + input1.SetXTitle("InputBits"); + input1.SetYTitle("Bit value"); + input1.SetLabelOffset(0.9, "Y"); + input1.SetLineWidth(3); + input1.SetLineColor(9); + input2.SetLineWidth(3); + input1.SetLineColor(8); + + for (size_t idx = 1; idx <= 72; idx++) { + input1.SetBinContent(idx, l1tmgph.inputsToDisable()[idx] + 0.01); + input2.SetBinContent(idx, l1tmgph.maskedInputs()[idx] + 2.01); + } + + canvas.cd(); + input1.Draw(""); + input2.Draw("same"); + leg.Draw(); + lzero.Draw(); + + auto const label_fw = + fmt::format("fwVersion: {}, bx Min, Max: {}, {}", l1tmgph.fwVersion(), payload->bxMin(), payload->bxMax()); + auto const label_tag = fmt::format("{}, iov: {}", tag.name, IOVsince); + tl.DrawLatexNDC(0.12, 0.85, label_fw.c_str()); + tl.DrawLatexNDC(0.10, 0.92, label_tag.c_str()); + tl.DrawLatexNDC(0.07, 0.59, "1"); + tl.DrawLatexNDC(0.07, 0.27, "1"); + + std::string fileName(m_imageFileName); + canvas.SaveAs(fileName.c_str()); + } // payload + return true; + } // fill + }; + +} // namespace + +PAYLOAD_INSPECTOR_MODULE(L1TMuonGlobalParams) { PAYLOAD_INSPECTOR_CLASS(L1TMuonGlobalParamsInputBits); } diff --git a/CondCore/L1TPlugins/plugins/L1TUtmTriggerMenu_PayloadInspector.cc b/CondCore/L1TPlugins/plugins/L1TUtmTriggerMenu_PayloadInspector.cc index 47d833881afdc..46bfb8a04755a 100644 --- a/CondCore/L1TPlugins/plugins/L1TUtmTriggerMenu_PayloadInspector.cc +++ b/CondCore/L1TPlugins/plugins/L1TUtmTriggerMenu_PayloadInspector.cc @@ -45,73 +45,72 @@ namespace { std::string IOVsince = std::to_string(std::get<0>(iov)); auto tagname = tag.name; std::shared_ptr payload = fetchPayload(std::get<1>(iov)); + if (payload.get()) { - /// Create a canvas const auto& theMap = payload->getAlgorithmMap(); - unsigned int mapsize = theMap.size(); - float pitch = 1. / (mapsize); - float y, x1, x2; - std::vector y_x1, y_x2, y_line; - std::vector s_x1, s_x2, s_x3; + // Dynamically calculate the pitch and canvas height + float canvasHeight = std::max(800.0f, mapsize * 30.0f); // Adjust canvas height based on entries + float pitch = 1.0 / (mapsize + 2.0); // Adjusted pitch for better spacing - // starting table at y=1.0 (top of the canvas) - // first column is at 0.02, second column at 0.32 NDC - y = 1.0; - x1 = 0.02; - x2 = x1 + 0.15; + float y = 1.0; + float x1 = 0.02, x2 = x1 + 0.15; + std::vector y_x1, y_x2, y_line; + std::vector s_x1, s_x2; + // Title for the plot y -= pitch; y_x1.push_back(y); s_x1.push_back("#scale[1.2]{Algo Name}"); y_x2.push_back(y); s_x2.push_back("#scale[1.2]{tag: " + tag.name + " in IOV: " + IOVsince + "}"); - y -= pitch / 2.; + y -= pitch / 2.0; y_line.push_back(y); + // Populate the content for (const auto& [name, algo] : theMap) { y -= pitch; y_x1.push_back(y); s_x1.push_back("''"); - y_x2.push_back(y); s_x2.push_back("#color[2]{" + name + "}"); - y_line.push_back(y - (pitch / 2.)); + y_line.push_back(y - (pitch / 2.0)); } - TCanvas canvas("L1TriggerAlgos", "L1TriggerAlgos", 2000, mapsize * 40); + // Dynamically adjust canvas size + TCanvas canvas("L1TriggerAlgos", "L1TriggerAlgos", 2000, static_cast(canvasHeight)); TLatex l; - // Draw the columns titles l.SetTextAlign(12); - l.SetTextSize(pitch * 10); + + // Set the text size dynamically based on pitch + float textSize = std::clamp(pitch * 10.0f, 0.015f, 0.035f); + l.SetTextSize(textSize); + + // Draw the columns canvas.cd(); for (unsigned int i = 0; i < y_x1.size(); i++) { - l.DrawLatexNDC(x1, 1 - (1 - y_x1[i]), s_x1[i].c_str()); + l.DrawLatexNDC(x1, y_x1[i], s_x1[i].c_str()); } - for (unsigned int i = 0; i < y_x2.size(); i++) { - l.DrawLatexNDC(x2, 1 - (1 - y_x2[i]), s_x2[i].c_str()); + l.DrawLatexNDC(x2, y_x2[i], s_x2[i].c_str()); } - canvas.cd(); - canvas.Update(); - + // Draw horizontal lines separating records TLine lines[y_line.size()]; - unsigned int iL = 0; - for (const auto& line : y_line) { - lines[iL] = TLine(gPad->GetUxmin(), 1 - (1 - line), gPad->GetUxmax(), 1 - (1 - line)); - lines[iL].SetLineWidth(1); - lines[iL].SetLineStyle(9); - lines[iL].SetLineColor(2); - lines[iL].Draw("same"); - iL++; + for (unsigned int i = 0; i < y_line.size(); i++) { + lines[i] = TLine(gPad->GetUxmin(), y_line[i], gPad->GetUxmax(), y_line[i]); + lines[i].SetLineWidth(1); + lines[i].SetLineStyle(9); + lines[i].SetLineColor(2); + lines[i].Draw("same"); } + // Save the canvas as an image std::string fileName(m_imageFileName); canvas.SaveAs(fileName.c_str()); - } // payload + } return true; } // fill }; diff --git a/CondCore/L1TPlugins/test/BuildFile.xml b/CondCore/L1TPlugins/test/BuildFile.xml index 62b846fe6daf7..95216dc072b27 100644 --- a/CondCore/L1TPlugins/test/BuildFile.xml +++ b/CondCore/L1TPlugins/test/BuildFile.xml @@ -1,4 +1,5 @@ + diff --git a/CondCore/L1TPlugins/test/testL1TObjectsPayloadInspector.cpp b/CondCore/L1TPlugins/test/testL1TObjectsPayloadInspector.cpp index 2d42bf0a3b188..efd46aeb36b26 100644 --- a/CondCore/L1TPlugins/test/testL1TObjectsPayloadInspector.cpp +++ b/CondCore/L1TPlugins/test/testL1TObjectsPayloadInspector.cpp @@ -2,6 +2,7 @@ #include #include "CondCore/Utilities/interface/PayloadInspector.h" #include "CondCore/L1TPlugins/plugins/L1TUtmTriggerMenu_PayloadInspector.cc" +#include "CondCore/L1TPlugins/plugins/L1TMuonGlobalParams_PayloadInspector.cc" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/PluginManager/interface/PluginManager.h" #include "FWCore/PluginManager/interface/standard.h" @@ -59,7 +60,12 @@ int main(int argc, char** argv) { test5.process(connectionString, PI::mk_input(tag, start, end, tag2, start, end)); edm::LogPrint("testL1TObjectsPayloadInspector") << test5.data() << std::endl; - edm::LogPrint("testL1TObjectsPayloadInspector") << "## Exercising L1TGlobalPrescalesVetos tests" << std::endl; + edm::LogPrint("testL1TObjectsPayloadInspector") << "## Exercising L1TMuonGlobalParams_ tests" << std::endl; + + L1TMuonGlobalParamsInputBits test6; + tag = "L1TMuonGlobalParams_Stage2v0_2024_mc_v1"; + test6.process(connectionString, PI::mk_input(tag, start, end)); + edm::LogPrint("testL1TObjectsPayloadInspector") << test6.data() << std::endl; Py_Finalize(); } diff --git a/CondCore/L1TPlugins/test/testL1TPI.sh b/CondCore/L1TPlugins/test/testL1TPI.sh index 6df475d455966..486b9bd831085 100755 --- a/CondCore/L1TPlugins/test/testL1TPI.sh +++ b/CondCore/L1TPlugins/test/testL1TPI.sh @@ -86,3 +86,15 @@ getPayloadData.py \ mv *.png $W_DIR/results/L1TUtmTriggerMenu_CompareConditionsTwoTags.png +#################### +# Test L1TMuonGlobalParams input bits +#################### +getPayloadData.py \ + --plugin pluginL1TMuonGlobalParams_PayloadInspector \ + --plot plot_L1TMuonGlobalParamsInputBits \ + --tag L1TMuonGlobalParams_Stage2v0_2024_mc_v1 \ + --time_type Run --iovs '{"start_iov": "1", "end_iov" : "1"}' \ + --db Prod \ + --test; + +mv *.png $W_DIR/results/L1TMuonGlobalParams_InputBits.png diff --git a/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h b/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h index 2454f1eb53b41..a93f774cf24c8 100644 --- a/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h +++ b/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h @@ -176,8 +176,8 @@ namespace AlignPCLThresholdPlotHelper { yBin--; } // loop on types - } // loop on coordinates - } // loop on alignables + } // loop on coordinates + } // loop on alignables Thresholds->GetXaxis()->LabelsOption(isHighGranularity_ ? "v" : "h"); Thresholds->Draw("TEXT"); @@ -378,8 +378,8 @@ namespace AlignPCLThresholdPlotHelper { yBin--; } // loop on types - } // loop on coordinates - } // loop on alignables + } // loop on coordinates + } // loop on alignables ThresholdsColor->Draw("COLZ0"); ThresholdsColor->GetXaxis()->LabelsOption(isHighGranularity_ ? "v" : "h"); diff --git a/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h b/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h index 824c54cc592eb..640f86c651cc6 100644 --- a/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h +++ b/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h @@ -101,8 +101,8 @@ namespace gainCalibHelper { v_diffs.push_back(diff); v_ratios.push_back(ratio); } // loop on rows - } // loop on cols - } // loop on detids + } // loop on cols + } // loop on detids std::sort(v_diffs.begin(), v_diffs.end()); std::sort(v_ratios.begin(), v_ratios.end()); @@ -177,9 +177,9 @@ namespace gainCalibHelper { } h1->Fill(quid); } // loop on rows - } // loop on cols - } // loop on detids - } // fillTheHisto + } // loop on cols + } // loop on detids + } // fillTheHisto //============================================================================ // helper method to fill the gain / pedestal averages per module maps @@ -220,12 +220,12 @@ namespace gainCalibHelper { edm::LogError("gainCalibPI::fillThePerModuleMap") << "Unrecognized type " << theType << std::endl; break; } // switch on the type - } // rows - } // columns + } // rows + } // columns // fill the return value map map[d] = sumOfX / nPixels; } // loop on the detId - } // fillThePerModuleMap + } // fillThePerModuleMap //============================================================================ // helper method to fill the gain / pedestals distributions @@ -279,11 +279,11 @@ namespace gainCalibHelper { edm::LogError("gainCalibPI::fillTheHistos") << d << " is not a Pixel DetId" << std::endl; break; } // switch on subid - } // row loop - } // column loop - } // detid loop - } // filltheHistos - } // namespace gainCalibPI + } // row loop + } // column loop + } // detid loop + } // filltheHistos + } // namespace gainCalibPI constexpr char const* TypeName[2] = {"Gains", "Pedestals"}; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc index 6259304aa37a0..f63d1c1109640 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc @@ -436,7 +436,7 @@ namespace { edm::LogPrint("SiPixelDynamicInefficiencyTest") << " theInstLumiScaleFactor = " << theInstLumiScaleFactor_db; } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc index 20d5bfc3c4a52..c2870979eeca8 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc @@ -215,8 +215,8 @@ namespace { else { throw cms::Exception("LogicError") << "Unknown Pixel SubDet ID " << std::endl; } // else nonsense - } // loop on the channels - } // loop on the scenarios + } // loop on the channels + } // loop on the scenarios gStyle->SetOptStat(0); //========================= @@ -379,8 +379,8 @@ namespace { else { throw cms::Exception("LogicError") << "Unknown Pixel SubDet ID " << std::endl; } // else nonsense - } // loop on the channels - } // loop on the scenarios + } // loop on the channels + } // loop on the scenarios gStyle->SetOptStat(0); //========================= @@ -602,8 +602,8 @@ namespace { else { throw cms::Exception("LogicError") << "Unknown Pixel SubDet ID " << std::endl; } // else nonsense - } // loop on the channels - } // loop on the scenarios + } // loop on the channels + } // loop on the scenarios gStyle->SetOptStat(0); //========================= @@ -708,7 +708,7 @@ namespace { int local_bad_rocs = ch.roc_last - ch.roc_first; badRocCount += local_bad_rocs; } // loop on the channels - } // loop on the DetSetVector + } // loop on the DetSetVector h1->SetBinContent(scenarioIndex, badRocCount); } // loop on scenarios diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc index 278ce3dfae7cd..0e963c110d612 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc @@ -58,7 +58,7 @@ namespace { fillWithValue(element.second); } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc index 8715ed5d90210..c3bfc7abc63b2 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc @@ -193,7 +193,7 @@ namespace { probVec.emplace_back(pair.first, average); } } // if the first PU bin is not 0 - } // if we're asking for all the PU bins + } // if we're asking for all the PU bins TCanvas canvas("Canv", "Canv", 1200, 1000); canvas.cd(); diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc index 8fce9fb96b901..3c1e838c56fee 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc @@ -70,7 +70,7 @@ namespace { COUT << "detId:" << mod.DetID << " error type:" << mod.errorType << " BadRocs:" << BadRocCount << std::endl; } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -113,7 +113,7 @@ namespace { } } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc index 724a489753074..d22e91c741b78 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc @@ -103,7 +103,7 @@ namespace { fillWithValue(1.); } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc index 9f937d1ffdb3b..ef3d160fea0a6 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc @@ -67,7 +67,7 @@ namespace { } } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc index 5350bb9d5e138..7491079983562 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc @@ -86,7 +86,7 @@ namespace { objContainer->printAll(); } // payload - } // iovs + } // iovs return true; } // fill }; @@ -242,9 +242,9 @@ namespace { fillWithValue(payload->getApvGain(it, range)); } // loop over APVs - } // loop over detIds - } // payload - } // iovs + } // loop over detIds + } // payload + } // iovs return true; } // fill }; @@ -296,7 +296,7 @@ namespace { sumOfGainsByLayer[layer].first += payload->getApvGain(it, range); sumOfGainsByLayer[layer].second += 1.; } // loop over APVs - } // loop over detIds + } // loop over detIds // loop on the map to fill the plot for (auto& data : sumOfGainsByLayer) { @@ -304,7 +304,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -348,8 +348,8 @@ namespace { (gain > 2.0) ? 2.0 : gain); } } //loop over detIds - } // loop over payloads - } // loop over iovs + } // loop over payloads + } // loop over iovs return true; } // fill }; @@ -409,7 +409,7 @@ namespace { sumOfGainsByDisk[disk].first += payload->getApvGain(it, range); sumOfGainsByDisk[disk].second += 1.; } // loop over APVs - } // loop over detIds + } // loop over detIds // loop on the map to fill the plot for (auto& data : sumOfGainsByDisk) { @@ -417,7 +417,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -478,7 +478,7 @@ namespace { sumOfGainsByDisk[disk].first += payload->getApvGain(it, range); sumOfGainsByDisk[disk].second += 1.; } // loop over APVs - } // loop over detIds + } // loop over detIds // loop on the map to fill the plot for (auto& data : sumOfGainsByDisk) { @@ -486,7 +486,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -542,7 +542,7 @@ namespace { float gain = payload->getApvGain(it, range); fillWithValue((float)disk - 1, (gain > 2.0) ? 2.0 : gain); } // apvs - } // detids + } // detids } } // iovs return true; @@ -599,7 +599,7 @@ namespace { float gain = payload->getApvGain(it, range); fillWithValue((float)disk - 1, (gain > 2.0) ? 2.0 : gain); } //apvs - } //detids + } //detids } } // iovs return true; @@ -911,7 +911,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); lastmap[index] = Gain; } // loop over APVs - } // loop over detIds + } // loop over detIds detid.clear(); @@ -927,7 +927,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); firstmap[index] = Gain; } // loop over APVs - } // loop over detIds + } // loop over detIds // find the largest deviation std::map cachedRatio; @@ -1099,7 +1099,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; } // payload @@ -1139,7 +1139,7 @@ namespace { sumOfGains += gain; rmsOfGains += (gain * gain); } // loop over APVs - } // loop over detIds + } // loop over detIds meanOfGains = sumOfGains / nAPVs; @@ -1201,7 +1201,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1235,7 +1235,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1269,7 +1269,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1304,7 +1304,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1349,7 +1349,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: @@ -1406,7 +1406,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); lastmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids detid.clear(); first_payload->getDetIds(detid); @@ -1422,7 +1422,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); firstmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload comparison", "payload comparison", 1400, 1000); canvas.Divide(2, 1); @@ -1622,7 +1622,7 @@ namespace { float gain = payload->getApvGain(it, range); h_gains[region]->Fill(gain); } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload breakout", "payload breakout", 1200, 800); canvas.Divide(2, 1); @@ -1831,7 +1831,7 @@ namespace { auto index = std::make_pair(d, nAPV); lastmap[index] = last_payload->getApvGain(it, range); } // end loop on APVs - } // end loop on detids + } // end loop on detids detid.clear(); first_payload->getDetIds(detid); @@ -1845,7 +1845,7 @@ namespace { auto index = std::make_pair(d, nAPV); firstmap[index] = last_payload->getApvGain(it, range); } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload comparison", "payload comparison", 1000, 1000); canvas.cd(); @@ -2014,7 +2014,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); lastmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids detid.clear(); first_payload->getDetIds(detid); @@ -2030,7 +2030,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); firstmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload comparison by Tracker Region", "payload comparison by Tracker Region", 1800, 800); canvas.Divide(2, 1); diff --git a/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc index bea719907a3b1..c3ef93ede147c 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc @@ -57,7 +57,7 @@ namespace { fillWithValue(element.second); } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc index ffe50b0cfd481..f377a885bbe94 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc @@ -87,7 +87,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill }; @@ -214,12 +214,9 @@ namespace { std::string titleMap = "Fraction of bad Strips per module, IOV: " + theIOVsince + " (tag:#color[2]{" + tagname + "})"; - SiStripTkMaps myMap("COLZA0 L"); + SiStripTkMaps myMap("COLZ0 AL"); myMap.bookMap(titleMap, "Fraction of bad Strips per module"); - SiStripTkMaps ghost("AL"); - ghost.bookMap(titleMap, ""); - std::vector detid; payload->getDetIds(detid); @@ -249,7 +246,6 @@ namespace { std::string fileName(m_imageFileName); TCanvas canvas("Bad Components fraction", "bad components fraction"); myMap.drawMap(canvas, ""); - ghost.drawMap(canvas, "same"); canvas.SaveAs(fileName.c_str()); return true; diff --git a/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc index a637f6f1022aa..c6ade88bd1cd5 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc @@ -63,7 +63,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc index 7945c48a716ee..fd3944a51dda1 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc @@ -176,11 +176,11 @@ namespace { default: edm::LogError("SiStripDetVOffListOfModules") << "Unrecognized type: " << my_type << std::endl; break; - } // switch + } // switch i++; // increase counting of modules - } // loop on detids - } // if gets the payload - } // loop on iovs + } // loop on detids + } // if gets the payload + } // loop on iovs return true; } // fill() }; @@ -233,7 +233,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: diff --git a/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc index 74c0ece942a57..d40d13dfd7944 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc @@ -162,7 +162,7 @@ namespace { fillWithValue(element.second); } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc index 8bb5f6180dfa2..eef75a8dc3b68 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc @@ -253,7 +253,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: @@ -452,9 +452,9 @@ namespace { //to be used to fill the histogram fillWithValue(noise); } // loop over APVs - } // loop over detIds - } // payload - } // iovs + } // loop over detIds + } // payload + } // iovs return true; } // fill }; @@ -490,8 +490,8 @@ namespace { //to be used to fill the histogram fillWithValue(noise); } // loop over APVs - } // payload - } // iovs + } // payload + } // iovs return true; } // fill }; @@ -1590,7 +1590,7 @@ namespace { std::get<1>(noisePerStripLength[stripL]) += noise; std::get<2>(noisePerStripLength[stripL]) += (noise * noise); } // loop over strips - } // loop over detIds + } // loop over detIds TCanvas canvas("Noise linearity", "noise linearity", 1200, 1000); canvas.cd(); @@ -1710,7 +1710,7 @@ namespace { sum += noise; sum2 += (noise * noise); } // loop on strips - } // loop on detIds + } // loop on detIds float mean = sum / nStrips; float rms = (sum2 / nStrips - mean * mean) > 0. ? sqrt(sum2 / nStrips - mean * mean) : 0.; @@ -1755,7 +1755,7 @@ namespace { sum += noise; sum2 += (noise * noise); } // loop on strips - } // loop on detIds + } // loop on detIds float mean = sum / nStrips; float rms = (sum2 / nStrips - mean * mean) > 0. ? sqrt(sum2 / nStrips - mean * mean) : 0.; @@ -1800,7 +1800,7 @@ namespace { sum += noise; sum2 += (noise * noise); } // loop on strips - } // loop on detIds + } // loop on detIds float mean = sum / nStrips; float rms = (sum2 / nStrips - mean * mean) > 0. ? sqrt(sum2 / nStrips - mean * mean) : 0.; @@ -1874,7 +1874,7 @@ namespace { noises.emplace(layer, std::vector{}); noises[layer].push_back(noise); } // loop on strips - } // loop on detIds + } // loop on detIds for (auto& entry : noises) { double sum = std::accumulate(entry.second.begin(), entry.second.end(), 0.0); @@ -1891,7 +1891,7 @@ namespace { noises_err.emplace(entry.first, std::vector{}); noises_err[entry.first].push_back(0); } //get - } //run on iov + } //run on iov } TCanvas canvas("Partition summary", "partition summary", 2000, 1000); canvas.cd(); diff --git a/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc index 5d3d183b21aa7..6b3e066480264 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc @@ -215,7 +215,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: @@ -414,9 +414,9 @@ namespace { //to be used to fill the histogram fillWithValue(ped); } // loop over APVs - } // loop over detIds - } // payload - } // iovs + } // loop over detIds + } // payload + } // iovs return true; } // fill }; @@ -452,8 +452,8 @@ namespace { //to be used to fill the histogram fillWithValue(noise); } // loop over APVs - } // payload - } // iovs + } // payload + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/scripts/G2GainsValidator.py b/CondCore/SiStripPlugins/scripts/G2GainsValidator.py index 542037a2f986f..b5d5541c369d6 100644 --- a/CondCore/SiStripPlugins/scripts/G2GainsValidator.py +++ b/CondCore/SiStripPlugins/scripts/G2GainsValidator.py @@ -1,19 +1,20 @@ from __future__ import print_function +from datetime import datetime +import ROOT import configparser as ConfigParser +import datetime import glob -import os +import json import numpy +import optparse +import os import re -import ROOT +import sqlalchemy import string import subprocess import sys -import optparse import time -import json -import datetime -from datetime import datetime import CondCore.Utilities.conddblib as conddb ############################################## @@ -31,26 +32,87 @@ def getCommandOutput(command): return data ############################################## -def getFCSR(): +def getCerts() -> str: +############################################## + cert_path = os.getenv('X509_USER_CERT', '') + key_path = os.getenv('X509_USER_KEY', '') + + certs = "" + if cert_path: + certs += f' --cert {cert_path}' + else: + print("No certificate, nor proxy provided for Tier0 access") + if key_path: + certs += f' --key {key_path}' + return certs + +############################################## +def build_curl_command(url, proxy="", certs="", timeout=30, retries=3, user_agent="MyUserAgent"): +############################################## + """Builds the curl command with the appropriate proxy, certs, and options.""" + cmd = f'/usr/bin/curl -k -L --user-agent "{user_agent}" ' + + if proxy: + cmd += f'--proxy {proxy} ' + else: + cmd += f'{certs} ' + + cmd += f'--connect-timeout {timeout} --retry {retries} {url}' + return cmd + ############################################## - out = subprocess.check_output(["curl", "-k", "-s", "https://cmsweb.cern.ch/t0wmadatasvc/prod/firstconditionsaferun"]) +def get_hlt_fcsr(session): +############################################## + RunInfo = session.get_dbtype(conddb.RunInfo) + lastRun = session.query(sqlalchemy.func.max(RunInfo.run_number)).scalar() + fcsr = lastRun+1 + return int(fcsr) + +############################################## +def getFCSR(proxy="", certs=""): +############################################## + url = "https://cmsweb.cern.ch/t0wmadatasvc/prod/firstconditionsaferun" + cmd = build_curl_command(url, proxy=proxy, certs=certs) + out = subprocess.check_output(cmd, shell=True) response = json.loads(out)["result"][0] return int(response) ############################################## -def getPromptGT(): +def getPromptGT(proxy="", certs=""): ############################################## - out = subprocess.check_output(["curl", "-k", "-s", "https://cmsweb.cern.ch/t0wmadatasvc/prod/reco_config"]) + url = "https://cmsweb.cern.ch/t0wmadatasvc/prod/reco_config" + cmd = build_curl_command(url, proxy=proxy, certs=certs) + out = subprocess.check_output(cmd, shell=True) response = json.loads(out)["result"][0]['global_tag'] return response ############################################## -def getExpressGT(): +def getExpressGT(proxy="", certs=""): ############################################## - out = subprocess.check_output(["curl", "-k", "-s", "https://cmsweb.cern.ch/t0wmadatasvc/prod/express_config"]) + url = "https://cmsweb.cern.ch/t0wmadatasvc/prod/express_config" + cmd = build_curl_command(url, proxy=proxy, certs=certs) + out = subprocess.check_output(cmd, shell=True) response = json.loads(out)["result"][0]['global_tag'] return response +############################################## +def resetSynchonization(db_name): +############################################## + import sqlite3 + + # Connect to the SQLite database + conn = sqlite3.connect(db_name) + + # Create a cursor object to execute SQL commands + cursor = conn.cursor() + + # Execute the SQL command to update the database + cursor.execute("UPDATE TAG SET SYNCHRONIZATION='any' WHERE SYNCHRONIZATION='express';") + + # Commit the changes and close the connection + conn.commit() + conn.close() + ############################################## if __name__ == "__main__": ############################################## @@ -68,17 +130,39 @@ def getExpressGT(): default = -1, help = 'sinces to copy from validation tag', ) - + + parser.add_option('-p', '--proxy', + dest = 'proxy', + default = "", + help = 'proxy to use for curl requests', + ) + + parser.add_option('-u', '--user-mode', + dest='user_mode', + action='store_true', + default=False, + help='Enable user mode with specific X509 user certificate and key') + (options, arguments) = parser.parse_args() + if options.user_mode: + os.environ['X509_USER_KEY'] = os.path.expanduser('~/.globus/userkey.pem') + os.environ['X509_USER_CERT'] = os.path.expanduser('~/.globus/usercert.pem') + print("User mode enabled. Using X509_USER_KEY and X509_USER_CERT from ~/.globus/") - FCSR = getFCSR() - promptGT = getPromptGT() - expressGT = getExpressGT() - print ("Current FCSR:",FCSR,"| Express Global Tag",expressGT,"| Prompt Global Tag",promptGT) + certs = "" + if not options.proxy: + certs = getCerts() + + FCSR = getFCSR(proxy=options.proxy, certs=certs) + promptGT = getPromptGT(proxy=options.proxy, certs=certs) + expressGT = getExpressGT(proxy=options.proxy, certs=certs) con = conddb.connect(url = conddb.make_url("pro")) session = con.session() + + HLTFCSR = get_hlt_fcsr(session) + print ("Current next HLT run", HLTFCSR, "| curret FCSR:", FCSR ,"| Express Global Tag",expressGT,"| Prompt Global Tag",promptGT) IOV = session.get_dbtype(conddb.IOV) TAG = session.get_dbtype(conddb.Tag) GT = session.get_dbtype(conddb.GlobalTag) @@ -99,12 +183,12 @@ def getExpressGT(): IOVsToValidate=[] if(options.since==-1): IOVsToValidate.append(validationTagIOVs[-1][0]) - print("changing the default validation tag since to:",IOVsToValidate[0]) + print("Changing the default validation tag since to:",IOVsToValidate[0]) else: for entry in validationTagIOVs: if(options.since!=1 and int(entry[0])>=int(options.since)): - print("appending to the validation list:",entry[0],entry[1],entry[2]) + print("Appending to the validation list:",entry[0],entry[1],entry[2]) IOVsToValidate.append(entry[0]) for element in myGTMap: @@ -114,24 +198,33 @@ def getExpressGT(): Tag = element[2] if(Record=="SiStripApvGain2Rcd"): TagIOVs = session.query(IOV.since,IOV.payload_hash,IOV.insertion_time).filter(IOV.tag_name == Tag).all() - lastG2Payload = TagIOVs[-1] - print("last payload has IOV since:",lastG2Payload[0],"payload hash:",lastG2Payload[1],"insertion time:",lastG2Payload[2]) + sorted_TagIOVs = sorted(TagIOVs, key=lambda x: x[0]) + lastG2Payload = sorted_TagIOVs[-1] + print("Last G2 Prompt payload has IOV since:",lastG2Payload[0],"payload hash:",lastG2Payload[1],"insertion time:",lastG2Payload[2]) + + # Get and print the current working directory + current_directory = os.getcwd() + print("Current Working Directory:", current_directory) + command = 'conddb_import -c sqlite_file:toCompare.db -f frontier://FrontierProd/CMS_CONDITIONS -i '+str(Tag) +' -t '+str(Tag)+' -b '+str(lastG2Payload[0]) print(command) getCommandOutput(command) + # set syncrhonization to any + resetSynchonization("toCompare.db") + for i,theValidationTagSince in enumerate(IOVsToValidate): command = 'conddb_import -c sqlite_file:toCompare.db -f frontier://FrontierPrep/CMS_CONDITIONS -i '+str(options.validationTag) +' -t '+str(Tag)+' -b '+str(theValidationTagSince) if(theValidationTagSince < lastG2Payload[0]): - print("the last available IOV in the validation tag is older than the current last express IOV, taking FCSR as a since!") + print("The last available IOV in the validation tag is older than the current last express IOV, taking FCSR as a since!") command = 'conddb_import -c sqlite_file:toCompare.db -f frontier://FrontierPrep/CMS_CONDITIONS -i '+str(options.validationTag) +' -t '+str(Tag)+' -b '+str(FCSR+i) print(command) getCommandOutput(command) - command = './testCompare.sh SiStripApvGain_FromParticles_GR10_v1_express '+str(lastG2Payload[0])+' '+str(theValidationTagSince)+ ' toCompare.db' + command = '${CMSSW_BASE}/src/CondCore/SiStripPlugins/scripts/testCompare.sh SiStripApvGain_FromParticles_GR10_v1_express '+str(lastG2Payload[0])+' '+str(theValidationTagSince)+' '+current_directory+'/toCompare.db' if(theValidationTagSince < lastG2Payload[0]): - command = './testCompare.sh SiStripApvGain_FromParticles_GR10_v1_express '+str(lastG2Payload[0])+' '+str(FCSR+i)+ ' toCompare.db' + command = '${CMSSW_BASE}/src/CondCore/SiStripPlugins/scripts/testCompare.sh SiStripApvGain_FromParticles_GR10_v1_express '+str(lastG2Payload[0])+' '+str(FCSR+i)+' '+current_directory+'/toCompare.db' print(command) getCommandOutput(command) diff --git a/CondCore/SiStripPlugins/scripts/testCompare.sh b/CondCore/SiStripPlugins/scripts/testCompare.sh index 8f0051c11d834..9514749973c0d 100755 --- a/CondCore/SiStripPlugins/scripts/testCompare.sh +++ b/CondCore/SiStripPlugins/scripts/testCompare.sh @@ -6,27 +6,25 @@ display_usage() { } # if less than two arguments supplied, display usage - if [ $# -le 3 ] - then - display_usage - exit 1 - fi +if [ $# -le 3 ] +then + display_usage + exit 1 +fi # check whether user had supplied -h or --help . If yes display usage - if [[ ( $# == "--help") || $# == "-h" ]] - then - display_usage - exit 0 - fi +if [[ ( $# == "--help") || $# == "-h" ]] +then + display_usage + exit 0 +fi # Save current working dir so img can be outputted there later W_DIR=$(pwd); -# Set SCRAM architecture var -SCRAM_ARCH=slc6_amd64_gcc630; + STARTIOV=$2 ENDIOV=$3 -export SCRAM_ARCH; source /afs/cern.ch/cms/cmsset_default.sh; eval `scram run -sh`; # Go back to original working directory diff --git a/CondCore/SiStripPlugins/test/BuildFile.xml b/CondCore/SiStripPlugins/test/BuildFile.xml index 3b3cfd5f35a73..30850102f1716 100644 --- a/CondCore/SiStripPlugins/test/BuildFile.xml +++ b/CondCore/SiStripPlugins/test/BuildFile.xml @@ -8,3 +8,4 @@ + diff --git a/CondCore/SiStripPlugins/test/test_G2GainsValidator.sh b/CondCore/SiStripPlugins/test/test_G2GainsValidator.sh new file mode 100755 index 0000000000000..beb3d79aa3518 --- /dev/null +++ b/CondCore/SiStripPlugins/test/test_G2GainsValidator.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +function die { echo $1: status $2 ; exit $2; } +python3 $CMSSW_BASE/src/CondCore/SiStripPlugins/scripts/G2GainsValidator.py || die "Failure running G2GainsValidator.py" $? diff --git a/CondCore/Utilities/bin/conddb_test_gt_perf.cpp b/CondCore/Utilities/bin/conddb_test_gt_perf.cpp index c795a4090330d..46448140c61b3 100644 --- a/CondCore/Utilities/bin/conddb_test_gt_perf.cpp +++ b/CondCore/Utilities/bin/conddb_test_gt_perf.cpp @@ -606,8 +606,8 @@ int cond::TestGTPerf::execute() { std::cout << "for payload type name: " << payloadTypeName << std::endl; } timex.deserInt(p->getBufferSize()); // keep track of time vs. size - } // single-thread - index++; // increment index into payloads + } // single-thread + index++; // increment index into payloads } std::cout << std::endl; diff --git a/CondCore/Utilities/python/tier0.py b/CondCore/Utilities/python/tier0.py index 47dea331c9081..b8eb3d6c349ac 100644 --- a/CondCore/Utilities/python/tier0.py +++ b/CondCore/Utilities/python/tier0.py @@ -11,7 +11,7 @@ import pycurl -tier0Url = 'https://cmsweb.cern.ch/t0wmadatasvc/prod/' +tier0Url = os.getenv('TIER0_API_URL', 'https://cmsweb.cern.ch/t0wmadatasvc/prod/') class Tier0Error(Exception): '''Tier0 exception. @@ -23,7 +23,7 @@ def __init__(self, message): def unique(seq, keepstr=True): t = type(seq) - if t in (unicode, str): + if t is str: t = (list, t('').join)[bool(keepstr)] try: remaining = set(seq) @@ -38,44 +38,52 @@ def unique(seq, keepstr=True): seen = [] return t(c for c in seq if not (c in seen or seen.append(c))) +#note: this exception seems unused class ResponseError( Tier0Error ): - def __init__( self, curl, response, proxy, timeout ): + def __init__( self, curl, response, proxy, timeout, maxTime ): super( ResponseError, self ).__init__( response ) self.args += ( curl, proxy ) self.timeout = timeout - - def __str__( self ): - errStr = """Wrong response for curl connection to Tier0DataSvc from URL \"%s\"""" %( self.args[1].getinfo( self.args[1].EFFECTIVE_URL ), ) - if self.args[ -1 ]: - errStr += """ using proxy \"%s\"""" %( str( self.args[ -1 ] ), ) - errStr += """ with timeout \"%d\" with error code \"%d\".""" %( self.timeout, self.args[1].getinfo( self.args[1].RESPONSE_CODE) ) - if self.args[0].find( '

' ) != -1: - errStr += """\nFull response: \"%s\".""" %( self.args[0].partition('

')[-1].rpartition('

')[0], ) + self.maxTime = maxTime + + def __str__(self): + errStr = f'Wrong response for curl connection to Tier0DataSvc'\ + f' from URL "{self.args[1].getinfo(self.args[1].EFFECTIVE_URL)}"' + if self.args[-1]: + errStr += f' using proxy "{str(self.args[-1])}"' + errStr += f' with connection-timeout "{self.timeout}", max-time "{self.maxtime}"'\ + f' with error code "{self.args[1].getinfo(self.args[1].RESPONSE_CODE)}".' + if '

' in self.args[0]: + full_response = self.args[0].partition('

')[-1].rpartition('

')[0] + errStr += f'\nFull response: "{full_response}".' else: - errStr += """\nFull response: \"%s\".""" %( self.args[0], ) + errStr += f'\nFull response: "{self.args[0]}".' + return errStr #TODO: Add exceptions for each category of HTTP error codes #TODO: check response code and raise corresponding exceptions - -def _raise_http_error( curl, response, proxy, timeout ): - raise ResponseError( curl, response, proxy, timeout ) +#note: this function seems to be unused +def _raise_http_error( curl, response, proxy, timeout, maxTime ): + raise ResponseError( curl, response, proxy, timeout, maxTime ) class Tier0Handler( object ): - def __init__( self, uri, timeOut, retries, retryPeriod, proxy, debug ): + def __init__( self, uri, timeOut, maxTime, retries, retryPeriod, proxy, debug ): """ Parameters: uri: Tier0DataSvc URI; - timeOut: time out for Tier0DataSvc HTTPS calls; + timeOut: time out for connection of Tier0DataSvc HTTPS calls [seconds]; + maxTime: maximum time for Tier0DataSvc HTTPS calls (including data transfer) [seconds]; retries: maximum retries for Tier0DataSvc HTTPS calls; - retryPeriod: sleep time between two Tier0DataSvc HTTPS calls; + retryPeriod: sleep time between two Tier0DataSvc HTTPS calls [seconds]; proxy: HTTP proxy for accessing Tier0DataSvc HTTPS calls; debug: if set to True, enables debug information. """ self._uri = uri self._timeOut = timeOut + self._maxTime = maxTime self._retries = retries self._retryPeriod = retryPeriod self._proxy = proxy @@ -90,51 +98,69 @@ def unsetDebug( self ): def setProxy( self, proxy ): self._proxy = proxy - def _queryTier0DataSvc( self, url ): - """ - Queries Tier0DataSvc. - url: Tier0DataSvc URL. - @returns: dictionary, from whence the required information must be retrieved according to the API call. - Raises if connection error, bad response, or timeout after retries occur. - """ + def _getCerts( self ) -> str: + cert_path = os.getenv('X509_USER_CERT', '') + key_path = os.getenv('X509_USER_KEY', '') - userAgent = "User-Agent: ConditionWebServices/1.0 python/%d.%d.%d PycURL/%s" % ( sys.version_info[ :3 ] + ( pycurl.version_info()[ 1 ], ) ) - - proxy = "" - if self._proxy: proxy = ' --proxy=%s ' % self._proxy - - debug = " -s -S " - if self._debug: debug = " -v " + certs = "" + if cert_path: + certs += f' --cert {cert_path}' + else: + logging.warning("No certificate provided for Tier0 access, use X509_USER_CERT and" + " optionally X509_USER_KEY env variables to specify the path to the cert" + " (and the key unless included in the cert file)") + if key_path: + certs += f' --key {key_path}' + return certs + + def _curlQueryTier0( self, url:str, force_debug:bool = False, force_cert:bool = False): + userAgent = "User-Agent: ConditionWebServices/1.0 python/%d.%d.%d PycURL/%s" \ + % ( sys.version_info[ :3 ] + ( pycurl.version_info()[ 1 ], ) ) + debug = "-v" if self._debug or force_debug else "-s -S" + + proxy = f"--proxy {self._proxy}" if self._proxy else "" + certs = self._getCerts() if not self._proxy or force_cert else "" - cmd = '/usr/bin/curl -k -L --user-agent "%s" %s --connect-timeout %i --retry %i %s %s ' % (userAgent, proxy, self._timeOut, self._retries, debug, url) + cmd = f'/usr/bin/curl -k -L --user-agent "{userAgent}" {proxy}'\ + f' --connect-timeout {self._timeOut} --max-time {self._maxTime} --retry {self._retries}'\ + f' {debug} {url} {certs}' # time the curl to understand if re-tries have been carried out start = time.time() process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdoutdata, stderrdata) = process.communicate() - retcode = process.returncode end = time.time() + return process.returncode, stdoutdata, stderrdata, end-start + + def _queryTier0DataSvc( self, url ): + """ + Queries Tier0DataSvc. + url: Tier0DataSvc URL. + @returns: dictionary, from whence the required information must be retrieved according to the API call. + Raises if connection error, bad response, or timeout after retries occur. + """ + + retcode, stdoutdata, stderrdata, query_time = self._curlQueryTier0(url) if retcode != 0 or stderrdata: - - # if the first curl has failed, logg its stderror and prepare and independent retry - msg = "looks like curl returned an error: retcode=%s and took %s seconds" % (retcode,(end-start),) - msg += ' msg = "'+str(stderrdata)+'"' - logging.error(msg) - - time.sleep(10) - cmd = '/usr/bin/curl -k -L --user-agent "%s" %s --connect-timeout %i --retry %i %s %s ' % (userAgent, proxy, self._timeOut, self._retries, "-v", url) - process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (stdoutdata, stderrdata) = process.communicate() - retcode = process.returncode - if retcode != 0: - msg = "looks like curl returned an error for the second time: retcode=%s" % (retcode,) - msg += ' msg = "'+str(stderrdata)+'"' - logging.error(msg) - raise Tier0Error(msg) - else : - msg = "curl returned ok upon the second try" - logging.info(msg) + + # if the first curl has failed, logg its stderror and prepare and independent retry + msg = "looks like curl returned an error: retcode=%s and took %s seconds" % (retcode, query_time,) + msg += ' msg = "'+str(stderrdata)+'"' + logging.error(msg) + if self._proxy: + logging.info("before assumed proxy provides authentication, now trying with both proxy and certificate") + + time.sleep(self._retryPeriod) + retcode, stdoutdata, stderrdata, query_time = self._curlQueryTier0(url, force_debug=True, force_cert=True) + if retcode != 0: + msg = "looks like curl returned an error for the second time: retcode=%s" % (retcode,) + msg += ' msg = "'+str(stderrdata)+'"' + logging.error(msg) + raise Tier0Error(msg) + else: + msg = "curl returned ok upon the second try" + logging.info(msg) resp = json.loads( ''.join(stdoutdata.decode()).replace( "'", '"').replace(' None', ' "None"') ) return resp @@ -149,7 +175,8 @@ def getFirstSafeRun( self ): firstConditionSafeRunAPI = "firstconditionsaferun" safeRunDict = self._queryTier0DataSvc( os.path.join( self._uri, firstConditionSafeRunAPI ) ) if safeRunDict is None: - errStr = """First condition safe run is not available in Tier0DataSvc from URL \"%s\"""" %( os.path.join( self._uri, firstConditionSafeRunAPI ), ) + errStr = """First condition safe run is not available in Tier0DataSvc from URL \"%s\"""" \ + %( os.path.join( self._uri, firstConditionSafeRunAPI ), ) if self._proxy: errStr += """ using proxy \"%s\".""" %( str( self._proxy ), ) raise Tier0Error( errStr ) @@ -164,19 +191,20 @@ def getGlobalTag( self, config ): Raises if connection error, bad response, timeout after retries occur, or if no Global Tags are available. """ data = self._queryTier0DataSvc( os.path.join( self._uri, config ) ) - gtnames = sorted(unique( [ str( di[ 'global_tag' ] ) for di in data['result'] if di[ 'global_tag' ] is not None ] )) + gtnames = sorted(unique( [ str( di['global_tag'] ) for di in data['result'] if di['global_tag'] is not None ] )) try: recentGT = gtnames[-1] return recentGT except IndexError: - errStr = """No Global Tags for \"%s\" are available in Tier0DataSvc from URL \"%s\"""" %( config, os.path.join( self._uri, config ) ) + errStr = """No Global Tags for \"%s\" are available in Tier0DataSvc from URL \"%s\"""" \ + %( config, os.path.join( self._uri, config ) ) if self._proxy: errStr += """ using proxy \"%s\".""" %( str( self._proxy ), ) raise Tier0Error( errStr ) def test( url ): - t0 = Tier0Handler( url, 1, 1, 1, None, debug=False) + t0 = Tier0Handler( url, 1, 5, 1, 10, None, debug=False) print(' fcsr = %s (%s)' % (t0.getFirstSafeRun(), type(t0.getFirstSafeRun()) )) print(' reco_config = %s' % t0.getGlobalTag('reco_config')) @@ -186,4 +214,3 @@ def test( url ): if __name__ == '__main__': test( tier0Url ) - diff --git a/CondCore/Utilities/scripts/conddb b/CondCore/Utilities/scripts/conddb index 5b33496db1938..788ec3fc2fe6b 100755 --- a/CondCore/Utilities/scripts/conddb +++ b/CondCore/Utilities/scripts/conddb @@ -706,12 +706,13 @@ def _get_hlt_fcsr( session, timeType ): def _get_prompt_fcsr( session, timeType ): tier0timeout = 5 + tier0maxtime = 60 tier0retries = 3 tier0retryPeriod = 5 tier0proxy = None try: t0DataSvc = Tier0Handler( tier0Url, - tier0timeout, tier0retries, tier0retryPeriod, + tier0timeout, tier0maxtime, tier0retries, tier0retryPeriod, tier0proxy, False ) try: fcsr = t0DataSvc.getFirstSafeRun() diff --git a/CondCore/Utilities/src/classes.h b/CondCore/Utilities/src/classes.h deleted file mode 100644 index 13efe4d43ab10..0000000000000 --- a/CondCore/Utilities/src/classes.h +++ /dev/null @@ -1,5 +0,0 @@ -#include - -namespace CondCore_Utilities { - struct dictionary {}; -} // namespace CondCore_Utilities diff --git a/CondCore/Utilities/src/classes_def.xml b/CondCore/Utilities/src/classes_def.xml deleted file mode 100644 index 77a3541f253e8..0000000000000 --- a/CondCore/Utilities/src/classes_def.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/CondFormats/BeamSpotObjects/interface/SimBeamSpotHLLHCObjects.h b/CondFormats/BeamSpotObjects/interface/SimBeamSpotHLLHCObjects.h index 991d92fd38a65..510b02b4750a7 100644 --- a/CondFormats/BeamSpotObjects/interface/SimBeamSpotHLLHCObjects.h +++ b/CondFormats/BeamSpotObjects/interface/SimBeamSpotHLLHCObjects.h @@ -43,7 +43,7 @@ class SimBeamSpotHLLHCObjects { fTimeOffset = 0.0; }; - virtual ~SimBeamSpotHLLHCObjects(){}; + virtual ~SimBeamSpotHLLHCObjects() {} /// set meanX, meanY, meanZ void setMeanX(double val) { fMeanX = val; } diff --git a/CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h b/CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h index ad97a102b1fb8..c51f8dcb3d937 100644 --- a/CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h +++ b/CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h @@ -45,7 +45,7 @@ class SimBeamSpotObjects { fTimeOffset = 0.0; }; - virtual ~SimBeamSpotObjects(){}; + virtual ~SimBeamSpotObjects() {} /// set X, Y, Z positions void setX(double val) { fX0 = val; } diff --git a/CondFormats/CSCObjects/interface/CSCBadChambers.h b/CondFormats/CSCObjects/interface/CSCBadChambers.h index 0f0cfedce6bad..a742145ddcc14 100644 --- a/CondFormats/CSCObjects/interface/CSCBadChambers.h +++ b/CondFormats/CSCObjects/interface/CSCBadChambers.h @@ -10,9 +10,9 @@ class CSCBadChambers { public: typedef uint16_t IndexType; - CSCBadChambers() : numberOfBadChambers(0), chambers(std::vector()){}; - CSCBadChambers(int nch, const std::vector& ch) : numberOfBadChambers(nch), chambers(ch){}; - ~CSCBadChambers(){}; + CSCBadChambers() : numberOfBadChambers(0), chambers(std::vector()) {} + CSCBadChambers(int nch, const std::vector& ch) : numberOfBadChambers(nch), chambers(ch) {} + ~CSCBadChambers() {} /// How many bad chambers are there> int numberOfChambers() const { return numberOfBadChambers; } diff --git a/CondFormats/CSCObjects/test/stubs/CSCReadBadStripsAnalyzer.cc b/CondFormats/CSCObjects/test/stubs/CSCReadBadStripsAnalyzer.cc index a51f4bdf3a876..ec70778d38bd7 100644 --- a/CondFormats/CSCObjects/test/stubs/CSCReadBadStripsAnalyzer.cc +++ b/CondFormats/CSCObjects/test/stubs/CSCReadBadStripsAnalyzer.cc @@ -180,8 +180,8 @@ namespace edmtest { << " chamber index=" << indexc << " layer index=" << indexl << std::endl; badStripWords[indexl - 1].set(chan - 1, 1); // set bit in 80-bit bitset representing this layer - } // j - } // i + } // j + } // i } } diff --git a/CondFormats/CSCObjects/test/stubs/CSCReadBadWiresAnalyzer.cc b/CondFormats/CSCObjects/test/stubs/CSCReadBadWiresAnalyzer.cc index 7197eca6d1d36..f19d04e5d8868 100644 --- a/CondFormats/CSCObjects/test/stubs/CSCReadBadWiresAnalyzer.cc +++ b/CondFormats/CSCObjects/test/stubs/CSCReadBadWiresAnalyzer.cc @@ -183,8 +183,8 @@ namespace edmtest { << " chamber index=" << indexc << " layer index=" << indexl << std::endl; badWireWords[indexl - 1].set(chan - 1, 1); // set bit in 112-bit bitset representing this layer - } // j - } // i + } // j + } // i } } diff --git a/CondFormats/CSCObjects/test/testCSCMapping.cpp b/CondFormats/CSCObjects/test/testCSCMapping.cpp index 4fe0367502e0d..090da99aca779 100644 --- a/CondFormats/CSCObjects/test/testCSCMapping.cpp +++ b/CondFormats/CSCObjects/test/testCSCMapping.cpp @@ -118,8 +118,8 @@ void testCSCMapping::testRead() { std::cout << std::endl; } // end loop over cfebs - } // end loop over dmbs - } // end loop over vmes + } // end loop over dmbs + } // end loop over vmes std::cout << dashedLine << " end" << std::endl; } diff --git a/CondFormats/CastorObjects/interface/CastorQIECoder.h b/CondFormats/CastorObjects/interface/CastorQIECoder.h index 062c5e038a87c..e5c8ebacb18f3 100644 --- a/CondFormats/CastorObjects/interface/CastorQIECoder.h +++ b/CondFormats/CastorObjects/interface/CastorQIECoder.h @@ -53,7 +53,7 @@ class CastorQIECoder { mSlope30(0), mSlope31(0), mSlope32(0), - mSlope33(0){}; + mSlope33(0) {} /// ADC [0..127] + capid [0..3] -> fC conversion float charge(const CastorQIEShape& fShape, unsigned fAdc, unsigned fCapId) const; diff --git a/CondFormats/CastorObjects/src/classes_def.xml b/CondFormats/CastorObjects/src/classes_def.xml index 724d81de39d24..1c143aff5c5ac 100644 --- a/CondFormats/CastorObjects/src/classes_def.xml +++ b/CondFormats/CastorObjects/src/classes_def.xml @@ -44,7 +44,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CondFormats/Common/interface/FileBlob.h b/CondFormats/Common/interface/FileBlob.h index 20ca8055dd571..8f0fb779c32fb 100644 --- a/CondFormats/Common/interface/FileBlob.h +++ b/CondFormats/Common/interface/FileBlob.h @@ -19,7 +19,7 @@ class FileBlob { /// constructor from stream to read FileBlob(std::istream &is, bool zip); - ~FileBlob(){}; + ~FileBlob() {} /// read from real file void read(const std::string &); diff --git a/CondFormats/Common/interface/FileBlobCollection.h b/CondFormats/Common/interface/FileBlobCollection.h index a330318d69e3f..64ba6b95b8390 100644 --- a/CondFormats/Common/interface/FileBlobCollection.h +++ b/CondFormats/Common/interface/FileBlobCollection.h @@ -16,8 +16,8 @@ class FileBlobCollection { public: - FileBlobCollection(){}; - ~FileBlobCollection(){}; + FileBlobCollection() {} + ~FileBlobCollection() {} void addFileBlob(FileBlob &fileBlob); int size() const; std::vector::const_iterator begin() const; diff --git a/CondFormats/DQMObjects/interface/HDQMSummary.h b/CondFormats/DQMObjects/interface/HDQMSummary.h index 19d7cb4822845..9cd78961d9b41 100644 --- a/CondFormats/DQMObjects/interface/HDQMSummary.h +++ b/CondFormats/DQMObjects/interface/HDQMSummary.h @@ -60,8 +60,8 @@ class HDQMSummary { HDQMSummary(std::vector& userDBContent); HDQMSummary(const HDQMSummary& input); - HDQMSummary(){}; - ~HDQMSummary(){}; + HDQMSummary() {} + ~HDQMSummary() {} ContainerIterator getDataVectorBegin() const { return v_sum_.begin(); } ContainerIterator getDataVectorEnd() const { return v_sum_.end(); } diff --git a/CondFormats/DataRecord/interface/SiPhase2OuterTrackerCondDataRecords.h b/CondFormats/DataRecord/interface/SiPhase2OuterTrackerCondDataRecords.h index 1f109d148bed8..0c85df9ad570f 100644 --- a/CondFormats/DataRecord/interface/SiPhase2OuterTrackerCondDataRecords.h +++ b/CondFormats/DataRecord/interface/SiPhase2OuterTrackerCondDataRecords.h @@ -4,15 +4,18 @@ #include "FWCore/Framework/interface/EventSetupRecordImplementation.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" #include "FWCore/Utilities/interface/mplVector.h" /*Record associated to SiPhase2OuterTrackerLorentzAngle Object: the SimRcd is used in simulation only*/ class SiPhase2OuterTrackerLorentzAngleRcd : public edm::eventsetup::DependentRecordImplementation > {}; + edm::mpl::Vector > { +}; class SiPhase2OuterTrackerLorentzAngleSimRcd : public edm::eventsetup::DependentRecordImplementation > {}; + edm::mpl::Vector > { +}; /*Record associated to SiStripBadStrip Object:*/ class SiPhase2OuterTrackerBadStripRcd : public edm::eventsetup::DependentRecordImplementation< SiPhase2OuterTrackerBadStripRcd, diff --git a/CondFormats/ESObjects/interface/ESChannelStatusCode.h b/CondFormats/ESObjects/interface/ESChannelStatusCode.h index ae72db406897e..e1bfc7083d6b8 100644 --- a/CondFormats/ESObjects/interface/ESChannelStatusCode.h +++ b/CondFormats/ESObjects/interface/ESChannelStatusCode.h @@ -10,7 +10,7 @@ class ESChannelStatusCode { public: ESChannelStatusCode(); ESChannelStatusCode(const ESChannelStatusCode& codeStatus); - ESChannelStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus){}; + ESChannelStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus) {} ~ESChannelStatusCode(); //get Methods to be defined according to the final definition diff --git a/CondFormats/ESObjects/interface/ESCondObjectContainer.h b/CondFormats/ESObjects/interface/ESCondObjectContainer.h index 625fa22442109..0db69c6c25b86 100644 --- a/CondFormats/ESObjects/interface/ESCondObjectContainer.h +++ b/CondFormats/ESObjects/interface/ESCondObjectContainer.h @@ -17,8 +17,8 @@ class ESCondObjectContainer { typedef typename std::vector::const_iterator const_iterator; typedef typename std::vector::iterator iterator; - ESCondObjectContainer(){}; - ~ESCondObjectContainer(){}; + ESCondObjectContainer() {} + ~ESCondObjectContainer() {} inline const Items &preshowerItems() const { return es_.items(); }; diff --git a/CondFormats/EcalObjects/BuildFile.xml b/CondFormats/EcalObjects/BuildFile.xml index 3403f3817697c..61c5c69126a5e 100644 --- a/CondFormats/EcalObjects/BuildFile.xml +++ b/CondFormats/EcalObjects/BuildFile.xml @@ -11,7 +11,11 @@ - + + + + + diff --git a/CondFormats/EcalObjects/interface/EcalChannelStatusCode.h b/CondFormats/EcalObjects/interface/EcalChannelStatusCode.h index 09202950bfc68..dbc9257fcd604 100644 --- a/CondFormats/EcalObjects/interface/EcalChannelStatusCode.h +++ b/CondFormats/EcalObjects/interface/EcalChannelStatusCode.h @@ -39,7 +39,7 @@ class EcalChannelStatusCode { public: EcalChannelStatusCode() : status_(0) {} - EcalChannelStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus){}; + EcalChannelStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus) {} void print(std::ostream& s) const { s << "status is: " << status_; } diff --git a/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h b/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h index 1466cca86783b..99aec28e2e2dd 100644 --- a/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h +++ b/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h @@ -19,8 +19,8 @@ class EcalCondObjectContainer { typedef typename std::vector::const_iterator const_iterator; typedef typename std::vector::iterator iterator; - EcalCondObjectContainer(){}; - ~EcalCondObjectContainer(){}; + EcalCondObjectContainer() {} + ~EcalCondObjectContainer() {} void clear() { eb_.clear(); @@ -153,7 +153,7 @@ class EcalCondObjectContainer { mean_xx_EE = mean_xx_EE + x * x; } //iy - } //ix + } //ix } mean_x_EB = mean_x_EB / num_x_EB; diff --git a/CondFormats/EcalObjects/interface/EcalCondTowerObjectContainer.h b/CondFormats/EcalObjects/interface/EcalCondTowerObjectContainer.h index d9108ece1d9dc..456fb04a5b46b 100644 --- a/CondFormats/EcalObjects/interface/EcalCondTowerObjectContainer.h +++ b/CondFormats/EcalObjects/interface/EcalCondTowerObjectContainer.h @@ -25,7 +25,7 @@ class EcalCondTowerObjectContainer { size_t eesize = (size_t)632; ee_.checkAndResize(eesize); }; - ~EcalCondTowerObjectContainer(){}; + ~EcalCondTowerObjectContainer() {} inline const Items &barrelItems() const { return eb_.items(); }; diff --git a/CondFormats/EcalObjects/interface/EcalDAQStatusCode.h b/CondFormats/EcalObjects/interface/EcalDAQStatusCode.h index a7fbf0e7a92fc..2d5589c9cfac8 100644 --- a/CondFormats/EcalObjects/interface/EcalDAQStatusCode.h +++ b/CondFormats/EcalObjects/interface/EcalDAQStatusCode.h @@ -15,7 +15,7 @@ class EcalDAQStatusCode { public: EcalDAQStatusCode(); EcalDAQStatusCode(const EcalDAQStatusCode& codeStatus); - EcalDAQStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus){}; + EcalDAQStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus) {} ~EcalDAQStatusCode(); //get Methods to be defined according to the final definition diff --git a/CondFormats/EcalObjects/interface/EcalDQMStatusCode.h b/CondFormats/EcalObjects/interface/EcalDQMStatusCode.h index 07a4cb4c5ba6d..a0b57960624b3 100644 --- a/CondFormats/EcalObjects/interface/EcalDQMStatusCode.h +++ b/CondFormats/EcalObjects/interface/EcalDQMStatusCode.h @@ -10,7 +10,7 @@ class EcalDQMStatusCode { public: EcalDQMStatusCode(); EcalDQMStatusCode(const EcalDQMStatusCode& codeStatus); - EcalDQMStatusCode(const uint32_t& encodedStatus) : status_(encodedStatus){}; + EcalDQMStatusCode(const uint32_t& encodedStatus) : status_(encodedStatus) {} ~EcalDQMStatusCode(); //get Methods to be defined according to the final definition diff --git a/CondFormats/EcalObjects/interface/EcalEBPhase2TPGAmplWeightIdMap.h b/CondFormats/EcalObjects/interface/EcalEBPhase2TPGAmplWeightIdMap.h index ee5a3fdb3b02c..97b20b5101385 100644 --- a/CondFormats/EcalObjects/interface/EcalEBPhase2TPGAmplWeightIdMap.h +++ b/CondFormats/EcalObjects/interface/EcalEBPhase2TPGAmplWeightIdMap.h @@ -12,8 +12,8 @@ class EcalEBPhase2TPGAmplWeightIdMap { typedef std::map EcalEBPhase2TPGAmplWeightMap; typedef std::map::const_iterator EcalEBPhase2TPGAmplWeightMapItr; - EcalEBPhase2TPGAmplWeightIdMap(){}; - ~EcalEBPhase2TPGAmplWeightIdMap(){}; + EcalEBPhase2TPGAmplWeightIdMap() {} + ~EcalEBPhase2TPGAmplWeightIdMap() {} const EcalEBPhase2TPGAmplWeightMap& getMap() const { return map_; } void setValue(const uint32_t& id, const EcalEBPhase2TPGAmplWeights& value); diff --git a/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatios.h b/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatios.h index 2986ad758b9ab..782e2b2395937 100644 --- a/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatios.h +++ b/CondFormats/EcalObjects/interface/EcalLaserAPDPNRatios.h @@ -33,8 +33,8 @@ class EcalLaserAPDPNRatios { typedef EcalCondObjectContainer EcalLaserAPDPNRatiosMap; typedef std::vector EcalLaserTimeStampMap; - EcalLaserAPDPNRatios() : time_map(92){}; // FIXME - ~EcalLaserAPDPNRatios(){}; + EcalLaserAPDPNRatios() : time_map(92) {} // FIXME + ~EcalLaserAPDPNRatios() {} void setValue(uint32_t rawId, const EcalLaserAPDPNpair& value) { laser_map[rawId] = value; }; const EcalLaserAPDPNRatiosMap& getLaserMap() const { return laser_map; } diff --git a/CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h b/CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h index f5d44be83fc5d..3f0990375bd15 100644 --- a/CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h +++ b/CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h @@ -12,7 +12,7 @@ namespace reco { class EcalMustacheSCParameters { public: - EcalMustacheSCParameters(){}; + EcalMustacheSCParameters() {} virtual ~EcalMustacheSCParameters() = default; struct ParabolaParameters { diff --git a/CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h b/CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h index dbee3cd8f5a5b..718c38d4ecb8e 100644 --- a/CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h +++ b/CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h @@ -12,7 +12,7 @@ namespace reco { class EcalSCDynamicDPhiParameters { public: - EcalSCDynamicDPhiParameters(){}; + EcalSCDynamicDPhiParameters() {} virtual ~EcalSCDynamicDPhiParameters() = default; struct DynamicDPhiParameters { diff --git a/CondFormats/EcalObjects/interface/EcalSRSettings.h b/CondFormats/EcalObjects/interface/EcalSRSettings.h index 65864614b86dc..79575fdc93e65 100644 --- a/CondFormats/EcalObjects/interface/EcalSRSettings.h +++ b/CondFormats/EcalObjects/interface/EcalSRSettings.h @@ -33,7 +33,7 @@ class EcalSRSettings { /**Destructor */ - virtual ~EcalSRSettings(){}; + virtual ~EcalSRSettings() {} //method(s) public: diff --git a/CondFormats/EcalObjects/interface/EcalSimPulseShape.h b/CondFormats/EcalObjects/interface/EcalSimPulseShape.h index b6c1790956d12..76b1069936161 100644 --- a/CondFormats/EcalObjects/interface/EcalSimPulseShape.h +++ b/CondFormats/EcalObjects/interface/EcalSimPulseShape.h @@ -6,8 +6,8 @@ class EcalSimPulseShape { public: - EcalSimPulseShape(){}; - ~EcalSimPulseShape(){}; + EcalSimPulseShape() {} + ~EcalSimPulseShape() {} void setTimeInterval(float x) { time_interval = x; }; float getTimeInterval() { return time_interval; }; diff --git a/CondFormats/EcalObjects/interface/EcalTPGCrystalStatusCode.h b/CondFormats/EcalObjects/interface/EcalTPGCrystalStatusCode.h index 883e1d98798a8..96f901c7cf736 100644 --- a/CondFormats/EcalObjects/interface/EcalTPGCrystalStatusCode.h +++ b/CondFormats/EcalObjects/interface/EcalTPGCrystalStatusCode.h @@ -15,7 +15,7 @@ class EcalTPGCrystalStatusCode { public: EcalTPGCrystalStatusCode(); EcalTPGCrystalStatusCode(const EcalTPGCrystalStatusCode& codeStatus); - EcalTPGCrystalStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus){}; + EcalTPGCrystalStatusCode(const uint16_t& encodedStatus) : status_(encodedStatus) {} ~EcalTPGCrystalStatusCode(); //get Methods to be defined according to the final definition diff --git a/CondFormats/EcalObjects/interface/EcalTimeDependentCorrections.h b/CondFormats/EcalObjects/interface/EcalTimeDependentCorrections.h index 06ff5ab1f4b2d..cc6a1a9e1d73a 100644 --- a/CondFormats/EcalObjects/interface/EcalTimeDependentCorrections.h +++ b/CondFormats/EcalObjects/interface/EcalTimeDependentCorrections.h @@ -33,8 +33,8 @@ class EcalTimeDependentCorrections { typedef EcalCondObjectContainer EcalValueMap; typedef std::vector EcalTimeMap; - EcalTimeDependentCorrections() : time_map(92){}; // FIXME - ~EcalTimeDependentCorrections(){}; + EcalTimeDependentCorrections() : time_map(92) {} // FIXME + ~EcalTimeDependentCorrections() {} void setValue(uint32_t rawId, const Values& value) { value_map[rawId] = value; }; const EcalValueMap& getValueMap() const { return value_map; } diff --git a/CondFormats/GEMObjects/interface/GEMROMapping.h b/CondFormats/GEMObjects/interface/GEMROMapping.h index aecf3418b4832..934f52cb24c80 100644 --- a/CondFormats/GEMObjects/interface/GEMROMapping.h +++ b/CondFormats/GEMObjects/interface/GEMROMapping.h @@ -96,7 +96,7 @@ class GEMROMapping { } }; - GEMROMapping(){}; + GEMROMapping() {} bool isValidChipID(const vfatEC& r) const { return vfatMap_.find(r) != vfatMap_.end(); } bool isValidChamber(const chamEC& r) const { return chamberMap_.find(r) != chamberMap_.end(); } diff --git a/CondFormats/GEMObjects/interface/GEMROmap.h b/CondFormats/GEMObjects/interface/GEMROmap.h index fec6b4bdbf65e..fd95410127b34 100644 --- a/CondFormats/GEMObjects/interface/GEMROmap.h +++ b/CondFormats/GEMObjects/interface/GEMROmap.h @@ -61,7 +61,7 @@ class GEMROmap { } }; - GEMROmap(){}; + GEMROmap() {} bool isValidChipID(const eCoord& r) const { return roMapED_.find(r) != roMapED_.end(); } const dCoord& hitPosition(const eCoord& r) const { return roMapED_.at(r); } diff --git a/CondFormats/GeometryObjects/interface/PCaloGeometry.h b/CondFormats/GeometryObjects/interface/PCaloGeometry.h index 66aa1b3a74b95..f4fb09f62efa8 100644 --- a/CondFormats/GeometryObjects/interface/PCaloGeometry.h +++ b/CondFormats/GeometryObjects/interface/PCaloGeometry.h @@ -14,7 +14,7 @@ class PCaloGeometry { std::vector const &, std::vector const &); - ~PCaloGeometry(){}; + ~PCaloGeometry() {} std::vector const &getTranslation() const { return m_translation; } std::vector const &getDimension() const { return m_dimension; } diff --git a/CondFormats/GeometryObjects/interface/PGeometricDet.h b/CondFormats/GeometryObjects/interface/PGeometricDet.h index b5f027228dcb7..62ac7c9f5c315 100644 --- a/CondFormats/GeometryObjects/interface/PGeometricDet.h +++ b/CondFormats/GeometryObjects/interface/PGeometricDet.h @@ -8,8 +8,8 @@ class PGeometricDet { public: - PGeometricDet(){}; - ~PGeometricDet(){}; + PGeometricDet() {} + ~PGeometricDet() {} struct Item { std::string _name; // save only the name, not the namespace. diff --git a/CondFormats/GeometryObjects/interface/PGeometricTimingDet.h b/CondFormats/GeometryObjects/interface/PGeometricTimingDet.h index 6c6cddaca5b97..7b1780debb08d 100644 --- a/CondFormats/GeometryObjects/interface/PGeometricTimingDet.h +++ b/CondFormats/GeometryObjects/interface/PGeometricTimingDet.h @@ -8,8 +8,8 @@ class PGeometricTimingDet { public: - PGeometricTimingDet(){}; - ~PGeometricTimingDet(){}; + PGeometricTimingDet() {} + ~PGeometricTimingDet() {} struct Item { std::string name_; // save only the name, not the namespace. diff --git a/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h b/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h index 3966b7f40c04d..a74dcdc63a62b 100644 --- a/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h +++ b/CondFormats/GeometryObjects/interface/PTrackerAdditionalParametersPerDet.h @@ -13,7 +13,7 @@ class PTrackerAdditionalParametersPerDet { floatParams_.resize(FSIZE, std::vector(0, 0.)); boolParams_.resize(BSIZE, std::vector(0, false)); }; - ~PTrackerAdditionalParametersPerDet(){}; + ~PTrackerAdditionalParametersPerDet() {} enum IntParamIndex { GEOGRAPHICAL_ID = 0, BIGPIXELS_X = 1, BIGPIXELS_Y = 2, ISIZE = 3 }; enum BoolParamIndex { BSIZE = 0 }; diff --git a/CondFormats/HGCalObjects/BuildFile.xml b/CondFormats/HGCalObjects/BuildFile.xml index 6f6a7def437f1..db1814eeed0ef 100644 --- a/CondFormats/HGCalObjects/BuildFile.xml +++ b/CondFormats/HGCalObjects/BuildFile.xml @@ -7,8 +7,12 @@ - + + + + + - \ No newline at end of file + diff --git a/CondFormats/HIObjects/interface/UETable.h b/CondFormats/HIObjects/interface/UETable.h index 2dd1d19aaf174..ed863a2f57e69 100644 --- a/CondFormats/HIObjects/interface/UETable.h +++ b/CondFormats/HIObjects/interface/UETable.h @@ -6,7 +6,7 @@ class UETable { public: - UETable(){}; + UETable() {} float getUE(int i) { return values[i]; } unsigned int getNp(int i) { return np[i]; } unsigned int getNi0(int i) { return ni0[i]; } diff --git a/CondFormats/HcalObjects/BuildFile.xml b/CondFormats/HcalObjects/BuildFile.xml index 86637f594c35b..34f054dc82699 100644 --- a/CondFormats/HcalObjects/BuildFile.xml +++ b/CondFormats/HcalObjects/BuildFile.xml @@ -10,8 +10,12 @@ - - + + + + + + diff --git a/CondFormats/HcalObjects/interface/DummyOOTPileupCorrection.h b/CondFormats/HcalObjects/interface/DummyOOTPileupCorrection.h index 72b6246cda24e..7b842a6a2dd06 100644 --- a/CondFormats/HcalObjects/interface/DummyOOTPileupCorrection.h +++ b/CondFormats/HcalObjects/interface/DummyOOTPileupCorrection.h @@ -55,7 +55,7 @@ class DummyOOTPileupCorrection : public AbsOOTPileupCorrection { template inline void serialize(Archive& ar, unsigned /* version */) { boost::serialization::base_object(*this); - ar& descr_& scale_; + ar & descr_ & scale_; } }; diff --git a/CondFormats/HcalObjects/interface/HBHEChannelGroups.h b/CondFormats/HcalObjects/interface/HBHEChannelGroups.h index c2b8918dacdba..1b0493cf17dc2 100644 --- a/CondFormats/HcalObjects/interface/HBHEChannelGroups.h +++ b/CondFormats/HcalObjects/interface/HBHEChannelGroups.h @@ -62,12 +62,12 @@ class HBHEChannelGroups { inline void save(Archive& ar, const unsigned /* version */) const { if (!validate()) throw cms::Exception("In HBHEChannelGroups::save: invalid data"); - ar& group_; + ar & group_; } template inline void load(Archive& ar, const unsigned /* version */) { - ar& group_; + ar & group_; if (!validate()) throw cms::Exception("In HBHEChannelGroups::load: invalid data"); } diff --git a/CondFormats/HcalObjects/interface/HBHENegativeEFilter.h b/CondFormats/HcalObjects/interface/HBHENegativeEFilter.h index 4fe5385b11e00..d000e22bf3565 100644 --- a/CondFormats/HcalObjects/interface/HBHENegativeEFilter.h +++ b/CondFormats/HcalObjects/interface/HBHENegativeEFilter.h @@ -61,12 +61,12 @@ class HBHENegativeEFilter { inline void save(Archive& ar, const unsigned /* version */) const { if (!validate()) throw cms::Exception("In HBHENegativeEFilter::save: invalid data"); - ar& a1v_& a2v_& iEtaLimits_& cut_& minCharge_& tFirst_& tLast_; + ar & a1v_ & a2v_ & iEtaLimits_ & cut_ & minCharge_ & tFirst_ & tLast_; } template inline void load(Archive& ar, const unsigned /* version */) { - ar& a1v_& a2v_& iEtaLimits_& cut_& minCharge_& tFirst_& tLast_; + ar & a1v_ & a2v_ & iEtaLimits_ & cut_ & minCharge_ & tFirst_ & tLast_; if (!validate()) throw cms::Exception("In HBHENegativeEFilter::load: invalid data"); } diff --git a/CondFormats/HcalObjects/interface/HFPhase1PMTData.h b/CondFormats/HcalObjects/interface/HFPhase1PMTData.h index 6562879b96d4b..ac05987097f5b 100644 --- a/CondFormats/HcalObjects/interface/HFPhase1PMTData.h +++ b/CondFormats/HcalObjects/interface/HFPhase1PMTData.h @@ -74,7 +74,7 @@ class HFPhase1PMTData { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& cuts_& minCharge0_& minCharge1_& minChargeAsymm_; + ar & cuts_ & minCharge0_ & minCharge1_ & minChargeAsymm_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalChebyshevFunctor.h b/CondFormats/HcalObjects/interface/HcalChebyshevFunctor.h index a270c2dcbea97..2283c0a39df7b 100644 --- a/CondFormats/HcalObjects/interface/HcalChebyshevFunctor.h +++ b/CondFormats/HcalObjects/interface/HcalChebyshevFunctor.h @@ -50,7 +50,7 @@ class HcalChebyshevFunctor : public AbsHcalFunctor { template inline void serialize(Archive& ar, unsigned /* version */) { boost::serialization::base_object(*this); - ar& coeffs_& xmin_& xmax_& outOfRangeValue_; + ar & coeffs_ & xmin_ & xmax_ & outOfRangeValue_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalConstFunctor.h b/CondFormats/HcalObjects/interface/HcalConstFunctor.h index bac5a04723713..f4d39017f9b5d 100644 --- a/CondFormats/HcalObjects/interface/HcalConstFunctor.h +++ b/CondFormats/HcalObjects/interface/HcalConstFunctor.h @@ -35,7 +35,7 @@ class HcalConstFunctor : public AbsHcalFunctor { template inline void serialize(Archive& ar, unsigned /* version */) { boost::serialization::base_object(*this); - ar& value_; + ar & value_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalCubicInterpolator.h b/CondFormats/HcalObjects/interface/HcalCubicInterpolator.h index 05bcefd7b218c..e3837375abda8 100644 --- a/CondFormats/HcalObjects/interface/HcalCubicInterpolator.h +++ b/CondFormats/HcalObjects/interface/HcalCubicInterpolator.h @@ -53,7 +53,7 @@ class HcalCubicInterpolator : public AbsHcalFunctor { template inline void serialize(Archive& ar, unsigned /* version */) { boost::serialization::base_object(*this); - ar& abscissae_& values_& derivatives_; + ar & abscissae_ & values_ & derivatives_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalIndexLookup.h b/CondFormats/HcalObjects/interface/HcalIndexLookup.h index a944cafb23c60..5b32f5fb54eeb 100644 --- a/CondFormats/HcalObjects/interface/HcalIndexLookup.h +++ b/CondFormats/HcalObjects/interface/HcalIndexLookup.h @@ -65,12 +65,12 @@ class HcalIndexLookup { // Make sure that there are no duplicate ids if ((const_cast(this))->hasDuplicateIds()) throw cms::Exception("In HcalIndexLookup::save: invalid data"); - ar& data_& sorted_; + ar & data_ & sorted_; } template inline void load(Archive& ar, const unsigned /* version */) { - ar& data_& sorted_; + ar & data_ & sorted_; if (hasDuplicateIds()) throw cms::Exception("In HcalIndexLookup::load: invalid data"); } diff --git a/CondFormats/HcalObjects/interface/HcalInterpolatedPulseColl.h b/CondFormats/HcalObjects/interface/HcalInterpolatedPulseColl.h index 8b2ef13b53093..75a27e43745ed 100644 --- a/CondFormats/HcalObjects/interface/HcalInterpolatedPulseColl.h +++ b/CondFormats/HcalObjects/interface/HcalInterpolatedPulseColl.h @@ -33,7 +33,7 @@ class HcalInterpolatedPulseColl { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& pulses_& groups_; + ar & pulses_ & groups_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalInterpolatedTableFunctor.h b/CondFormats/HcalObjects/interface/HcalInterpolatedTableFunctor.h index fe16e32aec6a7..3eb2d4dbfa1b9 100644 --- a/CondFormats/HcalObjects/interface/HcalInterpolatedTableFunctor.h +++ b/CondFormats/HcalObjects/interface/HcalInterpolatedTableFunctor.h @@ -62,7 +62,7 @@ class HcalInterpolatedTableFunctor : public AbsHcalFunctor { template inline void serialize(Archive& ar, unsigned /* version */) { boost::serialization::base_object(*this); - ar& values_& xmin_& xmax_& leftExtrapolationLinear_& rightExtrapolationLinear_; + ar & values_ & xmin_ & xmax_ & leftExtrapolationLinear_ & rightExtrapolationLinear_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalItemColl.h b/CondFormats/HcalObjects/interface/HcalItemColl.h index 48e041a196c21..52d96796a8778 100644 --- a/CondFormats/HcalObjects/interface/HcalItemColl.h +++ b/CondFormats/HcalObjects/interface/HcalItemColl.h @@ -64,7 +64,7 @@ class HcalItemColl { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& data_; + ar & data_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalItemCollById.h b/CondFormats/HcalObjects/interface/HcalItemCollById.h index 2710f3d4ba01f..03dde20f34ab5 100644 --- a/CondFormats/HcalObjects/interface/HcalItemCollById.h +++ b/CondFormats/HcalObjects/interface/HcalItemCollById.h @@ -124,7 +124,7 @@ class HcalItemCollById : public AbsHcalAlgoData { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& coll_& lookup_& default_& transformCode_; + ar & coll_ & lookup_ & default_ & transformCode_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalLinearCompositionFunctor.h b/CondFormats/HcalObjects/interface/HcalLinearCompositionFunctor.h index a8f2e91f5deb7..ffab718bae8ff 100644 --- a/CondFormats/HcalObjects/interface/HcalLinearCompositionFunctor.h +++ b/CondFormats/HcalObjects/interface/HcalLinearCompositionFunctor.h @@ -52,7 +52,7 @@ class HcalLinearCompositionFunctor : public AbsHcalFunctor { // in boost for versions 1.56, 1.57, 1.58. For detail, see // https://svn.boost.org/trac/boost/ticket/10727 #if BOOST_VERSION < 105600 || BOOST_VERSION > 105800 - ar& other_& a_& b_; + ar & other_ & a_ & b_; #else throw cms::Exception( "HcalLinearCompositionFunctor can not be" diff --git a/CondFormats/HcalObjects/interface/HcalPiecewiseLinearFunctor.h b/CondFormats/HcalObjects/interface/HcalPiecewiseLinearFunctor.h index d9cda1ecbfacd..245113c5d7767 100644 --- a/CondFormats/HcalObjects/interface/HcalPiecewiseLinearFunctor.h +++ b/CondFormats/HcalObjects/interface/HcalPiecewiseLinearFunctor.h @@ -69,7 +69,7 @@ class HcalPiecewiseLinearFunctor : public AbsHcalFunctor { template inline void serialize(Archive& ar, unsigned /* version */) { boost::serialization::base_object(*this); - ar& abscissae_& values_& leftExtrapolationLinear_& rightExtrapolationLinear_; + ar & abscissae_ & values_ & leftExtrapolationLinear_ & rightExtrapolationLinear_; } }; diff --git a/CondFormats/HcalObjects/interface/HcalPolynomialFunctor.h b/CondFormats/HcalObjects/interface/HcalPolynomialFunctor.h index f79470739e673..3867cbb7d5e43 100644 --- a/CondFormats/HcalObjects/interface/HcalPolynomialFunctor.h +++ b/CondFormats/HcalObjects/interface/HcalPolynomialFunctor.h @@ -54,7 +54,7 @@ class HcalPolynomialFunctor : public AbsHcalFunctor { template inline void serialize(Archive& ar, unsigned /* version */) { boost::serialization::base_object(*this); - ar& coeffs_& shift_& xmin_& xmax_& outOfRangeValue_; + ar & coeffs_ & shift_ & xmin_ & xmax_ & outOfRangeValue_; } }; diff --git a/CondFormats/HcalObjects/interface/InterpolatedPulse.h b/CondFormats/HcalObjects/interface/InterpolatedPulse.h index e8e702212d362..a2bcd0a12d93d 100644 --- a/CondFormats/HcalObjects/interface/InterpolatedPulse.h +++ b/CondFormats/HcalObjects/interface/InterpolatedPulse.h @@ -282,7 +282,7 @@ class InterpolatedPulse { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& tmin_& width_& length_; + ar & tmin_ & width_ & length_; // In case we are reading, it may be useful to verify // that the length is reasonable diff --git a/CondFormats/HcalObjects/interface/OOTPileupCorrData.h b/CondFormats/HcalObjects/interface/OOTPileupCorrData.h index 173f6c161b8fa..7364482104e07 100644 --- a/CondFormats/HcalObjects/interface/OOTPileupCorrData.h +++ b/CondFormats/HcalObjects/interface/OOTPileupCorrData.h @@ -133,13 +133,13 @@ class OOTPileupCorrData : public AbsOOTPileupCorrection { if (!validate()) throw cms::Exception("In OOTPileupCorrData::save: invalid data"); boost::serialization::base_object(*this); - ar& corrs_& iEtaLimits_& chargeLimit_& requireFirstTS_& requireNTS_& readjustTiming_; + ar & corrs_ & iEtaLimits_ & chargeLimit_ & requireFirstTS_ & requireNTS_ & readjustTiming_; } template inline void load(Archive& ar, const unsigned /* version */) { boost::serialization::base_object(*this); - ar& corrs_& iEtaLimits_& chargeLimit_& requireFirstTS_& requireNTS_& readjustTiming_; + ar & corrs_ & iEtaLimits_ & chargeLimit_ & requireFirstTS_ & requireNTS_ & readjustTiming_; if (!validate()) throw cms::Exception("In OOTPileupCorrData::load: invalid data"); } diff --git a/CondFormats/HcalObjects/interface/OOTPileupCorrDataFcn.h b/CondFormats/HcalObjects/interface/OOTPileupCorrDataFcn.h index 10cdc31d4cd11..93ba39aa920a0 100644 --- a/CondFormats/HcalObjects/interface/OOTPileupCorrDataFcn.h +++ b/CondFormats/HcalObjects/interface/OOTPileupCorrDataFcn.h @@ -47,7 +47,7 @@ class OOTPileupCorrDataFcn { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& a1_& a2_& a3_& a_1_; + ar & a1_ & a2_ & a3_ & a_1_; } }; diff --git a/CondFormats/HcalObjects/interface/OOTPileupCorrectionColl.h b/CondFormats/HcalObjects/interface/OOTPileupCorrectionColl.h index 1c4e01faccb15..cefe64e5c79c4 100644 --- a/CondFormats/HcalObjects/interface/OOTPileupCorrectionColl.h +++ b/CondFormats/HcalObjects/interface/OOTPileupCorrectionColl.h @@ -35,7 +35,7 @@ class OOTPileupCorrectionColl { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& data_; + ar & data_; } }; diff --git a/CondFormats/HcalObjects/interface/PiecewiseScalingPolynomial.h b/CondFormats/HcalObjects/interface/PiecewiseScalingPolynomial.h index cd72117457123..c191bcef24e1a 100644 --- a/CondFormats/HcalObjects/interface/PiecewiseScalingPolynomial.h +++ b/CondFormats/HcalObjects/interface/PiecewiseScalingPolynomial.h @@ -53,12 +53,12 @@ class PiecewiseScalingPolynomial { inline void save(Archive& ar, const unsigned /* version */) const { if (!validate()) throw cms::Exception("In PiecewiseScalingPolynomial::save: invalid data"); - ar& coeffs_& limits_; + ar & coeffs_ & limits_; } template inline void load(Archive& ar, const unsigned /* version */) { - ar& coeffs_& limits_; + ar & coeffs_ & limits_; if (!validate()) throw cms::Exception("In PiecewiseScalingPolynomial::load: invalid data"); } diff --git a/CondFormats/HcalObjects/interface/ScalingExponential.h b/CondFormats/HcalObjects/interface/ScalingExponential.h index b6dea470fd9d8..c6df89c80e2ba 100644 --- a/CondFormats/HcalObjects/interface/ScalingExponential.h +++ b/CondFormats/HcalObjects/interface/ScalingExponential.h @@ -34,7 +34,7 @@ class ScalingExponential { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& p0_& p1_& linear_; + ar & p0_ & p1_ & linear_; } }; diff --git a/CondFormats/HcalObjects/interface/StorableDoubleMap.h b/CondFormats/HcalObjects/interface/StorableDoubleMap.h index 1b5b8b5e76ea8..e6ccae7785395 100644 --- a/CondFormats/HcalObjects/interface/StorableDoubleMap.h +++ b/CondFormats/HcalObjects/interface/StorableDoubleMap.h @@ -42,7 +42,7 @@ class StorableDoubleMap { template inline void serialize(Archive& ar, unsigned /* version */) { - ar& data_; + ar & data_; } }; diff --git a/CondFormats/HcalObjects/src/classes.h b/CondFormats/HcalObjects/src/classes.h index 43fa0f97bad63..4cd4ed95cb0a6 100644 --- a/CondFormats/HcalObjects/src/classes.h +++ b/CondFormats/HcalObjects/src/classes.h @@ -1,125 +1 @@ #include "CondFormats/HcalObjects/src/headers.h" - -namespace CondFormats_HcalObjects { - struct dictionary { - HcalZDCLowGainFractions myfracs(); - std::vector myfracsVec; - - HcalPedestals mypeds(); - std::vector mypedsVec; - - HcalPedestalWidths mywidths(); - std::vector mywidthsVec; - - HcalGains mygains(); - std::vector mygainsVec; - - HcalGainWidths mygwidths(); - std::vector mygwidthsVec; - - HcalPFCuts mypfcuts(); - std::vector mypfcutVec; - - HcalQIEData myqie(); - std::vector myqievec; - - HcalCalibrationQIEData mycalqie(); - std::vector mycalqieVec; - - HcalQIETypes myqietype(); - std::vector myqietypevec; - - HcalSiPMParameters mySiPMParameter(); - std::vector mySiPMParametervec; - - HcalElectronicsMap mymap; - std::vector mymap2; - std::vector mymap3; - - HcalChannelQuality myquality; - std::vector myqualityVec; - - HcalZSThresholds myth; - std::vector mythvec; - - HcalRespCorrs mycorrs; - std::vector mycorrsVec; - - HcalLUTCorrs mylutcorrs; - std::vector mylutcorrsVec; - - HcalPFCorrs mypfcorrs; - std::vector mypfcorrsVec; - - HcalL1TriggerObjects myL1trigs; - std::vector myL1trigsVec; - - HcalTimeCorrs mytcorrs; - std::vector mytcorrsVec; - - HcalValidationCorrs myVcorrs; - std::vector myVcorrsVec; - - HcalLutMetadata myLutMetadata; - std::vector myLutMetadatumVec; - HcalLutMetadata::NonChannelData myLutNonChannelMetadata; - - HcalDcsValues myDcsValues; - std::vector myDcsValueVec; - - HcalDcsMap myDcsMap; - std::vector myDcsMapVec; - - HcalLongRecoParams myLongRecoParams; - std::vector myLongRecoParamVec; - std::vector myUintVec; - - HcalRecoParams myRecoParams; - std::vector myRecoParamVec; - - HcalMCParams myMCParams; - std::vector myMCParamsVec; - - // HF noise DB objects - HcalFlagHFDigiTimeParams myHcalFlagHFDigiTimeParams; - std::vector myHcalFlagHFDigiTimeParamVec; - - HcalTimingParams myTimingParams; - std::vector myTimingParamVec; - - HcalFrontEndMap myfmap1; - std::vector myfmap2; - - HcalSiPMCharacteristics mySiPMCharacteristics; - std::vector mySiPMCharacteristicvec; - - HcalTPParameters myTPParameters; - - HcalTPChannelParameters myTPChannelParameters(); - std::vector myTPChannelParametervec; - - // OOT pileup correction objects - std::map myInnerMap; - std::map > myOuterMap; - ScalingExponential myScalingExponential; - PiecewiseScalingPolynomial myPiecewiseScalingPolynomial; - OOTPileupCorrDataFcn myOOTPileupCorrDataFcn; - OOTPileupCorrData myOOTPileupCorrData; - DummyOOTPileupCorrection myDummyOOTPileupCorrection; - OOTPileupCorrectionMapColl myOOTPileupCorrectionMapColl; - OOTPileupCorrectionBuffer myOOTPileupCorrectionBuffer; - - // QIE8 input pulse representation objects - HcalInterpolatedPulse myHcalInterpolatedPulse; - std::vector myHcalInterpolatedPulseVec; - HBHEChannelGroups myHBHEChannelGroups; - HcalInterpolatedPulseColl myHcalInterpolatedPulseColl; - - // HBHE negative energy filter - std::vector myPiecewiseScalingPolynomialVec; - HBHENegativeEFilter myHBHENegativeEFilter; - - // Phase 1 HF algorithm configuration data - HFPhase1PMTParams myHFPhase1PMTParams; - }; -} // namespace CondFormats_HcalObjects diff --git a/CondFormats/HcalObjects/src/classes_def.xml b/CondFormats/HcalObjects/src/classes_def.xml index 5b914714e2f56..1a5f77722e957 100644 --- a/CondFormats/HcalObjects/src/classes_def.xml +++ b/CondFormats/HcalObjects/src/classes_def.xml @@ -476,5 +476,6 @@ + diff --git a/CondFormats/JetMETObjects/interface/Utilities.h b/CondFormats/JetMETObjects/interface/Utilities.h index 3f64051bdadfa..0a27c94a6887e 100644 --- a/CondFormats/JetMETObjects/interface/Utilities.h +++ b/CondFormats/JetMETObjects/interface/Utilities.h @@ -56,8 +56,8 @@ namespace std { //Return a tuple which is a subset of the original tuple //This function pops an entry off the font of the tuple template - auto tuple_subset(const Tuple& tpl, ct_integers_list) - -> decltype(std::make_tuple(std::get(tpl)...)) { + auto tuple_subset(const Tuple& tpl, + ct_integers_list) -> decltype(std::make_tuple(std::get(tpl)...)) { return std::make_tuple(std::get(tpl)...); // this means: // make_tuple(get(tpl), get(tpl), ...) diff --git a/CondFormats/L1TObjects/interface/CaloParams.h b/CondFormats/L1TObjects/interface/CaloParams.h index 88c65c4ab833a..5199f204f51b6 100644 --- a/CondFormats/L1TObjects/interface/CaloParams.h +++ b/CondFormats/L1TObjects/interface/CaloParams.h @@ -94,8 +94,7 @@ namespace l1t { maskE_(0), maskSum_(0), maskRatio_(0), - doEncoding_(false) { /* no-op */ - } + doEncoding_(false) { /* no-op */ } COND_SERIALIZABLE; }; @@ -150,8 +149,7 @@ namespace l1t { maxPtHOverEIsolation_(0), isoAreaNrTowersEta_(0), isoAreaNrTowersPhi_(0), - isoVetoNrTowersPhi_(0) { /* no-op */ - } + isoVetoNrTowersPhi_(0) { /* no-op */ } COND_SERIALIZABLE; }; @@ -204,8 +202,7 @@ namespace l1t { isoEtaMax_(0), isoAreaNrTowersEta_(0), isoAreaNrTowersPhi_(0), - isoVetoNrTowersPhi_(0) { /* no-op */ - } + isoVetoNrTowersPhi_(0) { /* no-op */ } COND_SERIALIZABLE; }; @@ -221,8 +218,7 @@ namespace l1t { // Et threshold on neighbouring towers/regions double neighbourThreshold_; - JetParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0) { /* no-op */ - } + JetParams() : lsb_(0), seedThreshold_(0), neighbourThreshold_(0) { /* no-op */ } COND_SERIALIZABLE; }; diff --git a/CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h b/CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h index efdb04e02d225..7888b5e5056db 100644 --- a/CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h +++ b/CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h @@ -63,9 +63,7 @@ class L1GtEnergySumTemplate : public L1GtCondition { unsigned long long phiRange1Word; // make sure all objects (esp. the bool) are properly initialised to avoid problems with serialisation: - ObjectParameter() : etThreshold(0), energyOverflow(false), phiRange0Word(0), phiRange1Word(0) { /*nop*/ - ; - }; + ObjectParameter() : etThreshold(0), energyOverflow(false), phiRange0Word(0), phiRange1Word(0) { /*nop*/ ; } COND_SERIALIZABLE; }; diff --git a/CondFormats/L1TObjects/interface/L1MuGMTScales.h b/CondFormats/L1TObjects/interface/L1MuGMTScales.h index 99413789df95f..356b1f30af875 100644 --- a/CondFormats/L1TObjects/interface/L1MuGMTScales.h +++ b/CondFormats/L1TObjects/interface/L1MuGMTScales.h @@ -170,17 +170,17 @@ class L1MuGMTScales { }; /// destructor - virtual ~L1MuGMTScales(){ - // for (int i=0; i<4; i++) { - // delete m_ReducedEtaScale[i]; - // delete m_OvlEtaScale[i]; - // } - // for (int i=0; i<6; i++) { - // delete m_DeltaEtaScale[i]; - // } - - // delete m_DeltaPhiScale; - // delete m_CaloEtaScale; + virtual ~L1MuGMTScales() { + // for (int i=0; i<4; i++) { + // delete m_ReducedEtaScale[i]; + // delete m_OvlEtaScale[i]; + // } + // for (int i=0; i<6; i++) { + // delete m_DeltaEtaScale[i]; + // } + + // delete m_DeltaPhiScale; + // delete m_CaloEtaScale; }; /// get the recuced eta scale for matching in the overlap region (4 bit); isys = 0(DT), 1(bRPC), 2(CSC), 3(fwdRPC) diff --git a/CondFormats/L1TObjects/interface/L1MuPacking.h b/CondFormats/L1TObjects/interface/L1MuPacking.h index 39645a55d2d7c..132914e1e5e3d 100644 --- a/CondFormats/L1TObjects/interface/L1MuPacking.h +++ b/CondFormats/L1TObjects/interface/L1MuPacking.h @@ -35,7 +35,7 @@ class L1MuPacking { public: - virtual ~L1MuPacking(){}; + virtual ~L1MuPacking() {} /// get the sign from the packed notation (0=positive, 1=negative) virtual int signFromPacked(unsigned packed) const = 0; @@ -150,8 +150,8 @@ class L1MuSignedPackingGeneric : public L1MuPacking { class L1MuPseudoSignedPacking : public L1MuPacking { public: L1MuPseudoSignedPacking() {} - ~L1MuPseudoSignedPacking() override{}; - L1MuPseudoSignedPacking(unsigned int nbits) : m_nbits(nbits){}; + ~L1MuPseudoSignedPacking() override {} + L1MuPseudoSignedPacking(unsigned int nbits) : m_nbits(nbits) {} /// get the (pseudo-)sign from the packed notation (0=positive, 1=negative) int signFromPacked(unsigned packed) const override { return (packed & (1 << (m_nbits - 1))) ? 1 : 0; }; diff --git a/CondFormats/L1TObjects/interface/L1MuScale.h b/CondFormats/L1TObjects/interface/L1MuScale.h index c7469f2595ce5..ac3f8c1dfe51f 100644 --- a/CondFormats/L1TObjects/interface/L1MuScale.h +++ b/CondFormats/L1TObjects/interface/L1MuScale.h @@ -138,8 +138,8 @@ class L1MuBinnedScale : public L1MuScale { }; /// destructor - ~L1MuBinnedScale() override{ - // delete m_packing; + ~L1MuBinnedScale() override { + // delete m_packing; }; /// get the center of bin represented by packed @@ -276,8 +276,8 @@ class L1MuSymmetricBinnedScale : public L1MuScale { }; /// destructor - ~L1MuSymmetricBinnedScale() override{ - // delete m_packing; + ~L1MuSymmetricBinnedScale() override { + // delete m_packing; }; /// get the center of bin represented by packed diff --git a/CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h b/CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h index 00b4017c9fd02..c4083fb00026c 100644 --- a/CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h +++ b/CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h @@ -53,7 +53,7 @@ class L1MuTriggerPtScale { }; /// destructor - virtual ~L1MuTriggerPtScale(){}; + virtual ~L1MuTriggerPtScale() {} /// get the Pt scale const L1MuScale* getPtScale() const { return &m_PtScale; }; diff --git a/CondFormats/L1TObjects/interface/L1MuTriggerScales.h b/CondFormats/L1TObjects/interface/L1MuTriggerScales.h index d04810b57c77f..2c94379697be8 100644 --- a/CondFormats/L1TObjects/interface/L1MuTriggerScales.h +++ b/CondFormats/L1TObjects/interface/L1MuTriggerScales.h @@ -145,13 +145,13 @@ class L1MuTriggerScales { }; /// destructor - virtual ~L1MuTriggerScales(){ - // for (int i=0; i<4; i++) - // delete m_RegionalEtaScale[i]; + virtual ~L1MuTriggerScales() { + // for (int i=0; i<4; i++) + // delete m_RegionalEtaScale[i]; - // delete m_GMTEtaScale; - // delete m_PhiScale; - // delete m_PtScale; + // delete m_GMTEtaScale; + // delete m_PhiScale; + // delete m_PtScale; }; /// get the regioanl muon trigger eta scale, isys = 0(DT), 1(bRPC), 2(CSC), 3(fwdRPC) diff --git a/CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h b/CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h index ecaa21a57b3b3..dcd9ddcf04e64 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h +++ b/CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h @@ -29,7 +29,7 @@ class L1TUtmAlgorithm { index_(), module_id_(), module_index_(), - version(0){}; + version(0) {} L1TUtmAlgorithm(std::string name, std::string expression, std::string expression_in_condition, @@ -45,7 +45,7 @@ class L1TUtmAlgorithm { index_(index), module_id_(module_id), module_index_(module_index), - version(ver){}; + version(ver) {} L1TUtmAlgorithm(const tmeventsetup::esAlgorithm& esAlg) : L1TUtmAlgorithm(esAlg.getName(), @@ -56,7 +56,7 @@ class L1TUtmAlgorithm { esAlg.getModuleId(), esAlg.getModuleIndex(), 0 //There is no version retrieval in esAlgorithm. However, it seems pretty hard coded to 0 - ){}; + ) {}; virtual ~L1TUtmAlgorithm() = default; diff --git a/CondFormats/L1TObjects/interface/L1TUtmBin.h b/CondFormats/L1TObjects/interface/L1TUtmBin.h index e2240fba7bee7..e044442fbcdba 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmBin.h +++ b/CondFormats/L1TObjects/interface/L1TUtmBin.h @@ -23,12 +23,12 @@ class L1TUtmBin { : hw_index(std::numeric_limits::max()), minimum(std::numeric_limits::min()), maximum(std::numeric_limits::max()), - version(0){}; + version(0) {} L1TUtmBin(const unsigned int id, const double min, const double max) - : hw_index(id), minimum(min), maximum(max), version(0){}; + : hw_index(id), minimum(min), maximum(max), version(0) {} - L1TUtmBin(const tmeventsetup::esBin& bin) : L1TUtmBin(bin.hw_index, bin.minimum, bin.maximum){}; + L1TUtmBin(const tmeventsetup::esBin& bin) : L1TUtmBin(bin.hw_index, bin.minimum, bin.maximum) {} operator tmeventsetup::esBin() const { return tmeventsetup::esBin(hw_index, minimum, maximum); } diff --git a/CondFormats/L1TObjects/interface/L1TUtmCondition.h b/CondFormats/L1TObjects/interface/L1TUtmCondition.h index 52db58e31363a..423ff6cd4c639 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmCondition.h +++ b/CondFormats/L1TObjects/interface/L1TUtmCondition.h @@ -24,10 +24,10 @@ */ class L1TUtmCondition { public: - L1TUtmCondition() : name_(), type_(-9999), objects_(), cuts_(), version(0){}; + L1TUtmCondition() : name_(), type_(-9999), objects_(), cuts_(), version(0) {} L1TUtmCondition( std::string name, int type, std::vector objects, std::vector cuts, unsigned int vers) - : name_(name), type_(type), objects_(objects), cuts_(cuts), version(vers){}; + : name_(name), type_(type), objects_(objects), cuts_(cuts), version(vers) {} L1TUtmCondition(const tmeventsetup::esCondition& esCond) : name_(esCond.getName()), type_(esCond.getType()), version(0) { diff --git a/CondFormats/L1TObjects/interface/L1TUtmCut.h b/CondFormats/L1TObjects/interface/L1TUtmCut.h index 1f6b1aa70eee2..066046fd66b63 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmCut.h +++ b/CondFormats/L1TObjects/interface/L1TUtmCut.h @@ -22,7 +22,7 @@ */ class L1TUtmCut { public: - L1TUtmCut() : name_(), object_type_(), cut_type_(), minimum_(), maximum_(), data_(), key_(), version(0){}; + L1TUtmCut() : name_(), object_type_(), cut_type_(), minimum_(), maximum_(), data_(), key_(), version(0) {} L1TUtmCut(std::string name, int object_type, int cut_type, @@ -38,7 +38,7 @@ class L1TUtmCut { maximum_(maximum), data_(data), key_(key), - version(vers){}; + version(vers) {} L1TUtmCut(const tmeventsetup::esCut& esC) : L1TUtmCut(esC.getName(), @@ -48,7 +48,7 @@ class L1TUtmCut { L1TUtmCutValue(esC.getMaximum()), esC.getData(), esC.getKey(), - 0){}; + 0) {}; virtual ~L1TUtmCut() = default; diff --git a/CondFormats/L1TObjects/interface/L1TUtmCutValue.h b/CondFormats/L1TObjects/interface/L1TUtmCutValue.h index 3df9e365628d4..d3c5368ec048c 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmCutValue.h +++ b/CondFormats/L1TObjects/interface/L1TUtmCutValue.h @@ -19,8 +19,8 @@ */ struct L1TUtmCutValue { L1TUtmCutValue() - : value(std::numeric_limits::max()), index(std::numeric_limits::max()), version(0){}; - L1TUtmCutValue(const tmeventsetup::esCutValue& esCV) : value(esCV.value), index(esCV.index), version(esCV.version){}; + : value(std::numeric_limits::max()), index(std::numeric_limits::max()), version(0) {} + L1TUtmCutValue(const tmeventsetup::esCutValue& esCV) : value(esCV.value), index(esCV.index), version(esCV.version) {} virtual ~L1TUtmCutValue() = default; diff --git a/CondFormats/L1TObjects/interface/L1TUtmObject.h b/CondFormats/L1TObjects/interface/L1TUtmObject.h index b53d00baaab8b..6a69c4bf7832d 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmObject.h +++ b/CondFormats/L1TObjects/interface/L1TUtmObject.h @@ -33,7 +33,7 @@ class L1TUtmObject { ext_signal_name_(), ext_channel_id_(std::numeric_limits::max()), cuts_(), - version(0){}; + version(0) {} L1TUtmObject(std::string name, int type, int comparison_operator, @@ -51,7 +51,7 @@ class L1TUtmObject { ext_signal_name_(ext_signal_name), ext_channel_id_(ext_channel_id), cuts_(cuts), - version(vers){}; + version(vers) {} L1TUtmObject(const tmeventsetup::esObject& esObj) : name_(esObj.getName()), diff --git a/CondFormats/L1TObjects/interface/L1TUtmScale.h b/CondFormats/L1TObjects/interface/L1TUtmScale.h index d143664a2029a..c5c6664371ada 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmScale.h +++ b/CondFormats/L1TObjects/interface/L1TUtmScale.h @@ -24,7 +24,7 @@ */ class L1TUtmScale { public: - L1TUtmScale() : name_(), object_(), type_(), minimum_(), maximum_(), step_(), n_bits_(), bins_(), version(0){}; + L1TUtmScale() : name_(), object_(), type_(), minimum_(), maximum_(), step_(), n_bits_(), bins_(), version(0) {} L1TUtmScale(std::string name, int object, @@ -43,7 +43,7 @@ class L1TUtmScale { step_(step), n_bits_(n_bits), bins_(bins), - version(vers){}; + version(vers) {} L1TUtmScale(const tmeventsetup::esScale& esSc) : name_(esSc.getName()), diff --git a/CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h b/CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h index 90a73dac8fe94..aefd9a7f11cdf 100644 --- a/CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h +++ b/CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h @@ -39,7 +39,7 @@ class L1TUtmTriggerMenu { uuid_firmware_(), scale_set_name_(), n_modules_(), - version(0){}; + version(0) {} L1TUtmTriggerMenu(std::map algorithm_map, std::map condition_map, std::map scale_map, @@ -63,7 +63,7 @@ class L1TUtmTriggerMenu { uuid_firmware_(uuid_firmware), scale_set_name_(scale_set_name), n_modules_(n_modules), - version(ver_i){}; + version(ver_i) {} L1TUtmTriggerMenu(const tmeventsetup::esTriggerMenu& esMenu) : external_map_(), //These are null to my best knowledge diff --git a/CondFormats/L1TObjects/src/L1RCTParameters.cc b/CondFormats/L1TObjects/src/L1RCTParameters.cc index 906576d3669cd..e15e7082b3bdc 100644 --- a/CondFormats/L1TObjects/src/L1RCTParameters.cc +++ b/CondFormats/L1TObjects/src/L1RCTParameters.cc @@ -132,7 +132,7 @@ unsigned short L1RCTParameters::calcTower(unsigned short rct_iphi, unsigned shor regionPhi = iphi % 2; // HF MAPPING, just regions now, don't need to worry about towers // just calling it "tower" for convenience - tower = (regionPhi)*4 + absIeta - 29; + tower = (regionPhi) * 4 + absIeta - 29; } return tower; } diff --git a/CondFormats/PCLConfig/plugins/AlignPCLThresholdsWriter.cc b/CondFormats/PCLConfig/plugins/AlignPCLThresholdsWriter.cc index d27932125554f..f8935048dea0a 100644 --- a/CondFormats/PCLConfig/plugins/AlignPCLThresholdsWriter.cc +++ b/CondFormats/PCLConfig/plugins/AlignPCLThresholdsWriter.cc @@ -197,7 +197,7 @@ void AlignPCLThresholdsWriter::writePayload(T& myThresholds) { myThresholds.setAlignPCLThreshold(alignableId, a); } // if alignable is found in the PSet - } // loop on the PSets + } // loop on the PSets // checks if all mandatories are present edm::LogInfo("AlignPCLThresholdsWriter") diff --git a/CondFormats/PPSObjects/interface/TotemDAQMapping.h b/CondFormats/PPSObjects/interface/TotemDAQMapping.h index be2bdddf63bda..b3c442da47b35 100644 --- a/CondFormats/PPSObjects/interface/TotemDAQMapping.h +++ b/CondFormats/PPSObjects/interface/TotemDAQMapping.h @@ -51,7 +51,7 @@ class TotemDAQMapping { int plane; int channel; - TotemTimingPlaneChannelPair(const int& plane = -1, const int& channel = -1) : plane(plane), channel(channel){}; + TotemTimingPlaneChannelPair(const int& plane = -1, const int& channel = -1) : plane(plane), channel(channel) {} COND_SERIALIZABLE; }; std::map totemTimingChannelMap; diff --git a/CondFormats/PhysicsToolsObjects/interface/DeDxCalibration.h b/CondFormats/PhysicsToolsObjects/interface/DeDxCalibration.h index c245ed9549b65..9f9e5b257958c 100644 --- a/CondFormats/PhysicsToolsObjects/interface/DeDxCalibration.h +++ b/CondFormats/PhysicsToolsObjects/interface/DeDxCalibration.h @@ -13,7 +13,7 @@ class DeDxCalibration { const std::vector& alpha, const std::vector& sigma, const std::map& gain) - : thr_(thr), alpha_(alpha), sigma_(sigma), gain_(gain){}; + : thr_(thr), alpha_(alpha), sigma_(sigma), gain_(gain) {} const std::vector& thr() const { return thr_; } const std::vector& alpha() const { return alpha_; } diff --git a/CondFormats/PhysicsToolsObjects/interface/PerformancePayload.h b/CondFormats/PhysicsToolsObjects/interface/PerformancePayload.h index bcba17010d931..302f0cb436317 100644 --- a/CondFormats/PhysicsToolsObjects/interface/PerformancePayload.h +++ b/CondFormats/PhysicsToolsObjects/interface/PerformancePayload.h @@ -20,7 +20,7 @@ class PerformancePayload // PerformancePayload(int stride_, std::string columns_,std::vector table) : PhysicsPerformancePayload(stride_, columns_, table) {} PerformancePayload() {} - virtual ~PerformancePayload(){}; + virtual ~PerformancePayload() {} virtual void initialize() {} diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc index 751cd9032ebf6..eb56a260798b4 100644 --- a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc +++ b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx2DBuilder.cc @@ -21,7 +21,7 @@ class SiStripDeDx2DBuilder : public edm::one::EDAnalyzer<> { public: explicit SiStripDeDx2DBuilder(const edm::ParameterSet& iConfig); - ~SiStripDeDx2DBuilder(){}; + ~SiStripDeDx2DBuilder() {} virtual void analyze(const edm::Event&, const edm::EventSetup&); diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc index 306b522e21cf0..9c41c37bcca1b 100644 --- a/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc +++ b/CondFormats/PhysicsToolsObjects/test/SiStripDeDx3DBuilder.cc @@ -21,7 +21,7 @@ class SiStripDeDx3DBuilder : public edm::one::EDAnalyzer<> { public: explicit SiStripDeDx3DBuilder(const edm::ParameterSet& iConfig); - ~SiStripDeDx3DBuilder(){}; + ~SiStripDeDx3DBuilder() {} virtual void analyze(const edm::Event&, const edm::EventSetup&); diff --git a/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h b/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h index b7d1d4d09c5f3..83bc353d5d52b 100644 --- a/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h +++ b/CondFormats/PhysicsToolsObjects/test/SiStripDeDxMipBuilder.h @@ -18,7 +18,7 @@ class SiStripDeDxMipBuilder : public edm::one::EDAnalyzer<> { public: explicit SiStripDeDxMipBuilder(const edm::ParameterSet& iConfig); - ~SiStripDeDxMipBuilder(){}; + ~SiStripDeDxMipBuilder() {} virtual void analyze(const edm::Event&, const edm::EventSetup&); diff --git a/CondFormats/RPCObjects/interface/L1RPCConeBuilder.h b/CondFormats/RPCObjects/interface/L1RPCConeBuilder.h index 9c4ab2534dc8c..1d37b83b5bc86 100644 --- a/CondFormats/RPCObjects/interface/L1RPCConeBuilder.h +++ b/CondFormats/RPCObjects/interface/L1RPCConeBuilder.h @@ -61,7 +61,7 @@ class L1RPCConeBuilder { m_logplane(99), m_validForStripFirst(0), m_validForStripLast(0), - m_offset(-1000){}; + m_offset(-1000) {} int getLogStrip(int strip, const L1RPCConeDefinition::TLPSizeVec& LPSizeVec) const { int ret = -1; diff --git a/CondFormats/RPCObjects/interface/L1RPCHwConfig.h b/CondFormats/RPCObjects/interface/L1RPCHwConfig.h index d0e49a8ea7d9a..5b9661aa4590e 100644 --- a/CondFormats/RPCObjects/interface/L1RPCHwConfig.h +++ b/CondFormats/RPCObjects/interface/L1RPCHwConfig.h @@ -34,8 +34,8 @@ struct L1RPCDevCoords { public: - L1RPCDevCoords() : m_tower(-255), m_PAC(-255){}; - L1RPCDevCoords(int tower, int sector, int segment) : m_tower(tower), m_PAC(sector * 12 + segment){}; + L1RPCDevCoords() : m_tower(-255), m_PAC(-255) {} + L1RPCDevCoords(int tower, int sector, int segment) : m_tower(tower), m_PAC(sector * 12 + segment) {} int getTower() { return m_tower; }; int getPAC() { return m_PAC; }; int getSector() { return m_PAC / 12; }; diff --git a/CondFormats/RPCObjects/interface/RBCBoardSpecs.h b/CondFormats/RPCObjects/interface/RBCBoardSpecs.h index 32cd809309354..72466694a879f 100644 --- a/CondFormats/RPCObjects/interface/RBCBoardSpecs.h +++ b/CondFormats/RPCObjects/interface/RBCBoardSpecs.h @@ -21,8 +21,8 @@ class RBCBoardSpecs { class RBCBoardConfig { public: - RBCBoardConfig(){}; - virtual ~RBCBoardConfig(){}; ///< Destructor + RBCBoardConfig() {} + virtual ~RBCBoardConfig() {} ///< Destructor int m_Firmware; int m_WheelId; diff --git a/CondFormats/RPCObjects/interface/RPCEMap.h b/CondFormats/RPCObjects/interface/RPCEMap.h index b2d03ebbd706c..820707daf92b5 100644 --- a/CondFormats/RPCObjects/interface/RPCEMap.h +++ b/CondFormats/RPCObjects/interface/RPCEMap.h @@ -42,7 +42,7 @@ class RPCEMap { int theCode; int nFebs; - lbItem() : theMaster(false), theLinkBoardNumInLink(0), theCode(0), nFebs(0){/* nop */}; + lbItem() : theMaster(false), theLinkBoardNumInLink(0), theCode(0), nFebs(0) { /* nop */ } COND_SERIALIZABLE; }; diff --git a/CondFormats/RPCObjects/interface/RPCTechTriggerConfig.h b/CondFormats/RPCObjects/interface/RPCTechTriggerConfig.h index 59216f90effd8..c7054cd934f09 100644 --- a/CondFormats/RPCObjects/interface/RPCTechTriggerConfig.h +++ b/CondFormats/RPCObjects/interface/RPCTechTriggerConfig.h @@ -29,7 +29,7 @@ class RPCTechTriggerConfig { m_triggerMode = trigmode; }; - virtual ~RPCTechTriggerConfig(){}; ///< Destructor + virtual ~RPCTechTriggerConfig() {} ///< Destructor int m_runId; int m_runType; diff --git a/CondFormats/RPCObjects/interface/TTUBoardSpecs.h b/CondFormats/RPCObjects/interface/TTUBoardSpecs.h index e5ee6f27a1b3e..fb99545c42d4a 100644 --- a/CondFormats/RPCObjects/interface/TTUBoardSpecs.h +++ b/CondFormats/RPCObjects/interface/TTUBoardSpecs.h @@ -25,7 +25,7 @@ class TTUBoardSpecs { class TTUBoardConfig : public RPCTechTriggerConfig { public: /// Standard constructor - TTUBoardConfig() : RPCTechTriggerConfig(){}; + TTUBoardConfig() : RPCTechTriggerConfig() {} int m_Firmware; int m_LengthOfFiber; diff --git a/CondFormats/RPCObjects/test/RPCReadOutMapBuilder.cc b/CondFormats/RPCObjects/test/RPCReadOutMapBuilder.cc index dae303a7f2484..aa1e25bc34936 100644 --- a/CondFormats/RPCObjects/test/RPCReadOutMapBuilder.cc +++ b/CondFormats/RPCObjects/test/RPCReadOutMapBuilder.cc @@ -27,7 +27,7 @@ class RPCReadOutMapBuilder : public edm::one::EDAnalyzer<> { public: explicit RPCReadOutMapBuilder(const edm::ParameterSet&); ~RPCReadOutMapBuilder() override = default; - void analyze(const edm::Event&, const edm::EventSetup&) override{}; + void analyze(const edm::Event&, const edm::EventSetup&) override {} void beginJob() override; void endJob() override; diff --git a/CondFormats/RecoMuonObjects/interface/DYTParamObject.h b/CondFormats/RecoMuonObjects/interface/DYTParamObject.h index 9eb41967e4198..7b46f85583aed 100644 --- a/CondFormats/RecoMuonObjects/interface/DYTParamObject.h +++ b/CondFormats/RecoMuonObjects/interface/DYTParamObject.h @@ -7,8 +7,8 @@ class DYTParamObject { public: - DYTParamObject(){}; - DYTParamObject(uint32_t id, std::vector& params) : m_id(id), m_params(params){}; + DYTParamObject() {} + DYTParamObject(uint32_t id, std::vector& params) : m_id(id), m_params(params) {} ~DYTParamObject() { m_params.clear(); }; // Return raw id diff --git a/CondFormats/RecoMuonObjects/interface/DYTParamsObject.h b/CondFormats/RecoMuonObjects/interface/DYTParamsObject.h index 24cb5e75fccb7..eaf00458fd68a 100644 --- a/CondFormats/RecoMuonObjects/interface/DYTParamsObject.h +++ b/CondFormats/RecoMuonObjects/interface/DYTParamsObject.h @@ -7,7 +7,7 @@ class DYTParamsObject { public: - DYTParamsObject(){}; + DYTParamsObject() {} ~DYTParamsObject() { m_paramObjs.clear(); }; // Add a parameter to the vector of parameters diff --git a/CondFormats/RecoMuonObjects/interface/MuonSystemAging.h b/CondFormats/RecoMuonObjects/interface/MuonSystemAging.h index df5c56f25b9e6..7fe924d2afb74 100644 --- a/CondFormats/RecoMuonObjects/interface/MuonSystemAging.h +++ b/CondFormats/RecoMuonObjects/interface/MuonSystemAging.h @@ -12,8 +12,8 @@ enum CSCInefficiencyType { EFF_CHAMBER = 0, EFF_STRIPS = 1, EFF_WIRES = 2 }; class MuonSystemAging { public: - MuonSystemAging(){}; - ~MuonSystemAging(){}; + MuonSystemAging() {} + ~MuonSystemAging() {} std::map m_RPCChambEffs; std::map m_DTChambEffs; diff --git a/CondFormats/RunInfo/interface/MixingModuleConfig.h b/CondFormats/RunInfo/interface/MixingModuleConfig.h index 414e401bd085e..8ad0338734964 100644 --- a/CondFormats/RunInfo/interface/MixingModuleConfig.h +++ b/CondFormats/RunInfo/interface/MixingModuleConfig.h @@ -14,7 +14,7 @@ namespace edm { class MixingInputConfig { public: MixingInputConfig(); - virtual ~MixingInputConfig(){}; + virtual ~MixingInputConfig() {} const int itype() const { return t_; } std::string type() const { @@ -71,7 +71,7 @@ class MixingInputConfig { class MixingModuleConfig { public: MixingModuleConfig(); - virtual ~MixingModuleConfig(){}; + virtual ~MixingModuleConfig() {} const MixingInputConfig& config(unsigned int i = 0) const { return configs_[i]; } diff --git a/CondFormats/RunInfo/interface/RunInfo.h b/CondFormats/RunInfo/interface/RunInfo.h index 9f4e319b657d6..5f920cd888f46 100644 --- a/CondFormats/RunInfo/interface/RunInfo.h +++ b/CondFormats/RunInfo/interface/RunInfo.h @@ -33,7 +33,7 @@ class RunInfo { std::vector m_times_of_currents; RunInfo(); - virtual ~RunInfo(){}; + virtual ~RunInfo() {} static RunInfo* Fake_RunInfo(); void printAllValues() const; diff --git a/CondFormats/RunInfo/interface/RunSummary.h b/CondFormats/RunInfo/interface/RunSummary.h index 84340bc3b75a5..9c48d4ce090d9 100644 --- a/CondFormats/RunInfo/interface/RunSummary.h +++ b/CondFormats/RunInfo/interface/RunSummary.h @@ -32,7 +32,7 @@ class RunSummary { enum subdet { PIXEL, TRACKER, ECAL, HCAL, DT, CSC, RPC }; RunSummary(); - virtual ~RunSummary(){}; + virtual ~RunSummary() {} static RunSummary* Fake_RunSummary(); void printAllValues() const; diff --git a/CondFormats/RunInfo/test/fromXML.cpp b/CondFormats/RunInfo/test/fromXML.cpp index e424784a84ba1..88c070fda5076 100644 --- a/CondFormats/RunInfo/test/fromXML.cpp +++ b/CondFormats/RunInfo/test/fromXML.cpp @@ -67,8 +67,7 @@ T fromXML(std::string filename = "") { class Simple { public: - Simple() : my_i(42), my_f(42.) { /* nop */ - } + Simple() : my_i(42), my_f(42.) { /* nop */ } // COND_SERIALIZABLE; template diff --git a/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc b/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc index 773ce8e14727e..2d6b2477b7031 100644 --- a/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc +++ b/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc @@ -26,8 +26,8 @@ namespace { template void serialize(Archive& ar, const unsigned int version) { - ar& a_; - ar& b_; + ar & a_; + ar & b_; ++counter_; } @@ -50,7 +50,7 @@ namespace { template void serialize(Archive& ar, const unsigned int version) { - ar& value_; + ar & value_; } int value_ = 3145; }; diff --git a/CondFormats/SiPhase2TrackerObjects/interface/SiPhase2OuterTrackerLorentzAngle.h b/CondFormats/SiPhase2TrackerObjects/interface/SiPhase2OuterTrackerLorentzAngle.h index 85bab8fc1a7aa..57b59518e2c9d 100644 --- a/CondFormats/SiPhase2TrackerObjects/interface/SiPhase2OuterTrackerLorentzAngle.h +++ b/CondFormats/SiPhase2TrackerObjects/interface/SiPhase2OuterTrackerLorentzAngle.h @@ -25,8 +25,8 @@ class SiPhase2OuterTrackerLorentzAngle { public: - SiPhase2OuterTrackerLorentzAngle(){}; - ~SiPhase2OuterTrackerLorentzAngle(){}; + SiPhase2OuterTrackerLorentzAngle() {} + ~SiPhase2OuterTrackerLorentzAngle() {} inline void putLorentzAngles(std::unordered_map& LA) { m_LA = LA; } inline const std::unordered_map& getLorentzAngles() const { return m_LA; } diff --git a/CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h b/CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h index b4e0c43c6c4e2..6df47c4faab26 100644 --- a/CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h +++ b/CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h @@ -11,7 +11,7 @@ class SiPixelDynamicInefficiency { public: SiPixelDynamicInefficiency(); - ~SiPixelDynamicInefficiency(){}; + ~SiPixelDynamicInefficiency() {} inline void putPixelGeomFactors(std::map& PixelGeomFactors) { m_PixelGeomFactors = PixelGeomFactors; diff --git a/CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h b/CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h index 0590fe7ae8a4d..ce3e920430189 100644 --- a/CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h +++ b/CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h @@ -10,8 +10,8 @@ class SiPixelLorentzAngle { public: - SiPixelLorentzAngle(){}; - ~SiPixelLorentzAngle(){}; + SiPixelLorentzAngle() {} + ~SiPixelLorentzAngle() {} inline void putLorentsAngles(std::map& LA) { m_LA = LA; } inline const std::map& getLorentzAngles() const { return m_LA; } diff --git a/CondFormats/SiPixelObjects/interface/SiPixelVCal.h b/CondFormats/SiPixelObjects/interface/SiPixelVCal.h index e854639bdb8e5..036ec3c524a41 100644 --- a/CondFormats/SiPixelObjects/interface/SiPixelVCal.h +++ b/CondFormats/SiPixelObjects/interface/SiPixelVCal.h @@ -8,8 +8,8 @@ class SiPixelVCal { public: - SiPixelVCal(){}; - ~SiPixelVCal(){}; + SiPixelVCal() {} + ~SiPixelVCal() {} using mapToDetId = std::map; diff --git a/CondFormats/SiPixelObjects/src/classes_def.xml b/CondFormats/SiPixelObjects/src/classes_def.xml index 5eea579c9b57d..cbede0e7c1014 100644 --- a/CondFormats/SiPixelObjects/src/classes_def.xml +++ b/CondFormats/SiPixelObjects/src/classes_def.xml @@ -77,8 +77,14 @@ - - - + + + + + + + + + diff --git a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h index 9e3b9c713a098..6a32c31d3d683 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h @@ -198,7 +198,7 @@ class SiPixelGenError { assert(i >= 0 && i < 3); #endif return fbin_[i]; - } //!< Return lower bound of Qbin definition + } //!< Return lower bound of Qbin definition float xsize() { return xsize_; } //!< pixel x-size (microns) float ysize() { return ysize_; } //!< pixel y-size (microns) float zsize() { return zsize_; } //!< pixel z-size or thickness (microns) diff --git a/CondFormats/SiPixelTransient/interface/SiPixelTemplate2D.h b/CondFormats/SiPixelTransient/interface/SiPixelTemplate2D.h index ac1446cf03597..77376a394c679 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelTemplate2D.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelTemplate2D.h @@ -253,7 +253,7 @@ class SiPixelTemplate2D { } else { return 0.f; } - } //!< Return lower bound of Qbin definition + } //!< Return lower bound of Qbin definition float sizex() { return clslenx_; } //!< return x size of template cluster float sizey() { return clsleny_; } //!< return y size of template cluster float chi2ppix() { return chi2ppix_; } //!< average chi^2 per struck pixel diff --git a/CondFormats/SiStripObjects/interface/SiStripBackPlaneCorrection.h b/CondFormats/SiStripObjects/interface/SiStripBackPlaneCorrection.h index 3d94325562cf1..988d7ebb49e4d 100644 --- a/CondFormats/SiStripObjects/interface/SiStripBackPlaneCorrection.h +++ b/CondFormats/SiStripObjects/interface/SiStripBackPlaneCorrection.h @@ -26,8 +26,8 @@ // class SiStripBackPlaneCorrection : public SiStripBaseObject class SiStripBackPlaneCorrection { public: - SiStripBackPlaneCorrection(){}; - ~SiStripBackPlaneCorrection(){}; + SiStripBackPlaneCorrection() {} + ~SiStripBackPlaneCorrection() {} inline void putLorentsAngles(std::map& BPC) { m_BPC = BPC; } inline const std::map& getBackPlaneCorrections() const { return m_BPC; } diff --git a/CondFormats/SiStripObjects/interface/SiStripBadStrip.h b/CondFormats/SiStripObjects/interface/SiStripBadStrip.h index a2b3ad36e629d..c77a7f009cb4a 100644 --- a/CondFormats/SiStripObjects/interface/SiStripBadStrip.h +++ b/CondFormats/SiStripObjects/interface/SiStripBadStrip.h @@ -55,8 +55,8 @@ class SiStripBadStrip { typedef Registry::const_iterator RegistryIterator; typedef Container InputVector; - SiStripBadStrip(){}; - virtual ~SiStripBadStrip(){}; + SiStripBadStrip() {} + virtual ~SiStripBadStrip() {} bool put(const uint32_t& detID, const InputVector& vect) { return put(detID, Range(vect.begin(), vect.end())); } bool put(const uint32_t& detID, Range input); diff --git a/CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h b/CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h index ea9bb83693362..c5f0bd3bc3a9e 100644 --- a/CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h +++ b/CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h @@ -25,8 +25,8 @@ // class SiStripLorentzAngle : public SiStripBaseObject class SiStripLorentzAngle { public: - SiStripLorentzAngle(){}; - ~SiStripLorentzAngle(){}; + SiStripLorentzAngle() {} + ~SiStripLorentzAngle() {} inline void putLorentsAngles(std::map& LA) { m_LA = LA; } inline const std::map& getLorentzAngles() const { return m_LA; } diff --git a/CondFormats/SiStripObjects/interface/SiStripPedestals.h b/CondFormats/SiStripObjects/interface/SiStripPedestals.h index 44474943f7721..f9403f51a3a0d 100644 --- a/CondFormats/SiStripObjects/interface/SiStripPedestals.h +++ b/CondFormats/SiStripObjects/interface/SiStripPedestals.h @@ -53,8 +53,8 @@ class SiStripPedestals { typedef Registry::const_iterator RegistryIterator; typedef std::vector InputVector; - SiStripPedestals(){}; - ~SiStripPedestals(){}; + SiStripPedestals() {} + ~SiStripPedestals() {} //bool put(const uint32_t& detID,Range input); bool put(const uint32_t& detID, InputVector& input); diff --git a/CondFormats/SiStripObjects/interface/SiStripRunSummary.h b/CondFormats/SiStripObjects/interface/SiStripRunSummary.h index cb7e26e3777a6..0b0aa31df6ac0 100644 --- a/CondFormats/SiStripObjects/interface/SiStripRunSummary.h +++ b/CondFormats/SiStripObjects/interface/SiStripRunSummary.h @@ -9,8 +9,8 @@ class SiStripRunSummary { public: - SiStripRunSummary(){}; - ~SiStripRunSummary(){}; + SiStripRunSummary() {} + ~SiStripRunSummary() {} bool put(std::string runSummary) { runSummary_ = runSummary; diff --git a/CondFormats/SiStripObjects/interface/SiStripSummary.h b/CondFormats/SiStripObjects/interface/SiStripSummary.h index df49bd077d78a..aad14f73dd3f4 100644 --- a/CondFormats/SiStripObjects/interface/SiStripSummary.h +++ b/CondFormats/SiStripObjects/interface/SiStripSummary.h @@ -87,8 +87,8 @@ class SiStripSummary { SiStripSummary(std::vector& userDBContent); SiStripSummary(const SiStripSummary& input); - SiStripSummary(){}; - ~SiStripSummary(){}; + SiStripSummary() {} + ~SiStripSummary() {} ContainerIterator getDataVectorBegin() const { return v_sum_.begin(); } ContainerIterator getDataVectorEnd() const { return v_sum_.end(); } diff --git a/CondFormats/SiStripObjects/interface/SiStripThreshold.h b/CondFormats/SiStripObjects/interface/SiStripThreshold.h index e64616426ff00..769e5c3ffba44 100644 --- a/CondFormats/SiStripObjects/interface/SiStripThreshold.h +++ b/CondFormats/SiStripObjects/interface/SiStripThreshold.h @@ -108,12 +108,12 @@ class SiStripThreshold { typedef Registry::const_iterator RegistryIterator; typedef Container InputVector; - SiStripThreshold(){}; + SiStripThreshold() {} SiStripThreshold(const SiStripThreshold& orig) { v_threshold = orig.v_threshold; indexes = orig.indexes; } - virtual ~SiStripThreshold(){}; + virtual ~SiStripThreshold() {} bool put(const uint32_t& detID, const InputVector& vect); const Range getRange(const uint32_t& detID) const; diff --git a/CondTools/BeamSpot/plugins/BeamSpotOnlineShifter.cc b/CondTools/BeamSpot/plugins/BeamSpotOnlineShifter.cc index 3ed41362a86e6..89c255118a7ff 100644 --- a/CondTools/BeamSpot/plugins/BeamSpotOnlineShifter.cc +++ b/CondTools/BeamSpot/plugins/BeamSpotOnlineShifter.cc @@ -71,7 +71,7 @@ class BeamSpotOnlineShifter : public edm::one::EDAnalyzer { const bool isFullPixel = false); void beginRun(const edm::Run&, const edm::EventSetup&) override; - void endRun(const edm::Run&, const edm::EventSetup&) override{}; + void endRun(const edm::Run&, const edm::EventSetup&) override {} void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CondTools/DeDx/plugins/DeDxCalibrationDbCreator.cc b/CondTools/DeDx/plugins/DeDxCalibrationDbCreator.cc index 68bc394a156c7..a81d1e2a108fb 100644 --- a/CondTools/DeDx/plugins/DeDxCalibrationDbCreator.cc +++ b/CondTools/DeDx/plugins/DeDxCalibrationDbCreator.cc @@ -17,11 +17,11 @@ class DeDxCalibrationDbCreator : public edm::one::EDAnalyzer&, std::vector&, std::vector&); void readGainCorrection(std::map&); diff --git a/CondTools/Ecal/interface/EcalErrorDictionary.h b/CondTools/Ecal/interface/EcalErrorDictionary.h index b0a4e484eab4a..2d347d1df502a 100644 --- a/CondTools/Ecal/interface/EcalErrorDictionary.h +++ b/CondTools/Ecal/interface/EcalErrorDictionary.h @@ -55,8 +55,8 @@ class EcalErrorDictionary { } private: - EcalErrorDictionary(){}; // Hidden to force static use - ~EcalErrorDictionary(){}; // Hidden to force static use + EcalErrorDictionary() {} // Hidden to force static use + ~EcalErrorDictionary() {} // Hidden to force static use const static unsigned int DICTSIZE = 55; diff --git a/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h b/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h index eba651619984d..5210b75289fc5 100644 --- a/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h +++ b/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h @@ -17,7 +17,7 @@ class EcalWeightSetXMLTranslator { public: - EcalWeightSetXMLTranslator(){}; + EcalWeightSetXMLTranslator() {} static int readXML(const std::string& filename, EcalCondHeader& header, EcalWeightSet& record); diff --git a/CondTools/Ecal/plugins/EcalPedestalHistory.cc b/CondTools/Ecal/plugins/EcalPedestalHistory.cc index 92823de12d49a..d64fa74116c37 100644 --- a/CondTools/Ecal/plugins/EcalPedestalHistory.cc +++ b/CondTools/Ecal/plugins/EcalPedestalHistory.cc @@ -329,14 +329,14 @@ void EcalPedestalHistory::beginRun(edm::Run const&, edm::EventSetup const& c) { PedVal.Mean[iChanEE] = rd_ped.getPedMeanG12(); PedVal.RMS[iChanEE] = rd_ped.getPedRMSG12(); } // valid ee Id - } // Endcaps - } // loop over channels + } // Endcaps + } // loop over channels tPedHist->Fill(); cout << " We got a good run " << irun << endl; } // good run - } // mon_run_vec - } // loop over all runs - } // number of runs > 0 + } // mon_run_vec + } // loop over all runs + } // number of runs > 0 cout << "Exiting beginRun" << endl; for (int NbChan = 0; NbChan < 15; NbChan++) { if (hMean[NbChan]->GetEntries() > 0.) { // save only when filled! diff --git a/CondTools/Ecal/plugins/StoreESCondition.cc b/CondTools/Ecal/plugins/StoreESCondition.cc index 85ae02da22807..d7ec0b0bfb285 100644 --- a/CondTools/Ecal/plugins/StoreESCondition.cc +++ b/CondTools/Ecal/plugins/StoreESCondition.cc @@ -424,10 +424,10 @@ std::shared_ptr StoreESCondition::readESChannelStatusFromFile(c } // valid DetId // catch ( cms::Exception &e ) { } } // loop over z - } // loop over plane - } // loop over y - } // loop over x - } // loop over strips + } // loop over plane + } // loop over y + } // loop over x + } // loop over strips edm::LogInfo("StoreESCondition") << " Nb of strips " << Nbstrip << " Number of bad channels " << Nbstatus << "\n"; statusFile.close(); diff --git a/CondTools/Ecal/src/DOMHelperFunctions.cc b/CondTools/Ecal/src/DOMHelperFunctions.cc index 5a1d6f10bfe86..019661a191fc4 100644 --- a/CondTools/Ecal/src/DOMHelperFunctions.cc +++ b/CondTools/Ecal/src/DOMHelperFunctions.cc @@ -143,7 +143,7 @@ DOMNode* xuti::getChildNode(DOMNode* node, const std::string& nodename) { if (foundName == nodename) return childNode; } // if element - } // for child + } // for child return nullptr; } diff --git a/CondTools/Ecal/src/EcalChannelStatusHandler.cc b/CondTools/Ecal/src/EcalChannelStatusHandler.cc index 603c762b8c77b..145adaa598b87 100644 --- a/CondTools/Ecal/src/EcalChannelStatusHandler.cc +++ b/CondTools/Ecal/src/EcalChannelStatusHandler.cc @@ -2154,8 +2154,8 @@ void popcon::EcalChannelStatusHandler::getNewObjects() { } // cosmics analysis } // subruns - } // runs loop - } // we have the DQM info + } // runs loop + } // we have the DQM info delete econn; std::cout << "Ecal - > end of getNewObjects -----------\n"; diff --git a/CondTools/Ecal/src/EcalDAQHandler.cc b/CondTools/Ecal/src/EcalDAQHandler.cc index bd5ddf6f1d11f..36e1348556fb1 100644 --- a/CondTools/Ecal/src/EcalDAQHandler.cc +++ b/CondTools/Ecal/src/EcalDAQHandler.cc @@ -484,7 +484,7 @@ void popcon::EcalDAQHandler::getNewObjects() { << std::endl; } } // end loop over ieta - } // end loop over iphi + } // end loop over iphi // endcap for (int ix = 1; ix < 21; ix++) { @@ -504,9 +504,9 @@ void popcon::EcalDAQHandler::getNewObjects() { std::cout << "endcap side " << k << " x " << ix << " y " << iy << " status " << dbStatus << std::endl; } } // end loop over iy - } // end loop over ix - } // end loop over k (side) - } // check if there is already a payload + } // end loop over ix + } // end loop over k (side) + } // check if there is already a payload else { if (m_debug) std::cout << " No db found : set default values " << std::endl; @@ -524,8 +524,8 @@ void popcon::EcalDAQHandler::getNewObjects() { oldEBStatus[iphi - 1][ieta - 1][k] = dbStatus; daq_temp->setValue(ebid, dbStatus); } // valid Id - } // end loop over ieta - } // end loop over iphi + } // end loop over ieta + } // end loop over iphi // endcap for (int ix = 1; ix < 21; ix++) { for (int iy = 1; iy < 21; iy++) { @@ -535,10 +535,10 @@ void popcon::EcalDAQHandler::getNewObjects() { oldEEStatus[ix - 1][iy - 1][k] = dbStatus; daq_temp->setValue(eeid, dbStatus); } // valid Id - } // end loop over iy - } // end loop over ix - } // end loop over k (side) - } // no payload set default values + } // end loop over iy + } // end loop over ix + } // end loop over k (side) + } // no payload set default values // now read the actual status from the online DB @@ -691,8 +691,8 @@ void popcon::EcalDAQHandler::getNewObjects() { } } } // loop over all possible SC in a sector - } // not read out sector - } // not all FED are read out + } // not read out sector + } // not all FED are read out typedef std::map::const_iterator feConfIter; // EcalLogicID ecid_xt; @@ -869,7 +869,7 @@ void popcon::EcalDAQHandler::getNewObjects() { daq_pop->setValue(ebid, dbStatus); } } // end loop over ieta - } // end loop over iphi + } // end loop over iphi // endcap for (int ix = 1; ix < 21; ix++) { @@ -885,8 +885,8 @@ void popcon::EcalDAQHandler::getNewObjects() { daq_pop->setValue(eeid, dbStatus); } } // end loop over iy - } // end loop over ix - } // end loop over k (side) + } // end loop over ix + } // end loop over k (side) std::cout << "Generating popcon record for run " << irun << std::endl; @@ -904,7 +904,7 @@ void popcon::EcalDAQHandler::getNewObjects() { // hlt } // check on number of already transferred runs } // loop over runs - } // check on run number > 0 + } // check on run number > 0 // disconnect from DB delete econn; diff --git a/CondTools/Ecal/src/EcalDCSHandler.cc b/CondTools/Ecal/src/EcalDCSHandler.cc index a813fb9a4f8be..91291e507b0d7 100644 --- a/CondTools/Ecal/src/EcalDCSHandler.cc +++ b/CondTools/Ecal/src/EcalDCSHandler.cc @@ -302,11 +302,11 @@ bool popcon::EcalDCSHandler::insertHVDataSetToOffline(const std::mapsetValue((int)ebId, corr ); // cryst =""; - } // end loop over EB channels + } // end loop over EB channels getline(fWeek, line); // cmment before EE crystals std::cout << " comment line " << line << std::endl; for (int iChannel = 0; iChannel < kEEChannels; iChannel++) { diff --git a/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc b/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc index 02ad3b297bf91..3feacdde158be 100644 --- a/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc +++ b/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc @@ -158,7 +158,7 @@ void popcon::EcalLaser_weekly_Linearization_Check::getNewObjects() { std::cout << " shift1 file " << fDB << " " << shift1EB[ich] << " file " << fname << " " << shift[2] << "\n"; exit(-1); } - } // end loop over EB channels + } // end loop over EB channels getline(fWeek, line); // comment before EE crystals std::cout << " comment line " << line << std::endl; int chm12 = 0, chm6 = 0, chm1 = 0, chs12 = 0, chs6 = 0, chs1 = 0; diff --git a/CondTools/Ecal/src/EcalPedestalsHandler.cc b/CondTools/Ecal/src/EcalPedestalsHandler.cc index 6711278a5635a..8c5cf130ff074 100644 --- a/CondTools/Ecal/src/EcalPedestalsHandler.cc +++ b/CondTools/Ecal/src/EcalPedestalsHandler.cc @@ -450,12 +450,12 @@ void popcon::EcalPedestalsHandler::getNewObjectsP5() { ss << "Run=" << irun << "_WAS_BAD_" << std::endl; m_userTextLog = ss.str() + ";"; } // bad run : do not write in DB - } // SubRunNumber - } // loop over runs + } // SubRunNumber + } // loop over runs delete econn; delete peds; // this is the only one that popcon does not delete - } // runs to analyze ? + } // runs to analyze ? edm::LogInfo("Ecal - > end of getNewObjects -----------\n"); } @@ -708,8 +708,8 @@ void popcon::EcalPedestalsHandler::readPedestalFile() { item.rms_x12 = EBrms12[hieb]; ped->insert(std::make_pair(ebdetid.rawId(), item)); } // valid EBId - } // loop over phi - } // loop over eta + } // loop over phi + } // loop over eta // endcaps // std::ofstream fout; // fout.open("Pedestal.check"); @@ -729,9 +729,9 @@ void popcon::EcalPedestalsHandler::readPedestalFile() { item.rms_x12 = EErms12[hiee]; ped->insert(std::make_pair(eedetid.rawId(), item)); } // val EEId - } // loop over y - } // loop over x - } // loop over z + } // loop over y + } // loop over x + } // loop over z // fout.close(); unsigned int irun = m_firstRun; @@ -926,7 +926,7 @@ void popcon::EcalPedestalsHandler::readPedestalMC() { if (ring == 16) fout << "***** End caps ***** EE- EE+" << std::endl; } // loop over rings - } // loop over gains + } // loop over gains // read also the ring value from Crystal file @@ -984,8 +984,8 @@ void popcon::EcalPedestalsHandler::readPedestalMC() { edm::LogInfo(" Channel ") << hieb << " 12 " << item.rms_x12 << " 6 " << item.rms_x6 << " 1 " << item.rms_x1; ped->insert(std::make_pair(ebdetid.rawId(), item)); } // valid EBId - } // loop over phi - } // loop over eta + } // loop over phi + } // loop over eta // endcaps for (int iz = -1; iz < 2; iz = iz + 2) { // z : -1 and +1 @@ -1029,9 +1029,9 @@ void popcon::EcalPedestalsHandler::readPedestalMC() { } ped->insert(std::make_pair(eedetid.rawId(), item)); } // val EEId - } // loop over y - } // loop over x - } // loop over z + } // loop over y + } // loop over x + } // loop over z fout.close(); unsigned int irun = m_firstRun; @@ -1184,8 +1184,8 @@ void popcon::EcalPedestalsHandler::readPedestal2017() { item.rms_x12 = previous_ped.rms_x12; ped->insert(std::make_pair(ebdetid.rawId(), item)); } // valid EBId - } // loop over phi - } // loop over eta + } // loop over phi + } // loop over eta // endcaps // std::ofstream fout; // fout.open("Pedestal.check"); @@ -1229,9 +1229,9 @@ void popcon::EcalPedestalsHandler::readPedestal2017() { item.rms_x12 = previous_ped.rms_x12; ped->insert(std::make_pair(eedetid.rawId(), item)); } // val EEId - } // loop over y - } // loop over x - } // loop over z + } // loop over y + } // loop over x + } // loop over z // fout.close(); unsigned int irun = m_firstRun; @@ -1630,7 +1630,7 @@ void popcon::EcalPedestalsHandler::readPedestalTree() { } } } // new run - } // end loop over all entries + } // end loop over all entries // write also the last run fout << " last entry fill " << fill_num << " run " << runold << " nb of events " << RunEntry << " time " << run_time << " " << run_time_stablebeam << " " << time[0] << " run type " << run_type << std::endl; @@ -2033,7 +2033,7 @@ void popcon::EcalPedestalsHandler::readPedestalTimestamp() { } fxml.close(); } // found a new gain 1 6 file - } // check gain 1 and 6 results only for new runs + } // check gain 1 and 6 results only for new runs EcalPedestals* pedestal = new EcalPedestals(); EcalPedestals::Item item; diff --git a/CondTools/Ecal/src/EcalSRPHandler.cc b/CondTools/Ecal/src/EcalSRPHandler.cc index 1ea782057507e..5bd7cecf95cb9 100644 --- a/CondTools/Ecal/src/EcalSRPHandler.cc +++ b/CondTools/Ecal/src/EcalSRPHandler.cc @@ -391,7 +391,7 @@ void popcon::EcalSRPHandler::getNewObjects() { if (m_debug) fout << " weight size after DB " << sr->dccNormalizedWeights_.size() << std::endl; } // WEI_ID != 0 - } // weights got from FE + } // weights got from FE // check if we have found the weights if (sr->dccNormalizedWeights_.empty()) { // use the firmware default weights @@ -726,8 +726,8 @@ void popcon::EcalSRPHandler::getNewObjects() { m_i_version = myconfig_version; fe_conf_id_old = fe_conf_id; } // different tag or version or fe config - } // loop over runs - } // test on number of runs + } // loop over runs + } // test on number of runs // disconnect from DB delete econn; @@ -808,7 +808,7 @@ void popcon::EcalSRPHandler::importDccConfigFile(EcalSRSettings& sr, const std:: } } // loop over subchild } - } // loop over child + } // loop over child sr.srpLowInterestChannelZS_.push_back(L1ZS[0] * 0.035 / 4); // EB sr.srpLowInterestChannelZS_.push_back(L1ZS[1] * 0.060 / 4); // EE sr.srpHighInterestChannelZS_.push_back(L2ZS[0] * 0.035 / 4); // EB diff --git a/CondTools/Ecal/src/EcalTPGBadXTHandler.cc b/CondTools/Ecal/src/EcalTPGBadXTHandler.cc index ece34c6dfdb9e..c73fab0a87680 100644 --- a/CondTools/Ecal/src/EcalTPGBadXTHandler.cc +++ b/CondTools/Ecal/src/EcalTPGBadXTHandler.cc @@ -294,7 +294,7 @@ void popcon::EcalTPGBadXTHandler::getNewObjects() { } } //end for over kr (nr of runs) - } //end if + } //end if delete econn; diff --git a/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc b/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc index ba5e08e1db329..5d2c956da1944 100644 --- a/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc +++ b/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc @@ -69,7 +69,7 @@ std::string EcalTPGCrystalStatusXMLTranslator::dumpXML(const EcalCondHeader& hea WriteNodeWithValue(cellnode, TPGCrystalStatus_tag, record[id.rawId()].getStatusCode()); } } // iphi - } // ieta + } // ieta for (int ix = 0; ix < kEndcWedgesX; ix++) { for (int iy = 0; iy < kEndcWedgesY; iy++) { @@ -81,8 +81,8 @@ std::string EcalTPGCrystalStatusXMLTranslator::dumpXML(const EcalCondHeader& hea WriteNodeWithValue(cellnode, TPGCrystalStatus_tag, record[id.rawId()].getStatusCode()); } } // iy - } // ix - } // side + } // ix + } // side std::string dump = cms::xerces::toString(writer->writeToString(root)); doc->release(); diff --git a/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc b/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc index e11b752472534..ca156cb43c413 100644 --- a/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc +++ b/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc @@ -67,7 +67,7 @@ void popcon::EcalTPGFineGrainStripfromFile::getNewObjects() { fgrStripEE->setValue(stripId, item); if (istrip == 12239) getline(fLin, line); // 1 empty line between EB and EE - } // end loop over EB + EE strips + } // end loop over EB + EE strips fLin.close(); m_to_transfer.push_back(std::make_pair(fgrStripEE, fileIOV)); diff --git a/CondTools/Ecal/src/EcalTPGLinPed.cc b/CondTools/Ecal/src/EcalTPGLinPed.cc index cc78b12c4e9d3..7a508b17f21ce 100644 --- a/CondTools/Ecal/src/EcalTPGLinPed.cc +++ b/CondTools/Ecal/src/EcalTPGLinPed.cc @@ -72,7 +72,7 @@ void popcon::EcalTPGLinPed::getNewObjects() { linC->insert(std::make_pair(id, item)); peds->insert(std::make_pair(id, itemPed)); - } // end loop over EB channels + } // end loop over EB channels getline(fLin, line); // comment before EE crystals std::cout << " comment line " << line << std::endl; for (int iChannel = 0; iChannel < kEEChannels; iChannel++) { diff --git a/CondTools/Ecal/src/EcalTPGPedfromFile.cc b/CondTools/Ecal/src/EcalTPGPedfromFile.cc index 7f66c9cf3d650..3503c6ce9e8ae 100644 --- a/CondTools/Ecal/src/EcalTPGPedfromFile.cc +++ b/CondTools/Ecal/src/EcalTPGPedfromFile.cc @@ -73,7 +73,7 @@ void popcon::EcalTPGPedfromFile::getNewObjects() { linC->insert(std::make_pair(id, item)); peds->insert(std::make_pair(id, itemPed)); - } // end loop over EB channels + } // end loop over EB channels getline(fLin, line); // comment before EE crystals std::cout << " comment line " << line << std::endl; for (int iChannel = 0; iChannel < kEEChannels; iChannel++) { diff --git a/CondTools/Ecal/src/EcalTestDevDB.cc b/CondTools/Ecal/src/EcalTestDevDB.cc index 875621d0333dc..344e3d025511b 100644 --- a/CondTools/Ecal/src/EcalTestDevDB.cc +++ b/CondTools/Ecal/src/EcalTestDevDB.cc @@ -250,7 +250,7 @@ std::shared_ptr EcalTestDevDB::generateEcalIntercalibCo double r = (double)std::rand() / (double(RAND_MAX) + double(1)); ical->setValue(ebid.rawId(), 0.85 + r * 0.3); } // loop over phi - } // loop over eta + } // loop over eta return ical; } @@ -337,7 +337,7 @@ std::shared_ptr EcalTestDevDB::generateEcalGainRatios() { gratio->setValue(ebid.rawId(), gr); } // loop over phi - } // loop over eta + } // loop over eta return gratio; } diff --git a/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc b/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc index a0cf2a83835cb..5ac1bb6e64967 100644 --- a/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc +++ b/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc @@ -126,7 +126,7 @@ int main(int argc, char* argv[]) { return 1; } eos::portable_iarchive ar(is); - ar& cuts; + ar & cuts; } // Load the reference table of cuts @@ -139,7 +139,7 @@ int main(int argc, char* argv[]) { return 1; } eos::portable_iarchive ar(is); - ar& refcuts; + ar & refcuts; refptr = &refcuts; } diff --git a/CondTools/Hcal/test/write_HBHENegativeEFilter.cc b/CondTools/Hcal/test/write_HBHENegativeEFilter.cc index 469d8084c63a8..e9b2bcd139241 100644 --- a/CondTools/Hcal/test/write_HBHENegativeEFilter.cc +++ b/CondTools/Hcal/test/write_HBHENegativeEFilter.cc @@ -76,10 +76,10 @@ int main(int argc, char *argv[]) { std::ifstream is(outputfile, mode); if (usingTxt) { boost::archive::text_iarchive ar(is); - ar &f2; + ar & f2; } else { eos::portable_iarchive ar(is); - ar &f2; + ar & f2; } } diff --git a/CondTools/Hcal/test/write_HFPhase1PMTParams.cc b/CondTools/Hcal/test/write_HFPhase1PMTParams.cc index 054f550aeb564..549bfc7f2e5d3 100644 --- a/CondTools/Hcal/test/write_HFPhase1PMTParams.cc +++ b/CondTools/Hcal/test/write_HFPhase1PMTParams.cc @@ -97,10 +97,10 @@ int main(int argc, char *argv[]) { std::ifstream is(outputfile, mode); if (usingTxt) { boost::archive::text_iarchive ar(is); - ar &p2; + ar & p2; } else { eos::portable_iarchive ar(is); - ar &p2; + ar & p2; } } diff --git a/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc b/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc index aa27fc64b1906..8247a185a4bc4 100644 --- a/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc +++ b/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc @@ -13,12 +13,12 @@ class QGLikelihoodDBReader : public edm::one::EDAnalyzer<> { public: explicit QGLikelihoodDBReader(const edm::ParameterSet&); - ~QGLikelihoodDBReader() override{}; + ~QGLikelihoodDBReader() override {} private: - void beginJob() override{}; + void beginJob() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override{}; + void endJob() override {} std::string mPayloadName; edm::ESGetToken mPayloadToken; diff --git a/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc b/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc index 401234969ccf3..28468a75be829 100644 --- a/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc +++ b/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc @@ -13,12 +13,12 @@ class QGLikelihoodSystematicsDBReader : public edm::one::EDAnalyzer<> { public: explicit QGLikelihoodSystematicsDBReader(const edm::ParameterSet&); - ~QGLikelihoodSystematicsDBReader() override{}; + ~QGLikelihoodSystematicsDBReader() override {} private: - void beginJob() override{}; + void beginJob() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override{}; + void endJob() override {} std::string mPayloadName; edm::ESGetToken mPayloadToken; diff --git a/CondTools/RunInfo/interface/BTransitionAnalyzer.h b/CondTools/RunInfo/interface/BTransitionAnalyzer.h index d077bbcb646ab..401abd0954c14 100644 --- a/CondTools/RunInfo/interface/BTransitionAnalyzer.h +++ b/CondTools/RunInfo/interface/BTransitionAnalyzer.h @@ -28,9 +28,9 @@ namespace cond { // implicit copy constructor // implicit assignment operator // implicit destructor - void beginJob() final{}; - void beginRun(edm::Run const&, edm::EventSetup const&) final{}; - void analyze(edm::Event const&, edm::EventSetup const&) final{}; + void beginJob() final {} + void beginRun(edm::Run const&, edm::EventSetup const&) final {} + void analyze(edm::Event const&, edm::EventSetup const&) final {} void endRun(edm::Run const& run, edm::EventSetup const& eventSetup) final { edm::ESHandle runInfoHandle = eventSetup.getHandle(m_RunInfoToken); edm::ESHandle payloadHandle, payloadRefHandle; @@ -69,7 +69,7 @@ namespace cond { edm::LogError("BTransitionAnalyzer") << "PoolDBOutputService unavailable"; } } - void endJob() final{}; + void endJob() final {} virtual bool equalPayloads(edm::ESHandle const& payloadHandle, edm::ESHandle const& payloadRefHandle) = 0; private: diff --git a/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc b/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc index b49f1f5a76e27..fe047ba1e17cc 100644 --- a/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc +++ b/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc @@ -67,9 +67,9 @@ class SiPhase2BadStripChannelBuilder : public ConditionDBWriter theOTDets.push_back(pixdet); } } // if it's a Strip module - } // if it's OT - } // if it's Tracker - } // loop of geomdets + } // if it's OT + } // if it's Tracker + } // loop of geomdets }; void algoAnalyze(const edm::Event& event, const edm::EventSetup& es) override { diff --git a/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelReader.cc b/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelReader.cc index db6b052f529ae..c747b4e469f96 100644 --- a/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelReader.cc +++ b/CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelReader.cc @@ -73,7 +73,7 @@ void SiPhase2BadStripChannelReader::analyze(edm::StreamID, << badStrip.second << ")" << std::endl; } } // if doesn't exceed the maximum printout level - } // loop over the range + } // loop over the range countMessages++; } // loop over the detids diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py index 5b6aa0ddc445d..d98f4fd1f17fa 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py @@ -1,6 +1,12 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("ICALIB") +################################################################### +# Set default phase-2 settings +################################################################### +import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings +_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION) + +process = cms.Process("ICALIB", _PH2_ERA) import FWCore.ParameterSet.VarParsing as VarParsing options = VarParsing.VarParsing('analysis') @@ -17,13 +23,13 @@ engineName = cms.untracked.string('TRandom3') ) -## specify detector D88, as the geometry is needed (will take tracker T24) -process.load("Configuration.Geometry.GeometryExtended2026D88_cff") -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +## specify the default phase2 detector +process.load("Configuration.Geometry.GeometryExtended2026Default_cff") +process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') +process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') ################################################################### # Messages @@ -61,10 +67,10 @@ authenticationPath = cms.untracked.string('') ), timetype = cms.untracked.string('runnumber'), - connect = cms.string('sqlite_file:SiStripBadStripPhase2_T21_v0.db'), + connect = cms.string('sqlite_file:SiStripBadStripPhase2_T33_v0.db'), toPut = cms.VPSet(cms.PSet( record = cms.string('SiStripBadStripRcd'), - tag = cms.string('SiStripBadStripPhase2_T21') + tag = cms.string('SiStripBadStripPhase2_T33') )) ) diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py index 12feaec057861..0c6164baecf7b 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py @@ -3,7 +3,13 @@ import FWCore.ParameterSet.Config as cms import FWCore.ParameterSet.VarParsing as VarParsing -process = cms.Process("TEST") +################################################################### +# Set default phase-2 settings +################################################################### +import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings +_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION) + +process = cms.Process("TEST", _PH2_ERA) options = VarParsing.VarParsing('analysis') options.register('fromESSource', False, # default value @@ -48,16 +54,16 @@ # Input data ################################################################### if(options.fromESSource): - process.load("Configuration.Geometry.GeometryExtended2026D88_cff") - process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') + process.load("Configuration.Geometry.GeometryExtended2026Default_cff") + process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') + process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') #process.load("SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff") # already included #process.SiPhase2OTFakeBadStripsESSource.printDebug = cms.untracked.bool(True) # this makes it verbose process.SiPhase2OTFakeBadStripsESSource.badComponentsFraction = cms.double(0.05) # bad components fraction is 5% else: - tag = 'SiStripBadStripPhase2_T21' + tag = 'SiStripBadStripPhase2_T33' suffix = 'v0' inFile = tag+'_'+suffix+'.db' inDB = 'sqlite_file:'+inFile diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py index e5cffc55a0486..91ffe7b19f35c 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py @@ -1,7 +1,22 @@ #! /usr/bin/env cmsRun # Author: Marco Musich (October 2021) import FWCore.ParameterSet.Config as cms -process = cms.Process("TEST") +import FWCore.ParameterSet.VarParsing as VarParsing + +################################################################### +# Set default phase-2 settings +################################################################### +import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings +_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION) + +process = cms.Process("TEST",_PH2_ERA) +options = VarParsing.VarParsing('analysis') +options.register('fromESSource', + False, # default value + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.bool, + "Populate SiPhase2OuterTrackerLorentzAngleRcd from the ESSource") +options.parseArguments() ################################################################### # Messages @@ -20,6 +35,7 @@ ), SiPhase2OuterTrackerLorentzAngleReader = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPhase2OuterTrackerLorentzAngle = cms.untracked.PSet( limit = cms.untracked.int32(-1)), + SiPhase2OuterTrackerFakeLorentzAngleESSource = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) ################################################################### @@ -36,29 +52,45 @@ ################################################################### # Input data ################################################################### -tag = 'SiPhase2OuterTrackerLorentzAngle_T21' -suffix = 'v0' -inFile = tag+'_'+suffix+'.db' -inDB = 'sqlite_file:'+inFile +if(options.fromESSource): + process.load("Configuration.Geometry.GeometryExtended2026Default_cff") + process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") + from Configuration.AlCa.GlobalTag import GlobalTag + process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '') + + # process.SiPhase2OTFakeLorentzAngleESSource = cms.ESSource('SiPhase2OuterTrackerFakeLorentzAngleESSource', + # LAValue = cms.double(0.014), + # recordName = cms.string("LorentzAngle")) + # process.es_prefer_fake_LA = cms.ESPrefer("SiPhase2OuterTrackerFakeLorentzAngleESSource","SiPhase2OTFakeLorentzAngleESSource") + + from CalibTracker.SiPhase2TrackerESProducers.SiPhase2OuterTrackerFakeLorentzAngleESSource_cfi import SiPhase2OTFakeLorentzAngleESSource + process.mySiPhase2OTFakeLorentzAngleESSource = SiPhase2OTFakeLorentzAngleESSource.clone(LAValue = cms.double(0.14)) + process.es_prefer_fake_LA = cms.ESPrefer("SiPhase2OuterTrackerFakeLorentzAngleESSource","mySiPhase2OTFakeLorentzAngleESSource") +else: + tag = 'SiPhase2OuterTrackerLorentzAngle_T33' + suffix = 'v0' + inFile = tag+'_'+suffix+'.db' + inDB = 'sqlite_file:'+inFile -process.load("CondCore.CondDB.CondDB_cfi") -# input database (in this case the local sqlite file) -process.CondDB.connect = inDB + process.load("CondCore.CondDB.CondDB_cfi") + # input database (in this case the local sqlite file) + process.CondDB.connect = inDB -process.PoolDBESSource = cms.ESSource("PoolDBESSource", - process.CondDB, - DumpStat=cms.untracked.bool(True), - toGet = cms.VPSet(cms.PSet(record = cms.string("SiPhase2OuterTrackerLorentzAngleRcd"), - tag = cms.string(tag)) - ) - ) + process.PoolDBESSource = cms.ESSource("PoolDBESSource", + process.CondDB, + DumpStat=cms.untracked.bool(True), + toGet = cms.VPSet(cms.PSet(record = cms.string("SiPhase2OuterTrackerLorentzAngleRcd"), + tag = cms.string(tag)) + ) + ) ################################################################### # check the ES data getter ################################################################### process.get = cms.EDAnalyzer("EventSetupRecordDataGetter", toGet = cms.VPSet(cms.PSet( - record = cms.string(' SiPhase2OuterTrackerLorentzAngleRcd'), + record = cms.string('SiPhase2OuterTrackerLorentzAngleRcd'), data = cms.vstring('SiPhase2OuterTrackerLorentzAngle') )), verbose = cms.untracked.bool(True) diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py index 43c1bcddf327b..f06eb474c564b 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py @@ -3,8 +3,14 @@ from __future__ import print_function import os, shlex, shutil, getpass +################################################################### +# Set default phase-2 settings +################################################################### +import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings +_PH2_GLOBAL_TAG, _PH2_ERA = _settings.get_era_and_conditions(_settings.DEFAULT_VERSION) + import FWCore.ParameterSet.Config as cms -process = cms.Process("TEST") +process = cms.Process("TEST", _PH2_ERA) ################################################################### # Messages @@ -25,7 +31,7 @@ SiPhase2OuterTrackerLorentzAngle = cms.untracked.PSet( limit = cms.untracked.int32(-1)), ) -tag = 'SiPhase2OuterTrackerLorentzAngle_T21' +tag = 'SiPhase2OuterTrackerLorentzAngle_T33' suffix = 'v0' outfile = tag+'_'+suffix+'.db' outdb = 'sqlite_file:'+outfile @@ -38,12 +44,12 @@ process.load("CondCore.CondDB.CondDB_cfi") process.CondDB.connect = cms.string(outdb) -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') +process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff') +process.load('Configuration.Geometry.GeometryExtended2026Default_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21') +process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) ) process.source = cms.Source("EmptyIOVSource", diff --git a/CondTools/SiPhase2Tracker/test/test_CondToolsSiPhase2Tracker.sh b/CondTools/SiPhase2Tracker/test/test_CondToolsSiPhase2Tracker.sh index 693c595a7a40c..0ca54f62ac27c 100755 --- a/CondTools/SiPhase2Tracker/test/test_CondToolsSiPhase2Tracker.sh +++ b/CondTools/SiPhase2Tracker/test/test_CondToolsSiPhase2Tracker.sh @@ -7,12 +7,13 @@ printf "testing writing Phase2 Outer Tracker Lorentz Angle \n\n" ## need to be in order (don't read before writing) cmsRun ${TEST_DIR}/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py || die "Failure running SiPhase2OuterTrackerLorentzAngleWriter_cfg.py " $? cmsRun ${TEST_DIR}/SiPhase2OuterTrackerLorentzAngleReader_cfg.py || die "Failure running SiPhase2OuterTrackerLorentzAngleReader_cfg.py " $? +cmsRun ${TEST_DIR}/SiPhase2OuterTrackerLorentzAngleReader_cfg.py fromESSource=True || die "Failure running SiPhase2OuterTrackerLorentzAngleReader_cfg.py fromESSource=True" $? printf "testing writing Phase2 Outer Tracker Bad Strips \n\n" ## need to be in order (don't read before writing) cmsRun ${TEST_DIR}/SiPhase2BadStripChannelBuilder_cfg.py algorithm=1 || die "Failure running SiPhase2BadStripChannelBuilder_cfg.py (naive)" $? -cmsRun ${TEST_DIR}/SiPhase2BadStripChannelBuilder_cfg.py algorithm=1 || die "Failure running SiPhase2BadStripChannelBuilder_cfg.py (random)" $? -cmsRun ${TEST_DIR}/SiPhase2BadStripChannelReader_cfg.py || die "Failure running SiPhase2BadStripChannelReader_cfg.py" $? +cmsRun ${TEST_DIR}/SiPhase2BadStripChannelBuilder_cfg.py algorithm=2 || die "Failure running SiPhase2BadStripChannelBuilder_cfg.py (random)" $? +cmsRun ${TEST_DIR}/SiPhase2BadStripChannelReader_cfg.py || die "Failure running SiPhase2BadStripChannelReader_cfg.py" $? cmsRun ${TEST_DIR}/SiPhase2BadStripChannelReader_cfg.py fromESSource=True || die "Failure running SiPhase2BadStripChannelReader_cfg.py fromESSource=True" $? printf "testing writing Phase2 Tracker Cabling Map (test) \n\n" diff --git a/CondTools/SiPixel/data/phase2_T33_mapping.csv b/CondTools/SiPixel/data/phase2_T33_mapping.csv new file mode 100644 index 0000000000000..fd0744d9b790b --- /dev/null +++ b/CondTools/SiPixel/data/phase2_T33_mapping.csv @@ -0,0 +1,26 @@ +RULES,,,, +,,,, +BARREL,,,, +,,,, +TEMPLATE ID ,LAYER,LADDER,MODULE, +411,1,1-12,1-9, +2293,2,1-28,1-9, +2293,3,1-24,1-9, +2293,4,1-32,1-9, +,,,, +ENDCAP,,,, +,,,, +TEMPLATE ID ,DISK,BLADE,SIDE,PANEL +2295,1-8,1-01,1-2,1 +2295,1-8,2-05,1-2,1 +2295,9-12,1-05,1-2,1 +,,,, +EXCEPTIONS,,,, +,,,, +BARREL,,,, +,,,, +TEMPLATE ID ,LAYER,LADDER,MODULE, +,,,, +ENDCAP,,,, +,,,, +TEMPLATE ID ,DISK,BLADE,SIDE,PANEL diff --git a/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc b/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc index 6aeffaf59df7c..97c28bd3915e6 100644 --- a/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc +++ b/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc @@ -96,8 +96,8 @@ void SiPixelBadFEDChannelSimulationSanityChecker::analyze(const edm::Event& e, c // } } // if prob!=0 - } // loop on the scenarios for that PU bin - } // loop on PU bins + } // loop on the scenarios for that PU bin + } // loop on PU bins std::vector notFound; std::copy_if(allScenariosInProb.begin(), @@ -122,9 +122,9 @@ void SiPixelBadFEDChannelSimulationSanityChecker::analyze(const edm::Event& e, c edm::LogVerbatim("SiPixelBadFEDChannelSimulationSanityChecker") << " - PU bin " << PUbin << " with probability: " << pair.second << std::endl; } // if the scenario matches - } // loop on scenarios - } // loop on PU - } // if printdebug + } // loop on scenarios + } // loop on PU + } // if printdebug edm::LogVerbatim("SiPixelBadFEDChannelSimulationSanityChecker") << "==============================================" << std::endl; } // loop on scenarios not found diff --git a/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc b/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc index 679a0a1d0897f..bd9adbe9cc0a3 100644 --- a/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc +++ b/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc @@ -144,15 +144,15 @@ std::unique_ptr SiPixelBadModuleByHandBuilder::getNewObject() { if (it.second == 65535) { // "whole" BadModule.errorType = 0; BadModule.BadRocs = 65535; - } //corresponds to all rocs being bad + } //corresponds to all rocs being bad else if (it.second == 255) { // "tbmA" BadModule.errorType = 1; BadModule.BadRocs = 255; - } //corresponds to Rocs 0-7 being bad + } //corresponds to Rocs 0-7 being bad else if (it.second == 65280) { // "tbmB" BadModule.errorType = 2; BadModule.BadRocs = 65280; - } //corresponds to Rocs 8-15 being bad + } //corresponds to Rocs 8-15 being bad else { // "none" BadModule.errorType = 3; BadModule.BadRocs = it.second; diff --git a/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc b/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc index fffe50128f500..565084b4f088b 100644 --- a/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc +++ b/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc @@ -307,7 +307,7 @@ void SiPixelGainCalibScaler::computeAndStorePalyoads(const edm::EventSetup& iSet } } } // loop on rows - } // loop on columns + } // loop on columns typename PayloadType::Range outrange(theSiPixelGainCalibration.begin(), theSiPixelGainCalibration.end()); if (!SiPixelGainCalibration_.put(d, outrange, ncols)) diff --git a/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc b/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc index 912ae6497e3d5..99e77c3ecca37 100644 --- a/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc +++ b/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc @@ -223,8 +223,8 @@ void SiPixelLorentzAngleDBLoader::analyze(const edm::Event& e, const edm::EventS } else LogError("SiPixelLorentzAngleDBLoader") << " ERROR!: detid already exists"; } // end loop on FPixParameters_ - } // condition to read from config - } // end on being barrel or endcap + } // condition to read from config + } // end on being barrel or endcap } } diff --git a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py index 1c55c765f4534..dd5933cdde33a 100644 --- a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py @@ -186,8 +186,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger = cms.Service("MessageLogger", destinations = cms.untracked.vstring('SiPixel2DTemplateDBObjectUploader_Phase2.log')) -process.load('Configuration.Geometry.GeometryExtended2026D88_cff') -process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110_cff') +process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.GlobalTag, '') diff --git a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py index 0658715e072d7..bb72ba4f4406e 100644 --- a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py @@ -195,6 +195,9 @@ elif tGeometry == 'T21': geometry_cff = 'GeometryExtended2026D88_cff' recoGeometry_cff = 'GeometryExtended2026D88Reco_cff' +elif tGeometry == 'T33': + geometry_cff = 'GeometryExtended2026D110_cff' + recoGeometry_cff = 'GeometryExtended2026D110Reco_cff' else: print("Unknown tracker geometry") print("What are you doing ?!?!?!?!") @@ -205,7 +208,6 @@ process.load(recoGeometry_cff) global_tag_name = options.GlobalTag+'_'+tGeometry -#global_tag_name = options.GlobalTag+'_T15' process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py index 5b197d325b477..59c9a6b896d2b 100644 --- a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py @@ -195,6 +195,9 @@ elif tGeometry == 'T21': geometry_cff = 'GeometryExtended2026D92_cff' recoGeometry_cff = 'GeometryExtended2026D92Reco_cff' +elif tGeometry == 'T33': + geometry_cff = 'GeometryExtended2026D110_cff' + recoGeometry_cff = 'GeometryExtended2026D110Reco_cff' else: print("Unknown tracker geometry") print("What are you doing ?!?!?!?!") @@ -205,7 +208,6 @@ process.load(recoGeometry_cff) global_tag_name = options.GlobalTag+'_'+tGeometry -#global_tag_name = options.GlobalTag+'_T15' process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/CondTools/SiPixel/test/createTestDBObjects.sh b/CondTools/SiPixel/test/createTestDBObjects.sh index 9938fb8d0d54a..11cb6f8a973a0 100755 --- a/CondTools/SiPixel/test/createTestDBObjects.sh +++ b/CondTools/SiPixel/test/createTestDBObjects.sh @@ -11,16 +11,16 @@ echo -e "TESTING Pixel 1D GenErr DB code ..." cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_cfg.py MagField=0.0 Fullname=SiPixelGenErrorDBObject_phase1_0T_mc_BoR3_v1_bugfix Map=${SCRAM_TEST_PATH}/../data/phaseI_mapping.csv GenErrFilePath=CalibTracker/SiPixelESProducers/data/SiPixelTemplateDBObject_0T_phase1_BoR3_v1 || die "Failure running SiPixelGenErrorDBObjectUploader_cfg.py" $? echo -e "TESTING Pixel 1D Template DB code for Phase-2 ..." -cmsRun ${SCRAM_TEST_PATH}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping.csv geometry=T21 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc || die "Failure running SiPixelTemplateDBObjectUploader_Phase2_cfg.py" $? +cmsRun ${SCRAM_TEST_PATH}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT711 Map=${SCRAM_TEST_PATH}/../data/phase2_T33_mapping.csv geometry=T33 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v7.1.1_25x100_v1_mc || die "Failure running SiPixelTemplateDBObjectUploader_Phase2_cfg.py" $? echo -e "TESTING Pixel 1D GenErr DB code for Phase-2 ..." -cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping.csv geometry=T21 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc || die "Failure running SiPixelGenErrorDBObjectUploader_Phase2_cfg.py" $? +cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT711 Map=${SCRAM_TEST_PATH}/../data/phase2_T33_mapping.csv geometry=T33 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v7.1.1_25x100_v1_mc || die "Failure running SiPixelGenErrorDBObjectUploader_Phase2_cfg.py" $? -echo -e "TESTING Pixel 2D Template DB code for Phase-2 ..." -cmsRun ${SCRAM_TEST_PATH}/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping_den.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc denominator=True || die "Failure running SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py" $? +#echo -e "TESTING Pixel 2D Template DB code for Phase-2 ..." +#cmsRun ${SCRAM_TEST_PATH}/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping_den.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc denominator=True || die "Failure running SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py" $? echo -e "TESTING Pixel LorentzAngle DB for Phase-2 ..." -cmsRun ${SCRAM_TEST_PATH}/SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T25 +cmsRun ${SCRAM_TEST_PATH}/SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T33 echo -e "TESTING SiPixelVCal DB codes ... \n\n" diff --git a/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc b/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc index 3203328cd36c5..46286e129df8b 100644 --- a/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc +++ b/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc @@ -421,8 +421,8 @@ void SiStripApvGainInspector::checkBookAPVColls(const edm::EventSetup& es) { Index++; NStripAPVs++; } // loop on APVs - } // if is Strips - } // loop on dets + } // if is Strips + } // loop on dets for (unsigned int i = 0; i < Det.size(); i++) { //Make two loop such that the Pixel information is added at the end --> make transition simpler @@ -469,10 +469,10 @@ void SiStripApvGainInspector::checkBookAPVColls(const edm::EventSetup& es) { NPixelDets++; } // loop on ROC cols - } // loop on ROC rows - } // if Pixel - } // loop on Dets - } //if (!bareTkGeomPtr_) ... + } // loop on ROC rows + } // if Pixel + } // loop on Dets + } //if (!bareTkGeomPtr_) ... bareTkGeomPtr_ = newBareTkGeomPtr; } diff --git a/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc b/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc index d4815ebede91f..de98120303ae6 100644 --- a/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc +++ b/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc @@ -116,7 +116,7 @@ void SiStripApvGainRescaler::analyze(const edm::Event& iEvent, const edm::EventS } } // loop over APVs - } // loop over DetIds + } // loop over DetIds std::unique_ptr theAPVGains = this->getNewObject(theMap); diff --git a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc index cdf1042ad00b8..ab342956564cb 100644 --- a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc +++ b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc @@ -18,7 +18,7 @@ class SiStripCablingTrackerMap : public edm::one::EDAnalyzergetNewObject(theMap); diff --git a/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc b/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc index 7de5a1096a47b..c849f141bddc4 100644 --- a/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc +++ b/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc @@ -99,7 +99,7 @@ class SiStripCondVisualizer : public edm::one::EDAnalyzer setTopoInfo(uint32_t detId, const TrackerTopology* tTopo); @@ -208,7 +208,7 @@ void SiStripCondVisualizer::fillTheQualityMap(const SiStripQuality* obj, HistoMa theMap[detid]->SetBinContent(istrip_, quant_); } } // loop on the strips - } // loop on the active detids + } // loop on the active detids return; } @@ -248,7 +248,7 @@ void SiStripCondVisualizer::fillTheHistoMap(const Payload* obj, HistoMap& theMap theMap[detid]->SetBinContent(istrip_, quant_); } } // loop on the strips - } // loop on the active detids + } // loop on the active detids } // ------------ method called for each event ------------ @@ -301,7 +301,7 @@ void SiStripCondVisualizer::beginRun(const edm::Run& iRun, edm::EventSetup const } } } // loop on the bitset of plotted conditions - } // loop on modules + } // loop on modules if (doNoise_) { LOGINFO("SiStripCondVisualizer") << "@SUB=SiStripCondVisualizer::beginRun() \n Before booking NoisMap_.size(): " diff --git a/CondTools/SiStrip/plugins/SiStripDB2Tree.cc b/CondTools/SiStrip/plugins/SiStripDB2Tree.cc index 78e4685cbe0ad..d397f74bedecb 100644 --- a/CondTools/SiStrip/plugins/SiStripDB2Tree.cc +++ b/CondTools/SiStrip/plugins/SiStripDB2Tree.cc @@ -81,7 +81,7 @@ class SiStripDB2Tree : public edm::one::EDAnalyzer diff --git a/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc b/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc index 638aab28c71a5..9b21026b20ffa 100644 --- a/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc +++ b/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc @@ -29,7 +29,7 @@ class SiStripFedCablingBuilder : public edm::one::EDAnalyzer ~SiStripFedCablingReader() override = default; void beginRun(const edm::Run&, const edm::EventSetup&) override; - void endRun(const edm::Run&, const edm::EventSetup&) override{}; - void analyze(const edm::Event&, const edm::EventSetup&) override{}; + void endRun(const edm::Run&, const edm::EventSetup&) override {} + void analyze(const edm::Event&, const edm::EventSetup&) override {} private: bool printFecCabling_; diff --git a/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc b/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc index bac00aa99d3b0..c5b497bc2ffe7 100644 --- a/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc +++ b/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc @@ -135,7 +135,7 @@ void SiStripGainPayloadCopyAndExclude::analyze(const edm::Event& iEvent, const e } } // loop over APVs - } // loop over DetIds + } // loop over DetIds std::unique_ptr theAPVGains = this->getNewObject(theMap); diff --git a/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc b/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc index f5dbdb25e8b6c..9d1f7ff21ae50 100644 --- a/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc +++ b/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc @@ -101,8 +101,8 @@ std::pair SiStripMiscalibrate::getTruncatedRange(const TrackerMap* info_per_detid[key] = mod->value; } } // loop on modules - } // loop on ring - } // loop on layers + } // loop on ring + } // loop on layers auto range = SiStripPI::getTheRange(info_per_detid, 2); return range; diff --git a/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc b/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc index a6cb0d4da738f..d089926fb2c5d 100644 --- a/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc +++ b/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc @@ -212,7 +212,7 @@ void SiStripNoisesFromDBMiscalibrator::analyze(const edm::Event& iEvent, const e nStrips += 1; } // loop over APVs - } // loop over DetIds + } // loop over DetIds SiStripNoises theSiStripNoises{}; if (!m_fillDefaults) { diff --git a/CondTools/SiStrip/scripts/o2oRun_SiStripDCS.py b/CondTools/SiStrip/scripts/o2oRun_SiStripDCS.py index a3a97bf19af89..f3abb04b36e62 100755 --- a/CondTools/SiStrip/scripts/o2oRun_SiStripDCS.py +++ b/CondTools/SiStrip/scripts/o2oRun_SiStripDCS.py @@ -56,7 +56,7 @@ def summary(args, is_ok, logfile): debugLabel = '[TEST] ' if args.debug else '' with open(logfile, 'rb') as log: helper.send_mail(subject='%sDCS O2O Failure: %s' % (debugLabel, args.jobname), - message=log.read(), + message=str(log.read()), send_to=args.mail_log_to, send_from=args.mail_from) diff --git a/CondTools/Utilities/test/classes.h b/CondTools/Utilities/test/classes.h deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/CondTools/Utilities/test/classes_def.xml b/CondTools/Utilities/test/classes_def.xml deleted file mode 100644 index eee362c1b0c25..0000000000000 --- a/CondTools/Utilities/test/classes_def.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index 44176e4ecf1ec..5d0251a58b078 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -37,9 +37,9 @@ 'run3_data_express' : '141X_dataRun3_Express_frozen_v2', # GlobalTag for Run3 data relvals (prompt GT) - 140X_dataRun3_Prompt_v3 (+ the the SecondaryDataset TriggerBits tag and the DeDxCalibrationRcd for HI) but snapshot at 2024_06_12 13:47:20 (UTC) 'run3_data_prompt' : '141X_dataRun3_Prompt_frozen_v1', - # GlobalTag for Run3 offline data reprocessing - snapshot at 2024-02-07 16:38:59 (UTC) - 'run3_data' : '140X_dataRun3_v4', - # GlobalTag for Run3 offline data reprocessing with Prompt GT, currenlty for 2022FG - snapshot at 2024-02-12 12:00:00 (UTC) + # GlobalTag for Run3 offline data reprocessing - snapshot at 2024-09-04 16:25:09 (UTC) + 'run3_data' : '140X_dataRun3_v9', + # GlobalTag for Run3 offline data reprocessing with Prompt GT, currently for 2022FG - snapshot at 2024-02-12 12:00:00 (UTC) 'run3_data_PromptAnalysis' : '140X_dataRun3_PromptAnalysis_v2', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot) 'phase1_2017_design' : '131X_mc2017_design_v3', @@ -88,13 +88,13 @@ # GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2023, Strip tracker in DECO mode 'phase1_2023_cosmics_design' : '140X_mcRun3_2023cosmics_design_deco_v1', # GlobalTag for MC production with realistic conditions for Phase1 2023 detector for Heavy Ion - 'phase1_2023_realistic_hi' : '140X_mcRun3_2023_realistic_HI_v3', + 'phase1_2023_realistic_hi' : '140X_mcRun3_2023_realistic_HI_v4', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2024 'phase1_2024_design' : '140X_mcRun3_2024_design_v11', # GlobalTag for MC production with realistic conditions for Phase1 2024 - 'phase1_2024_realistic' : '140X_mcRun3_2024_realistic_v15', + 'phase1_2024_realistic' : '140X_mcRun3_2024_realistic_v21', # GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2024, Strip tracker in DECO mode - 'phase1_2024_cosmics' : '140X_mcRun3_2024cosmics_realistic_deco_v13', + 'phase1_2024_cosmics' : '140X_mcRun3_2024cosmics_realistic_deco_v14', # GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2024, Strip tracker in DECO mode 'phase1_2024_cosmics_design' : '140X_mcRun3_2024cosmics_design_deco_v11', # GlobalTag for MC production with realistic conditions for Phase1 2024 detector for Heavy Ion diff --git a/Configuration/DataProcessing/python/Impl/hltScouting.py b/Configuration/DataProcessing/python/Impl/hltScouting.py new file mode 100644 index 0000000000000..4734e5b8caa14 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/hltScouting.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python3 +""" +_hltScouting_ + +Scenario supporting proton collisions with input HLT scouting data + +""" + +from __future__ import print_function + +import os +import sys + +from Configuration.DataProcessing.Scenario import * +from Configuration.DataProcessing.Utils import stepSKIMPRODUCER, addMonitoring, dictIO, nanoFlavours, gtNameAndConnect +import FWCore.ParameterSet.Config as cms + +import warnings + +class hltScouting(Scenario): + def __init__(self): + Scenario.__init__(self) + self.recoSeq = '' + self.cbSc = 'pp' + self.isRepacked = False + self.promptCustoms = ['Configuration/DataProcessing/RecoTLR.customisePrompt'] + self.promptModifiers = cms.ModifierChain() + """ + _hltScouting_ + + Implement configuration building for data processing for proton + collision data taking with input HLT scouting data + """ + + def promptReco(self, globalTag, **args): + """ + _promptReco_ + + Proton collision data taking prompt reco with input HLT scouting data + + """ + + options = Options() + options.__dict__.update(defaultOptions.__dict__) + options.scenario = self.cbSc + + if 'nThreads' in args: + options.nThreads = args['nThreads'] + + PhysicsSkimStep = '' + if 'PhysicsSkims' in args: + PhysicsSkimStep = stepSKIMPRODUCER(args['PhysicsSkims']) + + miniAODStep = '' + nanoAODStep = '' + + if 'outputs' in args: + outputs = [] + for a in args['outputs']: + if a['dataTier'] in ['NANOAOD', 'NANOEDMAOD']: + if 'nanoFlavours' in args: + for nanoFlavour in args['nanoFlavours']: + if nanoFlavour != '@Scout': + warnings.warn('nanoFlavour: ' + nanoFlavour + 'is currently not supported and will be removed from outputs. Only supported nanoFlavour is @Scout') + args['nanoFlavours'] = ['@Scout'] + nanoAODStep = ',NANO' + nanoFlavours(args['nanoFlavours']) + else: + nanoAODStep = ',NANO:@Scout' # default to Scouting NANO + outputs.append(a) + else: + warnings.warn('dataTier:' + str(a['dataTier']) + ' is currently not supported and will be removed from outputs') + if {output['dataTier'] for output in outputs} != {a['dataTier'] for a in args['outputs']}: + warnings.warn('The outputs will be changed from ' + str(args['outputs']) + ' to' + str(outputs)) + args['outputs'] = outputs + + if not 'customs' in args: + args['customs'] = [] + + for c in self.promptCustoms: + args['customs'].append(c) + options.customisation_file = args['customs'] + + options.isRepacked = args.get('repacked', self.isRepacked) + + options.step = '' + options.step += self.recoSeq + PhysicsSkimStep + options.step += miniAODStep + nanoAODStep + + dictIO(options, args) + options.conditions = gtNameAndConnect(globalTag, args) + + process = cms.Process('HLTSCOUT', cms.ModifierChain(self.eras, self.promptModifiers)) + cb = ConfigBuilder(options, process = process, with_output = True) + + # Input source + process.source = cms.Source("PoolSource", + fileNames = cms.untracked.vstring() + ) + + cb.prepare() + + addMonitoring(process) + + return process diff --git a/Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2024.py b/Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2024.py new file mode 100644 index 0000000000000..b6c679771a40f --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2024.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +""" +_hltScoutingEra_Run3_2024_ + +Scenario supporting proton collisions with input HLT scouting data for 2024 + +""" + +import os +import sys + +from Configuration.Eras.Era_Run3_2024_cff import Run3_2024 +from Configuration.DataProcessing.Impl.hltScouting import hltScouting + +class hltScoutingEra_Run3_2024(hltScouting): + def __init__(self): + hltScouting.__init__(self) + self.recoSeq = '' + self.cbSc = 'pp' + self.eras = Run3_2024 + self.promptCustoms += ['Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024'] + """ + _hltScoutingEra_Run3_2024_ + Implement configuration building for data processing for proton + collision data taking with input HLT scouting data for Era_Run3_2024 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py new file mode 100644 index 0000000000000..444097ff329d4 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_UPC.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2024_UPC_ +Scenario supporting UPC collisions for 2024 +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2024_UPC_cff import Run3_2024_UPC + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2024_UPC(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.eras=Run3_2024_UPC + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_UPC' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_UPC' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_UPC' ] + """ + _ppEra_Run3_2024_UPC_ + Implement configuration building for data processing for proton + collision data taking for Run3_2024 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py new file mode 100644 index 0000000000000..13c3a063947e1 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_2024_ppRef.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_2024_ppRef_ +Scenario supporting ppRef collisions for 2024 +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_2024_ppRef_cff import Run3_2024_ppRef + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_2024_ppRef(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.eras=Run3_2024_ppRef + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_ppRef' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_ppRef' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2024_ppRef' ] + """ + _ppEra_Run3_2024_ppRef_ + Implement configuration building for data processing for proton + collision data taking for Run3_2024 + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2024.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2024.py new file mode 100644 index 0000000000000..ca63fc7d636d7 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2024.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_pp_on_PbPb_2024_ + +Scenario supporting heavy ions collisions + +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Era_Run3_pp_on_PbPb_2024_cff import Run3_pp_on_PbPb_2024 + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_pp_on_PbPb_2024(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_pp_on_PbPb_2024 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2024' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2024' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2024' ] + """ + _ppEra_Run3_pp_on_PbPb_2024_ + + Implement configuration building for data processing for pp-like processing of HI + collision data taking for Run3 + + """ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024.py new file mode 100644 index 0000000000000..8b0b600207e70 --- /dev/null +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +""" +_ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024_ + +Scenario supporting heavy ions collisions + +""" + +import os +import sys + +from Configuration.DataProcessing.Reco import Reco +from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_2024_cff import Run3_pp_on_PbPb_approxSiStripClusters_2024 +import FWCore.ParameterSet.Config as cms + +from Configuration.DataProcessing.Impl.pp import pp + +class ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024(pp): + def __init__(self): + pp.__init__(self) + self.recoSeq='' + self.cbSc='pp' + self.isRepacked=True + self.eras=Run3_pp_on_PbPb_approxSiStripClusters_2024 + self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024' ] + self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024' ] + self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024' ] + + """ + _ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024_ + + Implement configuration building for data processing for pp-like processing of HI + collision data taking for Run3 with approxSiStripClusters (rawprime format) + + """ diff --git a/Configuration/DataProcessing/python/RecoTLR.py b/Configuration/DataProcessing/python/RecoTLR.py index 997fe5f31d00b..d78af0520ea68 100644 --- a/Configuration/DataProcessing/python/RecoTLR.py +++ b/Configuration/DataProcessing/python/RecoTLR.py @@ -126,6 +126,22 @@ def customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2023(process): customisePostEra_Run3_pp_on_PbPb_2023(process) return process +def customisePostEra_Run3_pp_on_PbPb_2024(process): + customisePostEra_Run3_2024(process) + return process + +def customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2024(process): + customisePostEra_Run3_pp_on_PbPb_2024(process) + return process + +def customisePostEra_Run3_2024_UPC(process): + customisePostEra_Run3_2024(process) + return process + +def customisePostEra_Run3_2024_ppRef(process): + customisePostEra_Run3_2024(process) + return process + ############################################################################## def customisePPData(process): #deprecated process= customiseCommon(process) diff --git a/Configuration/DataProcessing/test/BuildFile.xml b/Configuration/DataProcessing/test/BuildFile.xml index a1662f5c2bf8e..411a7aba551f7 100644 --- a/Configuration/DataProcessing/test/BuildFile.xml +++ b/Configuration/DataProcessing/test/BuildFile.xml @@ -9,3 +9,4 @@ + diff --git a/Configuration/DataProcessing/test/run_CfgTest_13.sh b/Configuration/DataProcessing/test/run_CfgTest_13.sh new file mode 100755 index 0000000000000..8493526529d07 --- /dev/null +++ b/Configuration/DataProcessing/test/run_CfgTest_13.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Test suite for various ConfigDP scenarios +# run using: scram build runtests +# feel free to contribute with your favourite configuration + + +# Pass in name and status +function die { echo $1: status $2 ; exit $2; } + +function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; } + +declare -a arr=("hltScoutingEra_Run3_2024") +for scenario in "${arr[@]}" +do + runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --nanoaod --global-tag GLOBALTAG --lfn=/store/whatever --nanoFlavours=@Scout" +done diff --git a/Configuration/DataProcessing/test/run_CfgTest_5.sh b/Configuration/DataProcessing/test/run_CfgTest_5.sh index c930630845844..7d71eba553761 100755 --- a/Configuration/DataProcessing/test/run_CfgTest_5.sh +++ b/Configuration/DataProcessing/test/run_CfgTest_5.sh @@ -10,7 +10,7 @@ function die { echo $1: status $2 ; exit $2; } function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; } -declare -a arr=("AlCaLumiPixels" "AlCaTestEnable" "cosmicsEra_Run2_2018" "hcalnzsEra_Run2_2018" "ppEra_Run2_2018" "hcalnzsEra_Run2_2018_highBetaStar" "hcalnzsEra_Run2_2018_pp_on_AA" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_2018_pp_on_AA" "cosmicsHybridEra_Run2_2018" "cosmicsEra_Run3" "hcalnzsEra_Run3" "ppEra_Run3" "AlCaLumiPixels_Run3" "AlCaPhiSymEcal_Nano" "AlCaPPS_Run3" "ppEra_Run3_pp_on_PbPb" "hcalnzsEra_Run3_pp_on_PbPb" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters" "ppEra_Run3_2023" "ppEra_Run3_pp_on_PbPb_2023" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" "ppEra_Run3_2024") +declare -a arr=("AlCaLumiPixels" "AlCaTestEnable" "cosmicsEra_Run2_2018" "hcalnzsEra_Run2_2018" "ppEra_Run2_2018" "hcalnzsEra_Run2_2018_highBetaStar" "hcalnzsEra_Run2_2018_pp_on_AA" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_2018_pp_on_AA" "cosmicsHybridEra_Run2_2018" "cosmicsEra_Run3" "hcalnzsEra_Run3" "ppEra_Run3" "AlCaLumiPixels_Run3" "AlCaPhiSymEcal_Nano" "AlCaPPS_Run3" "ppEra_Run3_pp_on_PbPb" "hcalnzsEra_Run3_pp_on_PbPb" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters" "ppEra_Run3_2023" "ppEra_Run3_pp_on_PbPb_2023" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" "ppEra_Run3_2024" "ppEra_Run3_pp_on_PbPb_2024" "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024" "ppEra_Run3_2024_UPC" "ppEra_Run3_2024_ppRef") for scenario in "${arr[@]}" do runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias" diff --git a/Configuration/DataProcessing/test/run_CfgTest_8.sh b/Configuration/DataProcessing/test/run_CfgTest_8.sh index 62bc5c078b29b..4db6d176fbf38 100755 --- a/Configuration/DataProcessing/test/run_CfgTest_8.sh +++ b/Configuration/DataProcessing/test/run_CfgTest_8.sh @@ -10,7 +10,7 @@ function die { echo $1: status $2 ; exit $2; } function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; } -declare -a arr=("ppEra_Run3" "ppEra_Run3_2023" "ppEra_Run3_2023_repacked" "ppEra_Run3_2024") +declare -a arr=("ppEra_Run3" "ppEra_Run3_2023" "ppEra_Run3_2023_repacked" "ppEra_Run3_2024" "hltScoutingEra_Run3_2024") for scenario in "${arr[@]}" do runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --miniaod --nanoaod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever --alcareco TkAlMinBias+SiStripCalMinBias" diff --git a/Configuration/Eras/python/Era_Run3_2024_cff.py b/Configuration/Eras/python/Era_Run3_2024_cff.py index fec4b81b1ddfb..ef55fc7c4ebce 100644 --- a/Configuration/Eras/python/Era_Run3_2024_cff.py +++ b/Configuration/Eras/python/Era_Run3_2024_cff.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Eras.Era_Run3_cff import Run3 -from Configuration.Eras.Modifier_run3_2024_L1T_cff import run3_2024_L1T +from Configuration.Eras.Modifier_stage2L1Trigger_2024_cff import stage2L1Trigger_2024 +from Configuration.Eras.Modifier_run3_scouting_nanoAOD_post2023_cff import run3_scouting_nanoAOD_post2023 -Run3_2024 = cms.ModifierChain(Run3, run3_2024_L1T) +Run3_2024 = cms.ModifierChain(Run3, stage2L1Trigger_2024, run3_scouting_nanoAOD_post2023) diff --git a/Configuration/Eras/python/Modifier_run3_scouting_nanoAOD_post2023_cff.py b/Configuration/Eras/python/Modifier_run3_scouting_nanoAOD_post2023_cff.py new file mode 100644 index 0000000000000..b7606c383dd13 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run3_scouting_nanoAOD_post2023_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +run3_scouting_nanoAOD_post2023 = cms.Modifier() diff --git a/Configuration/Eras/python/Modifier_stage2L1Trigger_2024_cff.py b/Configuration/Eras/python/Modifier_stage2L1Trigger_2024_cff.py new file mode 100644 index 0000000000000..e8140b6718e9e --- /dev/null +++ b/Configuration/Eras/python/Modifier_stage2L1Trigger_2024_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +stage2L1Trigger_2024 = cms.Modifier() diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 54cca52eaebc8..396b424cd3da2 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -56,7 +56,7 @@ from RecoBTag.Configuration.RecoBTag_EventContent_cff import * from RecoTauTag.Configuration.RecoTauTag_EventContent_cff import * from RecoVertex.Configuration.RecoVertex_EventContent_cff import * -from RecoTracker.Configuration.RecoPixelVertexing_EventContent_cff import * +from RecoVertex.Configuration.RecoPixelVertexing_EventContent_cff import * from RecoEgamma.Configuration.RecoEgamma_EventContent_cff import * from RecoParticleFlow.Configuration.RecoParticleFlow_EventContent_cff import * from RecoVertex.BeamSpotProducer.BeamSpot_EventContent_cff import * @@ -677,8 +677,13 @@ def SwapKeepAndDrop(l): ]) phase2_tracker.toModify(FEVTDEBUGHLTEventContent, outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[ + 'keep *_hltSiPixelClusters_*_*', + 'keep *_hltSiPhase2Clusters_*_*', 'keep *_hltPhase2PixelTracks_*_*', - 'keep *_hltPhase2PixelVertices_*_*' + 'keep *_hltPhase2PixelVertices_*_*', + 'keep *_hltGeneralTracks_*_*', + 'keep *_hltOfflinePrimaryVertices_*_*', + 'keep *_hltHGCalRecHit_*_*' ]) phase2_common.toModify(FEVTDEBUGHLTEventContent, @@ -689,6 +694,11 @@ def SwapKeepAndDrop(l): phase2_muon.toModify(FEVTDEBUGHLTEventContent, outputCommands = FEVTDEBUGHLTEventContent.outputCommands + ['keep recoMuons_muons1stStep_*_*']) +phase2_hgcal.toModify(FEVTDEBUGHLTEventContent, + outputCommands = FEVTDEBUGHLTEventContent.outputCommands + TICL_FEVTHLT.outputCommands) + +ticl_v5.toModify(FEVTDEBUGHLTEventContent, outputCommands=FEVTDEBUGHLTEventContent.outputCommands+TICLv5_FEVTHLT.outputCommands) + from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2 (premix_stage2 & phase2_tracker).toModify(FEVTDEBUGHLTEventContent, diff --git a/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py b/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py index 5e54fc05987ea..d07e7406706b0 100644 --- a/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py +++ b/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py @@ -1,25 +1,30 @@ import FWCore.ParameterSet.Config as cms generator = cms.EDProducer("CloseByParticleGunProducer", - PGunParameters = cms.PSet(PartID = cms.vint32(22), + PGunParameters = cms.PSet( ControlledByEta = cms.bool(False), - EnMin = cms.double(25.), - EnMax = cms.double(200.), - MaxEnSpread = cms.bool(False), - RMin = cms.double(60), - RMax = cms.double(120), - ZMin = cms.double(320), - ZMax = cms.double(321), Delta = cms.double(10), - Pointing = cms.bool(True), - Overlapping = cms.bool(False), - RandomShoot = cms.bool(False), - NParticles = cms.int32(2), + VarMax = cms.double(200), + VarMin = cms.double(25), + MaxVarSpread = cms.bool(False), + FlatPtGeneration = cms.bool(False), MaxEta = cms.double(2.7), - MinEta = cms.double(1.7), MaxPhi = cms.double(3.14159265359), + MinEta = cms.double(1.7), MinPhi = cms.double(-3.14159265359), - + NParticles = cms.int32(2), + Overlapping = cms.bool(False), + PartID = cms.vint32(22), + Pointing = cms.bool(True), + RMax = cms.double(120), + RMin = cms.double(60), + RandomShoot = cms.bool(False), + ZMax = cms.double(321), + ZMin = cms.double(320), + UseDeltaT = cms.bool(False), + TMin = cms.double(0), + TMax = cms.double(0.05), + OffsetFirst = cms.double(0) ), Verbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py new file mode 100644 index 0000000000000..9df061003cb9d --- /dev/null +++ b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py @@ -0,0 +1,28 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Generator.Pyquen2015Settings_cff import * + +generator = cms.EDFilter("HydjetGeneratorFilter", + collisionParameters5519GeV, + qgpParameters2023, + hydjetParameters2023, + hydjetMode = cms.string('kHydroQJets'), + PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, + # Quarkonia and Weak Bosons added back upon dilepton group's request. + parameterSets = cms.vstring('pythiaUESettings', + 'hydjetPythiaDefault', + 'myParameters', + 'pythiaJets', + 'pythiaPromptPhotons', + 'pythiaZjets', + 'pythiaBottomoniumNRQCD', + 'pythiaCharmoniumNRQCD', + 'pythiaQuarkoniaSettings', + 'pythiaWeakBosons' + ) + ), + cFlag = cms.int32(1), + bMin = cms.double(0), + bMax = cms.double(30), + bFixed = cms.double(0) + ) diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1TuneDownSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1DownSettings_cfi.py similarity index 86% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1TuneDownSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1DownSettings_cfi.py index 444f95ee5e0af..7bcee8550d541 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1TuneDownSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1DownSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP1TuneDownSettingsBlock = cms.PSet( - pythia8CP1TuneDownSettings = cms.vstring( +pythia8CP1DownSettingsBlock = cms.PSet( + pythia8CP1DownSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1TuneUpSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1UpSettings_cfi.py similarity index 87% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1TuneUpSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1UpSettings_cfi.py index 5cd20bc02a272..3115e0c393c39 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1TuneUpSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP1UpSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP1TuneUpSettingsBlock = cms.PSet( - pythia8CP1TuneUpSettings = cms.vstring( +pythia8CP1UpSettingsBlock = cms.PSet( + pythia8CP1UpSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2TuneDownSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2DownSettings_cfi.py similarity index 87% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2TuneDownSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2DownSettings_cfi.py index 74a8856b5d57c..06e51b4f59722 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2TuneDownSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2DownSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP2TuneDownSettingsBlock = cms.PSet( - pythia8CP2TuneDownSettings = cms.vstring( +pythia8CP2DownSettingsBlock = cms.PSet( + pythia8CP2DownSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2TuneUpSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2UpSettings_cfi.py similarity index 87% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2TuneUpSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2UpSettings_cfi.py index 77ab98e756c25..41a27c832cea2 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2TuneUpSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP2UpSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP2TuneUpSettingsBlock = cms.PSet( - pythia8CP2TuneUpSettings = cms.vstring( +pythia8CP2UpSettingsBlock = cms.PSet( + pythia8CP2UpSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3TuneDownSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3DownSettings_cfi.py similarity index 90% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3TuneDownSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3DownSettings_cfi.py index 9eba3a1d593fd..fc531d7d6f76c 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3TuneDownSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3DownSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP3TuneDownSettingsBlock = cms.PSet( - pythia8CP3TuneDownSettings = cms.vstring( +pythia8CP3DownSettingsBlock = cms.PSet( + pythia8CP3DownSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3TuneUpSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3UpSettings_cfi.py similarity index 91% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3TuneUpSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3UpSettings_cfi.py index 185b0f1c4e62d..16c5a50e1566b 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3TuneUpSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP3UpSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP3TuneUpSettingsBlock = cms.PSet( - pythia8CP3TuneUpSettings = cms.vstring( +pythia8CP3UpSettingsBlock = cms.PSet( + pythia8CP3UpSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4TuneDownSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4DownSettings_cfi.py similarity index 90% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4TuneDownSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4DownSettings_cfi.py index 7a6cef5203ea0..24917c1274aa0 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4TuneDownSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4DownSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP4TuneDownSettingsBlock = cms.PSet( - pythia8CP4TuneDownSettings = cms.vstring( +pythia8CP4DownSettingsBlock = cms.PSet( + pythia8CP4DownSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4TuneUpSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4UpSettings_cfi.py similarity index 91% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4TuneUpSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4UpSettings_cfi.py index 740852d292d0c..3cd627387539b 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4TuneUpSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP4UpSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP4TuneUpSettingsBlock = cms.PSet( - pythia8CP4TuneUpSettings = cms.vstring( +pythia8CP4UpSettingsBlock = cms.PSet( + pythia8CP4UpSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR1TuneSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR1Settings_cfi.py similarity index 92% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR1TuneSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR1Settings_cfi.py index b4390c53e43e9..ddd37e7c305ff 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR1TuneSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR1Settings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP5CR1TuneSettingsBlock = cms.PSet( - pythia8CP5CR1TuneSettings = cms.vstring( +pythia8CP5CR1SettingsBlock = cms.PSet( + pythia8CP5CR1Settings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:alphaSvalue=0.118', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR2TuneSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR2Settings_cfi.py similarity index 90% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR2TuneSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR2Settings_cfi.py index e0bb5703a933a..a17d6779c4859 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR2TuneSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5CR2Settings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP5CR2TuneSettingsBlock = cms.PSet( - pythia8CP5CR2TuneSettings = cms.vstring( +pythia8CP5CR2SettingsBlock = cms.PSet( + pythia8CP5CR2Settings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:bProfile=2', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5TuneDownSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5DownSettings_cfi.py similarity index 90% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5TuneDownSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5DownSettings_cfi.py index 0ee07bc6770e7..2937318728aa1 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5TuneDownSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5DownSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP5TuneDownSettingsBlock = cms.PSet( - pythia8CP5TuneDownSettings = cms.vstring( +pythia8CP5DownSettingsBlock = cms.PSet( + pythia8CP5DownSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:ecmPow=0.03344', diff --git a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5TuneUpSettings_cfi.py b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5UpSettings_cfi.py similarity index 91% rename from Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5TuneUpSettings_cfi.py rename to Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5UpSettings_cfi.py index 67268d9370466..9efa68ea1491c 100644 --- a/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5TuneUpSettings_cfi.py +++ b/Configuration/Generator/python/MCTunesRun3ECM13p6TeV/PythiaCP5UpSettings_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -pythia8CP5TuneUpSettingsBlock = cms.PSet( - pythia8CP5TuneUpSettings = cms.vstring( +pythia8CP5UpSettingsBlock = cms.PSet( + pythia8CP5UpSettings = cms.vstring( 'Tune:pp 14', 'Tune:ee 7', 'MultipartonInteractions:ecmPow=0.03344', diff --git a/Configuration/Generator/python/Pyquen2015Settings_cff.py b/Configuration/Generator/python/Pyquen2015Settings_cff.py index d1430a33fe46d..74e30bda5d5bc 100644 --- a/Configuration/Generator/python/Pyquen2015Settings_cff.py +++ b/Configuration/Generator/python/Pyquen2015Settings_cff.py @@ -20,6 +20,10 @@ comEnergy = cms.double(5362.0) ) +collisionParameters5519GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number + comEnergy = cms.double(5519.0) + ) + qgpParameters = cms.PSet(qgpInitialTemperature = cms.double(1.1), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; hadronFreezoutTemperature = cms.double(0.125), diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index 3a33b9b593c66..8d351470700a5 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -143,16 +143,9 @@ The script also handles the common and forward elements of the geometry: * F8: same as F6 or F7 without BRM Several detector combinations have been generated: -* D86 = T24+C17+M10+I14+O8+F8 -* D88 = T24+C17+M10+I15+O9+F8 -* D91 = T30+C17+M10+I15+O9+F8 -* D92 = T24+C18+M10+I15+O9+F8 -* D93 = T24+C19+M10+I15+O9+F8 -* D94 = T24+C20+M10+I15+O9+F8 * D95 = T31+C17+M10+I16+O9+F8 * D96 = T31+C18+M10+I16+O9+F8 -* D97 = T25+C17+M10+I15+O9+F8 -* D98 = T32+C17+M10+I16+O9+F8 (Current Phase-2 baseline from CMSSW_13_2_0_pre2) +* D98 = T32+C17+M10+I16+O9+F8 * D99 = T32+C18+M10+I16+O9+F8 * D100 = T34+C17+M11+I16+O9+F8 * D101 = T34+C18+M11+I16+O9+F8 @@ -164,7 +157,7 @@ Several detector combinations have been generated: * D107 = T32+C17+M11+I17+O9+F8 * D108 = T35+C19+M11+I17+O9+F8 * D109 = T35+C24+M11+I17+O9+F8 -* D110 = T35+C18+M11+I17+O9+F8 +* D110 = T35+C18+M11+I17+O9+F8 (Current Phase-2 baseline from CMSSW_14_1_0_pre2) * D111 = T36+C24+M11+I17+O9+F8 * D112 = T37+C24+M11+I17+O9+F8 * D113 = T38+C24+M11+I17+O9+F8 diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py deleted file mode 100644 index b8a8e9e3e0f62..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D86_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D86_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D86_cff.py deleted file mode 100644 index 9f7630e89ad41..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D86_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py deleted file mode 100644 index 0c41b9dd08d77..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D88_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D88_cff.py deleted file mode 100644 index f36d2263783f1..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D88_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py deleted file mode 100644 index f055159035310..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D91_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D91_cff.py deleted file mode 100644 index edd8c9acb69ac..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D91_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py deleted file mode 100644 index 52a1585c94946..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D92_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D92_cff.py deleted file mode 100644 index c9f83073303d1..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D92_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py deleted file mode 100644 index 29a3792173fb9..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D93_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D93_cff.py deleted file mode 100644 index 6bc1f192e9586..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D93_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D93.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py deleted file mode 100644 index 6f32998764d59..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py +++ /dev/null @@ -1,63 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D94_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.HFNoseTopology_cfi import * -from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive", - "HGCalHFNoseSensitive", - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D94_cff.py deleted file mode 100644 index c1f198b5e53f0..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D94_cff.py +++ /dev/null @@ -1,19 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D94.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import * -from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py deleted file mode 100644 index 1edd1599de2af..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hepExtended2026D97_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D97_cff.py deleted file mode 100644 index 63e40aed9e540..0000000000000 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D97_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryDD4hep_cff import * -DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D97.xml") - -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py index beff59e29780a..c7bfaec544dd1 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026DefaultReco_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryDD4hepExtended2026D98Reco_cff import * +reco_dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}Reco_cff import *" +exec(reco_dd4hep_geometry_import_stmt) diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py index c1e4cd3c76aa5..6edff18cef641 100644 --- a/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py +++ b/Configuration/Geometry/python/GeometryDD4hepExtended2026Default_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryDD4hepExtended2026D98_cff import * +dd4hep_geometry_import_stmt = f"from Configuration.Geometry.GeometryDD4hepExtended{DEFAULT_VERSION}_cff import *" +exec(dd4hep_geometry_import_stmt) diff --git a/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py deleted file mode 100644 index b713d55193265..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D86_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtended2026D86_cff.py b/Configuration/Geometry/python/GeometryExtended2026D86_cff.py deleted file mode 100644 index 9624deb91ac4e..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D86_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D86XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py deleted file mode 100644 index 93408b8d39b2f..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D88_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtended2026D88_cff.py b/Configuration/Geometry/python/GeometryExtended2026D88_cff.py deleted file mode 100644 index 4d98856c96fbf..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D88_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D88XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py deleted file mode 100644 index 5d0c7e966619d..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D91_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtended2026D91_cff.py b/Configuration/Geometry/python/GeometryExtended2026D91_cff.py deleted file mode 100644 index ac832f7703301..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D91_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D91XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py deleted file mode 100644 index 97bcb6b24dd3d..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D92_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtended2026D92_cff.py b/Configuration/Geometry/python/GeometryExtended2026D92_cff.py deleted file mode 100644 index 419f09a78fbaf..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D92_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D92XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py deleted file mode 100644 index 157e84c5887e3..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D93_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtended2026D93_cff.py b/Configuration/Geometry/python/GeometryExtended2026D93_cff.py deleted file mode 100644 index 7668e9dc91e72..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D93_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D93XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py deleted file mode 100644 index 5d22d5753daf3..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py +++ /dev/null @@ -1,63 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D94_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.HFNoseTopology_cfi import * -from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive", - "HGCalHFNoseSensitive", - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtended2026D94_cff.py b/Configuration/Geometry/python/GeometryExtended2026D94_cff.py deleted file mode 100644 index 7c902cd644888..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D94_cff.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D94XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import * -from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py deleted file mode 100644 index c7b2222eb565d..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py +++ /dev/null @@ -1,60 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Configuration.Geometry.GeometryExtended2026D97_cff import * - -# tracker -from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * -from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * -from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * -from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * -from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * -trackerGeometry.applyAlignment = True - -# calo -from Geometry.CaloEventSetup.HGCalTopology_cfi import * -from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * -from Geometry.CaloEventSetup.CaloTopology_cfi import * -from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * -CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring("HCAL", - "ZDC", - "EcalBarrel", - "TOWER", - "HGCalEESensitive", - "HGCalHESiliconSensitive", - "HGCalHEScintillatorSensitive" - ) -) -from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * -from Geometry.HcalEventSetup.HcalGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * -from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * -from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * -from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * -from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * -from Geometry.EcalMapping.EcalMapping_cfi import * -from Geometry.EcalMapping.EcalMappingRecord_cfi import * - -# muon -from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * -from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * -from Geometry.GEMGeometryBuilder.gemGeometry_cff import * -from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * -from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * - -# forward -from Geometry.ForwardGeometry.ZdcGeometry_cfi import * - -# timing -from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * -from Geometry.MTDGeometryBuilder.mtdParameters_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * -from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * -from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * -from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * -mtdGeometry.applyAlignment = False - diff --git a/Configuration/Geometry/python/GeometryExtended2026D97_cff.py b/Configuration/Geometry/python/GeometryExtended2026D97_cff.py deleted file mode 100644 index f64d1ff65e89d..0000000000000 --- a/Configuration/Geometry/python/GeometryExtended2026D97_cff.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# This config was generated automatically using generate2026Geometry.py -# If you notice a mistake, please update the generating script, not just this config - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D97XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * -from Geometry.EcalCommonData.ecalSimulationParameters_cff import * -from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * -from Geometry.MuonNumbering.muonGeometryConstants_cff import * -from Geometry.MuonNumbering.muonOffsetESProducer_cff import * -from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py b/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py index 2144415e04a9b..b757a900c5960 100644 --- a/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026DefaultReco_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryExtended2026D98Reco_cff import * +reco_geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{DEFAULT_VERSION}Reco_cff import *" +exec(reco_geometry_import_stmt) diff --git a/Configuration/Geometry/python/GeometryExtended2026Default_cff.py b/Configuration/Geometry/python/GeometryExtended2026Default_cff.py index ae40639051777..cfb9f0a23fd6a 100644 --- a/Configuration/Geometry/python/GeometryExtended2026Default_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026Default_cff.py @@ -1,3 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Geometry.defaultPhase2ConditionsEra_cff import DEFAULT_VERSION -from Configuration.Geometry.GeometryExtended2026D98_cff import * +geometry_import_stmt = f"from Configuration.Geometry.GeometryExtended{DEFAULT_VERSION}_cff import *" +exec(geometry_import_stmt) diff --git a/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py b/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py new file mode 100644 index 0000000000000..5b9b4bfea644f --- /dev/null +++ b/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py @@ -0,0 +1,37 @@ +from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties as properties +from Configuration.AlCa.autoCond import autoCond +from Configuration.StandardSequences.Eras import eras + +DEFAULT_VERSION = "2026D110" + +def get_era_and_conditions(version_key): + """Retrieve the era and global tag for a given version key. + + Args: + version_key (str): The version key to look up. + + Returns: + tuple: A tuple containing the global tag and era object. + + Raises: + KeyError: If the version key or global tag is not found. + """ + # Ensure the version key exists in the properties for 2026 + if version_key not in properties[2026]: + raise KeyError(f"Version key '{version_key}' not found in properties[2026].") + + # Retrieve the global tag key + global_tag_key = properties[2026][version_key]['GT'] + print(f"Global tag key from properties: {global_tag_key}") + + # Validate the existence of the global tag in autoCond + global_tag_name = global_tag_key.replace("auto:", "") + if global_tag_name not in autoCond: + raise KeyError(f"Global tag key '{global_tag_key}' not found in autoCond.") + + # Retrieve the era key and get the corresponding era object + era_key = properties[2026][version_key]['Era'] + print(f"Constructed era key from properties: {era_key}") + era = getattr(eras, era_key) + + return global_tag_key, era diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py index b56111ffdea4d..c33590550d7ac 100644 --- a/Configuration/Geometry/python/dict2021Geometry.py +++ b/Configuration/Geometry/python/dict2021Geometry.py @@ -1394,7 +1394,7 @@ muonDict = { "abbrev" : "M", "name" : "muon", - "default" : 1, + "default" : 4, "M1" : { 1 : [ 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', @@ -1530,6 +1530,51 @@ ], "era" : "run3_GEM", }, + "M4" : { + 1 : [ + 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', + 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', + 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', + 'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml', + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', + 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', + 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', + 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', + 'Geometry/MuonCommonData/data/rpcf/2024/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', + 'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml', + 'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml', + 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', + ], + 2 : [ + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', + ], + 3 : [ + 'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml', + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml', + 'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml', + 'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml', + ], + 4 : [ + 'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml', + ], + "sim" : [ + 'from Geometry.MuonNumbering.muonGeometryConstants_cff import *', + 'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *', + ], + "reco" : [ + 'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *', + 'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *', + 'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *', + 'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *', + 'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *', + ], + "era" : "run3_GEM", + }, } forwardDict = { @@ -1756,12 +1801,12 @@ ("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent", ("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent", ("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent", - ("O6","T3","C1","M3","F3","P7") : "2024", - ("O4","T4","C1","M3","F2","P7") : "2024ZeroMaterial", - ("O5","T5","C1","M3","F2","P7") : "2024FlatMinus05Percent", - ("O5","T6","C1","M3","F2","P7") : "2024FlatMinus10Percent", - ("O5","T7","C1","M3","F2","P7") : "2024FlatPlus05Percent", - ("O5","T8","C1","M3","F2","P7") : "2024FlatPlus10Percent", + ("O6","T3","C1","M4","F3","P7") : "2024", + ("O4","T4","C1","M4","F2","P7") : "2024ZeroMaterial", + ("O5","T5","C1","M4","F2","P7") : "2024FlatMinus05Percent", + ("O5","T6","C1","M4","F2","P7") : "2024FlatMinus10Percent", + ("O5","T7","C1","M4","F2","P7") : "2024FlatPlus05Percent", + ("O5","T8","C1","M4","F2","P7") : "2024FlatPlus10Percent", } deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index 9205245be65c7..d3205b1a8c031 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -1363,15 +1363,8 @@ allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ] detectorVersionDict = { - ("O8","T24","C17","M10","F8","I14") : "D86", - ("O9","T24","C17","M10","F8","I15") : "D88", - ("O9","T30","C17","M10","F8","I15") : "D91", - ("O9","T24","C18","M10","F8","I15") : "D92", - ("O9","T24","C19","M10","F8","I15") : "D93", - ("O9","T24","C20","M10","F8","I15") : "D94", ("O9","T31","C17","M10","F8","I16") : "D95", ("O9","T31","C18","M10","F8","I16") : "D96", - ("O9","T25","C17","M10","F8","I15") : "D97", ("O9","T32","C17","M10","F8","I16") : "D98", ("O9","T32","C18","M10","F8","I16") : "D99", ("O9","T34","C17","M11","F8","I16") : "D100", @@ -1392,5 +1385,5 @@ ("O9","T35","C20","M11","F8","I17") : "D115", } -deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85"]) -deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T5", "T6", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T14", "T15", "T16", "T17", "T18", "T19", "T20", "T21", "T22", "T23", "T26", "T27", "T28", "T29", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "C10", "C11", "C12", "C13", "C14", "C15", "C16", "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "I1", "I2", "I3", "I4", "I5", "I6", "I7", "I8", "I9", "I10", "I11", "I12", "I13", "O1", "O2", "O3", "O4", "O5", "O6", "O7", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]) +deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86","D88","D91","D92","D93","D94","D97"]) +deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T5", "T6", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T14", "T15", "T16", "T17", "T18", "T19", "T20", "T21", "T22", "T23", "T24", "T25", "T26", "T27", "T28", "T29", "T30", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "C10", "C11", "C12", "C13", "C14", "C15", "C16", "M1", "M2", "M3", "M4", "M5", "M6", "M7", "M8", "M9", "I1", "I2", "I3", "I4", "I5", "I6", "I7", "I8", "I9", "I10", "I11", "I12", "I13", "I14", "I15", "O1", "O2", "O3", "O4", "O5", "O6", "O7", "O8", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]) diff --git a/Configuration/ProcessModifiers/python/allSonicTriton_cff.py b/Configuration/ProcessModifiers/python/allSonicTriton_cff.py index 396fcefd84a79..f349808c487f7 100644 --- a/Configuration/ProcessModifiers/python/allSonicTriton_cff.py +++ b/Configuration/ProcessModifiers/python/allSonicTriton_cff.py @@ -5,6 +5,8 @@ from Configuration.ProcessModifiers.particleNetPTSonicTriton_cff import particleNetPTSonicTriton from Configuration.ProcessModifiers.deepMETSonicTriton_cff import deepMETSonicTriton from Configuration.ProcessModifiers.deepTauSonicTriton_cff import deepTauSonicTriton +from Configuration.ProcessModifiers.particleTransformerAK4SonicTriton_cff import particleTransformerAK4SonicTriton # collect all SonicTriton-related process modifiers here -allSonicTriton = cms.ModifierChain(enableSonicTriton,deepMETSonicTriton,particleNetSonicTriton,deepTauSonicTriton) +allSonicTriton = cms.ModifierChain(enableSonicTriton,deepMETSonicTriton,particleNetSonicTriton,particleNetPTSonicTriton,deepTauSonicTriton,particleTransformerAK4SonicTriton) + diff --git a/Configuration/ProcessModifiers/python/particleTransformerAK4SonicTriton_cff.py b/Configuration/ProcessModifiers/python/particleTransformerAK4SonicTriton_cff.py new file mode 100644 index 0000000000000..22fff0fb9ea6c --- /dev/null +++ b/Configuration/ProcessModifiers/python/particleTransformerAK4SonicTriton_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +particleTransformerAK4SonicTriton = cms.Modifier() diff --git a/Configuration/Eras/python/Modifier_run3_2024_L1T_cff.py b/Configuration/ProcessModifiers/python/phase2_pp_on_AA_cff.py similarity index 55% rename from Configuration/Eras/python/Modifier_run3_2024_L1T_cff.py rename to Configuration/ProcessModifiers/python/phase2_pp_on_AA_cff.py index 7a981a35023ac..923fc361437c3 100644 --- a/Configuration/Eras/python/Modifier_run3_2024_L1T_cff.py +++ b/Configuration/ProcessModifiers/python/phase2_pp_on_AA_cff.py @@ -1,3 +1,3 @@ import FWCore.ParameterSet.Config as cms -run3_2024_L1T = cms.Modifier() +phase2_pp_on_AA = cms.Modifier() diff --git a/Configuration/ProcessModifiers/python/ticl_superclustering_dnn_cff.py b/Configuration/ProcessModifiers/python/ticl_superclustering_dnn_cff.py new file mode 100644 index 0000000000000..40cd46626a8b3 --- /dev/null +++ b/Configuration/ProcessModifiers/python/ticl_superclustering_dnn_cff.py @@ -0,0 +1,10 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 +from Configuration.ProcessModifiers.ticl_superclustering_mustache_pf_cff import ticl_superclustering_mustache_pf +from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl + +# Modifier to run superclustering with DNN +# It is not to be used directly in a Process since it is currently the default for ticl_v5 +# It only exists as convenience in configuration files +ticl_superclustering_dnn = ticl_v5 & (~ticl_superclustering_mustache_pf) & (~ticl_superclustering_mustache_ticl) diff --git a/Configuration/ProcessModifiers/python/ticl_superclustering_mustache_pf_cff.py b/Configuration/ProcessModifiers/python/ticl_superclustering_mustache_pf_cff.py new file mode 100644 index 0000000000000..3487edbac62a9 --- /dev/null +++ b/Configuration/ProcessModifiers/python/ticl_superclustering_mustache_pf_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +# Modifier (to be applied on top of ticl_v5 modifier) to use the pre-TICLv5 superclustering code (that translates tracksters to PFClusters before running Mustache) +ticl_superclustering_mustache_pf = cms.Modifier() diff --git a/Configuration/ProcessModifiers/python/ticl_superclustering_mustache_ticl_cff.py b/Configuration/ProcessModifiers/python/ticl_superclustering_mustache_ticl_cff.py new file mode 100644 index 0000000000000..8b2755f583007 --- /dev/null +++ b/Configuration/ProcessModifiers/python/ticl_superclustering_mustache_ticl_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +# Modifier (to be applied on top of ticl_v5 modifier) to run superclustering using Mustache inside TICL (with tracksters as inputs) +ticl_superclustering_mustache_ticl = cms.Modifier() diff --git a/Configuration/ProcessModifiers/python/trackingIters01_cff.py b/Configuration/ProcessModifiers/python/trackingIters01_cff.py new file mode 100644 index 0000000000000..9f7506d27b51c --- /dev/null +++ b/Configuration/ProcessModifiers/python/trackingIters01_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +# This modifier sets the iterative tracking to use a minimal set of iterations, first two +trackingIters01 = cms.Modifier() diff --git a/Configuration/ProcessModifiers/python/trackingLST_cff.py b/Configuration/ProcessModifiers/python/trackingLST_cff.py new file mode 100644 index 0000000000000..ae1dd83e20b0b --- /dev/null +++ b/Configuration/ProcessModifiers/python/trackingLST_cff.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +# This modifier sets the LST (Phase-2 line segment tracking) used for track building +trackingLST = cms.Modifier() + diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index cb04a44c6764f..5951cd1c4d4ae 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -33,11 +33,15 @@ The offsets currently in use are: * 0.402: Alpaka, pixel only quadruplets, portable * 0.403: Alpaka, pixel only quadruplets, portable vs. CPU validation * 0.404: Alpaka, pixel only quadruplets, portable profiling +* 0.406: Alpaka, pixel only triplets, portable +* 0.407: Alpaka, pixel only triplets, portable vs. CPU validation +* 0.407: Alpaka, pixel only triplets, portable profiling * 0.412: Alpaka, ECAL only, portable * 0.422: Alpaka, HCAL only, portable * 0.423: Alpaka, HCAL only, portable vs CPU validation * 0.424: Alpaka, HCAL only, portable profiling * 0.492: Alpaka, full reco with pixel quadruplets +* 0.496: Alpaka, full reco with pixel triplets * 0.5: Pixel tracking only + 0.1 * 0.501: Patatrack, pixel only quadruplets, on CPU * 0.502: Patatrack, pixel only quadruplets, with automatic offload to GPU if available @@ -61,9 +65,12 @@ The offsets currently in use are: * 0.7: trackingMkFit modifier * 0.701: DisplacedRegionalStep tracking iteration for Run-3 * 0.702: trackingMkFit modifier for Phase-2 (initialStep only) +* 0.703: LST tracking, initialStep+HighPtTripletStep only, on CPU +* 0.704: LST tracking, initialStep+HighPtTripletStep only, on GPU * 0.78: Complete L1 workflow * 0.8: BPH Parking (Run-2) * 0.81: Running also HeavyFlavor DQM +* 0.85: Phase-2 Heavy Ion * 0.9: Vector hits * 0.12: Neutron background * 0.13: MLPF algorithm @@ -81,7 +88,7 @@ The offsets currently in use are: * 0.633: ECAL phase2 Trigger Primitive * 0.634: ECAL phase2 Trigger Primitive + component-method based digis * 0.635: ECAL phase2 Trigger Primitive + component-method based finely-sampled waveforms -* 0.75: Phase-2 HLT +* 0.75: Phase-2 HLT Timing menu * 0.91: Track DNN modifier * 0.97: Premixing stage1 * 0.98: Premixing stage2 @@ -96,6 +103,9 @@ The offsets currently in use are: * 0.103: Phase-2 aging, 3000fb-1 * 0.201: HGCAL special TICL Pattern recognition Workflows: clue3D * 0.202: HGCAL special TICL Pattern recognition Workflows: FastJet +* 0.203: HGCAL TICLv5 +* 0.204: HGCAL superclustering : using Mustache in TICLv5 +* 0.205: HGCAL superclustering : using old PFCluster-based Mustache algorithm with TICLv5 * 0.302: FastSim Run-3 trackingOnly validation * 0.303: FastSim Run-3 MB for mixing * 0.9001: Sonic Triton diff --git a/Configuration/PyReleaseValidation/python/MatrixReader.py b/Configuration/PyReleaseValidation/python/MatrixReader.py index 7448cc2d7ba25..a4c63b599e16a 100644 --- a/Configuration/PyReleaseValidation/python/MatrixReader.py +++ b/Configuration/PyReleaseValidation/python/MatrixReader.py @@ -55,7 +55,8 @@ def reset(self, what='all'): 'relval_identity':'id-', 'relval_machine': 'mach-', 'relval_premix': 'premix-', - 'relval_nano':'nano-' + 'relval_nano':'nano-', + 'relval_data_highstats':'data-' } self.files = ['relval_standard' , @@ -73,7 +74,8 @@ def reset(self, what='all'): 'relval_identity', 'relval_machine', 'relval_premix', - 'relval_nano' + 'relval_nano', + 'relval_data_highstats' ] self.filesDefault = {'relval_standard':True , 'relval_highstats':True , @@ -90,7 +92,8 @@ def reset(self, what='all'): 'relval_identity':False, 'relval_machine':True, 'relval_premix':True, - 'relval_nano':True + 'relval_nano':True, + 'relval_data_highstats':False } self.relvalModule = None diff --git a/Configuration/PyReleaseValidation/python/MatrixUtil.py b/Configuration/PyReleaseValidation/python/MatrixUtil.py index 1988efd672466..d088cafc44b13 100644 --- a/Configuration/PyReleaseValidation/python/MatrixUtil.py +++ b/Configuration/PyReleaseValidation/python/MatrixUtil.py @@ -103,7 +103,7 @@ def selectedLS(list_runs=[],maxNum=-1,l_json=data_json2015): InputInfoNDefault=2000000 class InputInfo(object): - def __init__(self,dataSet,dataSetParent='',label='',run=[],ls={},files=1000,events=InputInfoNDefault,split=10,location='CAF',ib_blacklist=None,ib_block=None) : + def __init__(self,dataSet,dataSetParent='',label='',run=[],ls={},files=1000,events=InputInfoNDefault,split=10,location='CAF',ib_blacklist=None,ib_block=None,skimEvents=False) : self.run = run self.ls = ls self.files = files @@ -115,29 +115,39 @@ def __init__(self,dataSet,dataSetParent='',label='',run=[],ls={},files=1000,even self.ib_blacklist = ib_blacklist self.ib_block = ib_block self.dataSetParent = dataSetParent - + self.skimEvents = skimEvents + def das(self, das_options, dataset): - if len(self.run) != 0 or self.ls: + if not self.skimEvents and (len(self.run) != 0 or self.ls): queries = self.queries(dataset) if len(self.run) != 0: - command = ";".join(["dasgoclient %s --query '%s'" % (das_options, query) for query in queries]) + command = ";".join(["dasgoclient %s --query '%s'" % (das_options, query) for query in queries]) else: lumis = self.lumis() commands = [] while queries: - commands.append("dasgoclient %s --query 'lumi,%s' --format json | das-selected-lumis.py %s " % (das_options, queries.pop(), lumis.pop())) + commands.append("dasgoclient %s --query 'lumi,%s' --format json | das-selected-lumis.py %s " % (das_options, queries.pop(), lumis.pop())) command = ";".join(commands) command = "({0})".format(command) - else: + elif not self.skimEvents: command = "dasgoclient %s --query '%s'" % (das_options, self.queries(dataset)[0]) - + elif self.skimEvents: + from os import getenv + if getenv("JENKINS_PREFIX") is not None: + # to be assured that whatever happens the files are only those at CERN + command = "das-up-to-nevents.py -d %s -e %d -pc"%(dataset,self.events) + else: + command = "das-up-to-nevents.py -d %s -e %d"%(dataset,self.events) # Run filter on DAS output if self.ib_blacklist: command += " | grep -E -v " command += " ".join(["-e '{0}'".format(pattern) for pattern in self.ib_blacklist]) - from os import getenv - if getenv("CMSSW_USE_IBEOS","false")=="true": return command + " | ibeos-lfn-sort" - return command + " | sort -u" + if not self.skimEvents: ## keep run-lumi sorting + from os import getenv + if getenv("CMSSW_USE_IBEOS","false")=="true": return command + " | ibeos-lfn-sort" + return command + " | sort -u" + else: + return command def lumiRanges(self): if len(self.run) != 0: @@ -145,7 +155,7 @@ def lumiRanges(self): if self.ls : return "echo '{\n"+",".join(('"%d" : %s\n'%( int(x),self.ls[x]) for x in self.ls.keys()))+"}'" return None - + def lumis(self): query_lumis = [] if self.ls: @@ -266,4 +276,8 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''): c['cfg']=fragment return c - +def check_dups(input): + seen = set() + dups = set(x for x in input if x in seen or seen.add(x)) + + return dups diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index 63c99bfd1922a..e3b7ce2031139 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -15,15 +15,8 @@ #2026 WFs to run in IB (TTbar) numWFIB = [] -numWFIB.extend([20034.0]) #2026D86 -numWFIB.extend([20834.0]) #2026D88 -numWFIB.extend([22034.0]) #2026D91 -numWFIB.extend([22434.0]) #2026D92 -numWFIB.extend([22834.0]) #2026D93 -numWFIB.extend([23234.0]) #2026D94 numWFIB.extend([23634.0]) #2026D95 numWFIB.extend([24034.0]) #2026D96 -numWFIB.extend([24434.0]) #2026D97 numWFIB.extend([24834.0]) #2026D98 numWFIB.extend([25234.0]) #2026D99 numWFIB.extend([25634.0]) #2026D100 @@ -43,6 +36,9 @@ numWFIB.extend([31234.0]) #2026D114 numWFIB.extend([32034.0]) #2026D115 +# Temporary placement for LST workflow to workaround PR conflicts - to be formatted and placed in an upcoming PR +numWFIB.extend([24834.703,24834.704]) #2026D98 LST tracking (initialStep+HighPtTripletStep only): CPU, GPU + #Additional sample for short matrix and IB #Default Phase-2 Det NoPU numWFIB.extend([prefixDet+34.911]) #DD4hep XML @@ -55,6 +51,8 @@ numWFIB.extend([prefixDet+96.0]) #CloseByPGun CE_E_Front_120um numWFIB.extend([prefixDet+100.0]) #CloseByPGun CE_H_Coarse_Scint numWFIB.extend([prefixDet+61.0]) #Nu Gun +numWFIB.extend([prefixDet+34.75]) #Timing menu +#numWFIB.extend([prefixDet+151.85]) #Heavy ion reconstruction #Default Phase-2 Det PU numWFIB.extend([prefixDet+261.97]) #premixing stage1 (NuGun+PU) numWFIB.extend([prefixDet+234.99]) #premixing combined stage1+stage2 ttbar+PU200 diff --git a/Configuration/PyReleaseValidation/python/relval_data_highstats.py b/Configuration/PyReleaseValidation/python/relval_data_highstats.py new file mode 100644 index 0000000000000..13d682b79767f --- /dev/null +++ b/Configuration/PyReleaseValidation/python/relval_data_highstats.py @@ -0,0 +1,74 @@ +# import the definition of the steps and input files: +from Configuration.PyReleaseValidation.relval_steps import * + +# here only define the workflows as a combination of the steps defined above: +workflows = Matrix() + +## Here we define higher (>50k events) stats data workflows +## not to be run as default. 150k, 250k, 500k or 1M events each + +offset_era = 0.1 # less than 10 eras per year +offset_pd = 0.001 # less than 100 pds per year +offset_events = 0.0001 # less than 10 event setups (50k,150k,250k,500k) + +## 2024 +base_wf_number_2024 = 2024.0 +for e_n,era in enumerate(eras_2024): + for p_n,pd in enumerate(pds_2024): + for e_key,evs in event_steps_dict.items(): + if "10k" == e_key: # already defined in relval_standard + continue + wf_number = base_wf_number_2024 + wf_number = wf_number + offset_era * e_n + wf_number = wf_number + offset_pd * p_n + wf_number = wf_number + offset_events * evs + wf_number = round(wf_number,6) + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + workflows[wf_number] = ['',[step_name,'HLTDR3_2024','AODNANORUN3_reHLT_2024','HARVESTRUN3_2024']] + +## 2023 +base_wf_number_2023 = 2023.0 +for e_n,era in enumerate(eras_2023): + for p_n,pd in enumerate(pds_2023): + for e_key,evs in event_steps_dict.items(): + if "10k" == e_key: # already defined in relval_standard + continue + wf_number = base_wf_number_2023 + wf_number = wf_number + offset_era * e_n + wf_number = wf_number + offset_pd * p_n + wf_number = wf_number + offset_events * evs + wf_number = round(wf_number,6) + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + workflows[wf_number] = ['',[step_name,'HLTDR3_2023','AODNANORUN3_reHLT_2023','HARVESTRUN3_2023']] + + +## 2022 +base_wf_number_2022 = 2022.0 +for e_n,era in enumerate(eras_2022_1): + for p_n,pd in enumerate(pds_2022_1): + for e_key,evs in event_steps_dict.items(): + if "10k" == e_key: # already defined in relval_standard + continue + wf_number = base_wf_number_2022 + wf_number = wf_number + offset_era * e_n + wf_number = wf_number + offset_pd * p_n + wf_number = wf_number + offset_events * evs + wf_number = round(wf_number,6) + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + workflows[wf_number] = ['',[step_name,'HLTDR3_2022','AODNANORUN3_reHLT_2022','HARVESTRUN3_2022']] + +for e_n,era in enumerate(eras_2022_2): + for p_n,pd in enumerate(pds_2022_2): + for e_key,evs in event_steps_dict.items(): + if "10k" == e_key: # already defined in relval_standard + continue + wf_number = base_wf_number_2022 + wf_number = wf_number + offset_era * (e_n + len(eras_2022_1)) + wf_number = wf_number + offset_pd * (p_n + len(pds_2022_1)) + wf_number = wf_number + offset_events * evs + wf_number = round(wf_number,6) + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + workflows[wf_number] = ['',[step_name,'HLTDR3_2022','AODNANORUN3_reHLT_2022','HARVESTRUN3_2022']] + + + diff --git a/Configuration/PyReleaseValidation/python/relval_gpu.py b/Configuration/PyReleaseValidation/python/relval_gpu.py index 2548bc7008394..b770900fc1332 100644 --- a/Configuration/PyReleaseValidation/python/relval_gpu.py +++ b/Configuration/PyReleaseValidation/python/relval_gpu.py @@ -13,70 +13,68 @@ # mc WFs to run in IB: -# mc 2023 Alpaka pixel-only quadruplets: TTbar: any backend, any backend vs cpu validation, profiling +# mc 2023 #FIXME to be removed as soon as cms-bot is updated +# no PU Alpaka pixel-only TTbar: quadruplets any backend and profiling; ECAL-only any backend; HCAL-only any backend and profiling +# mc 2024 +# no PU +# Alpaka pixel-only quadruplets: TTbar: any backend, any backend vs cpu validation, profiling +# Alpaka pixel-only triplets: TTbar: any backend, any backend vs cpu validation, profiling # Alpaka ECAL-only: TTbar: any backend # Alpaka HCAL-only: TTbar: any backend, any backend vs cpu validation, profiling -# Alpaka with full reco and pixel-only quadruplets: TTbar: any backend +# Alpaka with full reco and pixel-only: TTbar: any backend quadruplets, any backend triplets # Alpaka pixel-only quadruplets: ZMM: any backend, any backend vs cpu validation, profiling +# Alpaka pixel-only triplets: ZMM: any backend, any backend vs cpu validation, profiling # Alpaka pixel-only quadruplets: Single Nu E10: any backend -# Patatrack pixel-only quadruplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only triplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack ECAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack HCAL-only: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling -# Patatrack pixel-only quadruplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation -# Patatrack pixel-only triplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation -# full reco with Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation -# full reco with Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation -# Patatrack pixel-only quadruplets: Single Nu E10 on GPU (optional) +# with PU # Alpaka pixel-only quadruplets: TTbar with PU: any backend, any backend vs cpu validation, profiling +# Alpaka pixel-only triplets: TTbar with PU: any backend, any backend vs cpu validation, profiling # Alpaka ECAL-only: TTbar with PU: any backend # Alpaka HCAL-only: TTbar with PU: any backend, any backend vs cpu validation, profiling -# Alpaka with full reco and pixel-only quadruplets: TTbar with PU: any backend +# Alpaka with full reco and pixel-only: TTbar with PU: any backend quadruplets, any backend triplets # Alpaka pixel-only quadruplets: ZMM with PU: any backend, any backend vs cpu validation, profiling +# Alpaka pixel-only triplets: ZMM with PU: any backend, any backend vs cpu validation, profiling # Alpaka pixel-only quadruplets: Single Nu E10 with PU: any backend -# mc 2026 Patatrack pixel-only quadruplets: Single Nu E10: on GPU (optional) +# mc 2026 +# no PU +# Alpaka pixel-only: TTbar: quadruplets any backend, any backend vs cpu validation, profiling, triplets +# Alpaka pixel-only: Single Nu E10: any backend +# with PU +# Alpaka pixel-only: TTbar with PU: quadruplets any backend, any backend vs cpu validation, profiling + numWFIB = [ - # 2023, Alpaka-based - 12434.402, 12434.403, 12434.404, - #12434.406, 12434.407, 12434.408, - 12434.412,#12434.413, 12434.414, - 12434.422, 12434.423, 12434.424, - #12434.482, 12434.483, 12434.484 - #12434.486, 12434.487, 12434.488 - 12434.492,#12434.493 - 12450.402, 12450.403, 12450.404, - #12450.406, 12450.407, 12450.408, - 12461.402, - - # 2023, CUDA-based - 12450.502, 12450.503, 12450.504, - 12450.506, 12450.507, 12450.508, - 12434.502, 12434.503, 12434.504, - 12434.506, 12434.507, 12434.508, - 12434.512, 12434.513, 12434.514, - 12434.522, 12434.523, 12434.524, - 12434.582, 12434.583,#12434.584, - 12434.586, 12434.587,#12434.588, - 12434.592, 12434.593, - 12434.596, 12434.597, - 12461.502, - - # 2023 with PU, Alpaka-based - 12634.402, 12634.403, 12634.404, - #12634.406, 12634.407, 12634.408 - 12634.412,#12634.413, 12634.414 - 12634.422, 12634.423, 12634.424, - #12634.482, 12634.483, 12634.484 - #12634.486, 12634.487, 12634.488 - 12634.492,#12634.493 - 12650.402, 12650.403, 12650.404, - #12650.406, 12650.407, 12650.408 - 12661.402, - - # 2026, CUDA-based - 24861.502 + # 2023, Alpaka-based noPU + 12434.402,12434.403,12434.412,12434.422,12434.423, + + # 2024, Alpaka-based noPU + 12834.402, 12834.403, 12834.404, + 12834.406, 12834.407, 12834.408, + 12834.412,#12834.413, 12834.414, + 12834.422, 12834.423, 12834.424, + #12834.482, 12834.483, 12834.484 + #12834.486, 12834.487, 12834.488 + 12834.492, 12834.493, + 12850.402, 12850.403, 12850.404, + 12450.406, 12450.407, 12450.408, + 12861.402, + + # 2024 with PU, Alpaka-based + 13034.402, 13034.403, 13034.404, + 13034.406, 13034.407, 13034.408, + 13034.412, #13034.413, 13034.414 + 13034.422, 13034.423, 13034.424, + #13034.482, 13034.483, 13034.484 + #13034.486, 13034.487, 13034.488 + 13034.492, 13034.493, + 13050.402, 13050.403, 13050.404, + 13050.406, 13050.407, 13050.408, + 13061.402, + + # 2026, Alpaka-based noPU + 29634.402, 29634.403, 29634.404, 29634.406, + 29661.402, + + # 2026, Alpaka-based PU + 29834.402, 29834.403, 29834.404 ] for numWF in numWFIB: diff --git a/Configuration/PyReleaseValidation/python/relval_highstats.py b/Configuration/PyReleaseValidation/python/relval_highstats.py index c74abc4e8a5d9..5808f63f0ebaa 100644 --- a/Configuration/PyReleaseValidation/python/relval_highstats.py +++ b/Configuration/PyReleaseValidation/python/relval_highstats.py @@ -86,6 +86,3 @@ workflows[134.99601] = ['',['RunJetHT2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT_HIPM','HARVESTDR2']] workflows[134.99602] = ['',['RunZeroBias2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT_HIPM','HARVESTDR2']] workflows[134.99603] = ['',['RunSingleMu2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT_HIPM','HARVESTDR2']] - - - diff --git a/Configuration/PyReleaseValidation/python/relval_nano.py b/Configuration/PyReleaseValidation/python/relval_nano.py index 2d3b0ce3dcef6..2a263de0607a0 100644 --- a/Configuration/PyReleaseValidation/python/relval_nano.py +++ b/Configuration/PyReleaseValidation/python/relval_nano.py @@ -345,7 +345,7 @@ def subnext(self): workflows[_wfn()] = ['jmeNANOdata140Xrun3', ['MuonEG2024MINIAOD14.0', 'jmeNANO_data14.0']] workflows[_wfn()] = ['jmeNANOrePuppidata140Xrun3', ['MuonEG2024MINIAOD14.0', 'jmeNANO_rePuppi_data14.0']] workflows[_wfn()] = ['lepTrackInfoNANOdata140Xrun3', ['MuonEG2024MINIAOD14.0', 'lepTrackInfoNANO_data14.0']] -# workflows[_wfn()] = ['ScoutingNANOdata140Xrun3', ['ScoutingPFRun32024RAW14.0', 'scoutingNANO_data14.0']] +workflows[_wfn()] = ['ScoutingNANOdata140Xrun3', ['ScoutingPFRun32024RAW14.0', 'scoutingNANO_data14.0']] # DPG custom NANOs, data _wfn.subnext() diff --git a/Configuration/PyReleaseValidation/python/relval_pileup.py b/Configuration/PyReleaseValidation/python/relval_pileup.py index 0902dd8b26f10..471521c3831f3 100644 --- a/Configuration/PyReleaseValidation/python/relval_pileup.py +++ b/Configuration/PyReleaseValidation/python/relval_pileup.py @@ -26,6 +26,9 @@ workflows[320]=['Pyquen_GammaJet_pt20_5362GeV_2023',['Pyquen_GammaJet_pt20_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']] workflows[321]=['Pyquen_DiJet_pt80to120_5362GeV_2023',['Pyquen_DiJet_pt80to120_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']] workflows[322]=['Pyquen_ZeemumuJets_pt10_5362GeV_2023',['Pyquen_ZeemumuJets_pt10_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']] +workflows[330]=['Pyquen_GammaJet_pt20_5362GeV_2024',['Pyquen_GammaJet_pt20_5362GeV_2024','DIGIHI2024MIX','RECOHI2024MIX','HARVESTHI2024']] +workflows[331]=['Pyquen_DiJet_pt80to120_5362GeV_2024',['Pyquen_DiJet_pt80to120_5362GeV_2024','DIGIHI2024MIX','RECOHI2024MIX','HARVESTHI2024']] +workflows[332]=['Pyquen_ZeemumuJets_pt10_5362GeV_2024',['Pyquen_ZeemumuJets_pt10_5362GeV_2024','DIGIHI2024MIX','RECOHI2024MIX','HARVESTHI2024']] # 50 ns at 13 TeV and POSTLS1 workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50_L1TEgDQM','HARVESTUP15_PU50_L1TEgDQM']] diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 3ca6cd4e44bce..4e8b620465a91 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -415,6 +415,7 @@ workflows[136.903] = ['', ['RunDoubleMuon2017B', 'TauEmbedding_Selection_2017', 'TauEmbedding_Cleaning_2017', 'TauEmbedding_GenPreHLT_2017', 'TauEmbedding_GenHLT_2017', 'TauEmbedding_GenPostHLT_2017', 'TauEmbedding_Merging_2017']] workflows[136.904] = ['', ['RunDoubleMuon2018C', 'TauEmbedding_Selection_2018', 'TauEmbedding_Cleaning_2018', 'TauEmbedding_GenPreHLT_2018', 'TauEmbedding_GenHLT_2018', 'TauEmbedding_GenPostHLT_2018', 'TauEmbedding_Merging_2018']] + ### run 2021 collisions ### workflows[139.001] = ['RunMinimumBias2021',['RunMinimumBias2021','HLTDR3_2022','RECODR3_reHLT_MinBiasOffline','HARVESTD2021MB_reHLT']] workflows[139.002] = ['',['RunZeroBias2021','HLTDR3_2022','RECODR3_reHLT_ZBOffline','HARVESTD2021ZB_reHLT']] @@ -558,6 +559,51 @@ workflows[142.901] = ['',['RunUPC2023','RECODR3_2024_UPC','HARVESTDPROMPTR3']] workflows[142.902] = ['',['RunUPC2023','RECODR3_2024_HIN','HARVESTDPROMPTR3']] +################################################################## +### Golden Data Wfs +# for a limited set of eras and PDs not to overflow the IB matrices +# the full set in relval_data_highstats.py + +offset_era = 0.1 # less than 10 eras per year +offset_pd = 0.001 # less than 100 pds per year + +# 2024 +base_wf_number_2024 = 2024.0 +for e_n,era in enumerate(['Run2024D','Run2024C']): + for p_n,pd in enumerate(['JetMET0','ZeroBias']): + wf_number = base_wf_number_2024 + wf_number = wf_number + offset_era * e_n + wf_number = wf_number + offset_pd * p_n + wf_number = wf_number + 0.0001 * 0.01 + wf_number = round(wf_number,6) + step_name = "Run" + pd + era.split("Run")[1] + "_10k" + workflows[wf_number] = ['',[step_name,'HLTDR3_2024','AODNANORUN3_reHLT_2024','HARVESTRUN3_2024']] + +# 2023 +base_wf_number_2023 = 2023.0 +for e_n,era in enumerate(['Run2023C', 'Run2023D']): + for p_n,pd in enumerate(['MuonEG','DisplacedJet']): + wf_number = base_wf_number_2023 + wf_number = wf_number + offset_era * e_n + wf_number = wf_number + offset_pd * p_n + wf_number = wf_number + 0.0001 * 0.01 + wf_number = round(wf_number,6) + step_name = "Run" + pd + era.split("Run")[1] + "_10k" + workflows[wf_number] = ['',[step_name,'HLTDR3_2023','AODNANORUN3_reHLT_2023','HARVESTRUN3_2023']] + +# 2022 +base_wf_number_2022 = 2022.0 +for e_n,era in enumerate(['Run2022B', 'Run2022C']): + for p_n,pd in enumerate(['JetHT','EGamma']): + wf_number = base_wf_number_2022 + wf_number = wf_number + offset_era * e_n + wf_number = wf_number + offset_pd * p_n + wf_number = wf_number + 0.0001 * 0.01 + wf_number = round(wf_number,6) + step_name = "Run" + pd + era.split("Run")[1] + "_10k" + workflows[wf_number] = ['',[step_name,'HLTDR3_2022','AODNANORUN3_reHLT_2022','HARVESTRUN3_2022']] +################################################################## + ### fastsim ### workflows[5.1] = ['TTbarFS', ['TTbarFS','HARVESTFS']] workflows[5.2] = ['SingleMuPt10FS', ['SingleMuPt10FS','HARVESTFS']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index bea88e21c1a36..0f4242127c1ee 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -36,14 +36,18 @@ step1Up2018HiProdDefaults = merge ([{'--eventcontent':'RAWSIM'},step1Up2018HiDefaults]) # step1 gensim: for 2022 HI prod step1Up2022HiProdDefaults = merge ([{'--conditions':'auto:phase1_2022_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Realistic2022PbPbCollision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) -step1Up2023HiProdDefaults = merge ([{'--conditions':'auto:phase1_2023_realistic_hi','--era':'Run3_pp_on_PbPb_2023','--beamspot':'Realistic2023PbPbCollision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) +step1Up2023HiProdDefaults = merge ([{'--conditions':'auto:phase1_2023_realistic_hi','--era':'Run3_pp_on_PbPb_2023','--beamspot':'DBrealistic','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) # step1 gensim: for 2024 -step1Up2024Defaults = merge ([{'--conditions':'auto:phase1_2024_realistic','--era':'Run3','--beamspot':'Realistic25ns13p6TeVEarly2023Collision'},step1Up2018Defaults]) +step1Up2024Defaults = merge ([{'--conditions':'auto:phase1_2024_realistic','--era':'Run3','--beamspot':'DBrealistic'},step1Up2018Defaults]) # step1 gensim: for 2024 HI prod -step1Up2024HiProdDefaults = merge ([{'--conditions':'auto:phase1_2024_realistic_hi','--era':'Run3_pp_on_PbPb_2024','--beamspot':'Realistic2023PbPbCollision'},step1Up2023HiProdDefaults]) +step1Up2024HiProdDefaults = merge ([{'--conditions':'auto:phase1_2024_realistic_hi','--era':'Run3_pp_on_PbPb_2024','--beamspot':'DBrealistic'},step1Up2023HiProdDefaults]) steps = Steps() +#### Event to runs +event_steps = [0.01,0.05,0.15,0.25,0.5,1] #in millions +event_steps_k = ["10k","50k","150k","250k","500k","1M"] +event_steps_dict = dict(zip(event_steps_k,event_steps)) #### Production test section #### steps['ProdMinBias']=merge([{'cfg':'MinBias_8TeV_pythia8_TuneCUETP8M1_cff','--relval':'9000,300'},step1Defaults]) steps['ProdTTbar']=merge([{'cfg':'TTbar_8TeV_TuneCUETP8M1_cfi','--relval':'9000,100'},step1Defaults]) @@ -478,7 +482,13 @@ # UL AOD steps['RunJetHT2018D_reminiaodUL']={'INPUT':InputInfo(dataSet='/JetHT/Run2018D-12Nov2019_UL2018-v4/AOD',label='2018DrmaodUL',events=100000,location='STD', ls=Run2018D)} -#### run3 #### +#################################### +#### Run3 ########################## +#################################### + +###2022 + +## Collisions at 900 GeV and ramp-up to 13.6 TeV Run2022A={353015: [[1, 100]]} steps['RunMinimumBias2022A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2022A-v1/RAW',label='2022A',events=100000,location='STD', ls=Run2022A)} steps['RunSingleMuon2022A']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2022A-v1/RAW',label='2022A',events=100000,location='STD', ls=Run2022A)} @@ -497,7 +507,7 @@ steps['RunDoubleMuon2022A']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2022A-v1/RAW',label='2022A',events=100000,location='STD', ls=Run2022A)} steps['RunMuonEG2022A']={'INPUT':InputInfo(dataSet='/MuonEG/Run2022A-v1/RAW',label='2022A',events=100000,location='STD', ls=Run2022A)} -Run2022B={355769: [[1, 106]]} +Run2022B={355769: [[1, 106]]} ## this could be rised to "355769": [[1, 541]] steps['RunMinimumBias2022B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} steps['RunSingleMuon2022B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} steps['RunZeroBias2022B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} @@ -514,7 +524,6 @@ steps['RunTau2022B']={'INPUT':InputInfo(dataSet='/Tau/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} steps['RunDoubleMuon2022B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} steps['RunMuonEG2022B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} -#steps['RunParkingBPH2022B']={'INPUT':InputInfo(dataSet='/ParkingBPH/Run2022B-v1/RAW',label='2022B',events=100000,location='STD', ls=Run2022B)} Run2022C={356381: [[1, 1193]]} Run2022C_LS40={356381: [[1, 40]]} @@ -576,7 +585,7 @@ # reMINIAOD for 2022 steps['RunJetMET2022D_reMINI']={'INPUT':InputInfo(dataSet='/JetMET/Run2022D-16Jun2023-v1/AOD',label='rmaod',events=100000,location='STD', ls=Run2022D_LS25)} -#### run3 #### +###2023 Run2023B={366727: [[1, 244]]} steps['RunMuon2023B']={'INPUT':InputInfo(dataSet='/Muon0/Run2023B-v1/RAW',label='2023B',events=100000,location='STD', ls=Run2023B)} steps['RunZeroBias2023B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2023B-v1/RAW',label='2023B',events=100000,location='STD', ls=Run2023B)} @@ -625,6 +634,62 @@ RunHI2023={375491: [[100, 100]]} steps['RunHIPhysicsRawPrime2023A']={'INPUT':InputInfo(dataSet='/HIPhysicsRawPrime0/HIRun2023A-v1/RAW',label='HI2023A',events=100000,location='STD', ls=RunHI2023)} +################################################################## +### Golden Data Steps +# Reading good runs directly from the latest golden json +# in https://cms-service-dqmdc.web.cern.ch/CAF/certification/ +# or (if available) from eos. the number of events limits +# the files used as input + +###2024 + +pds_2024 = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleMuonLowMass0', 'ParkingHH', 'ParkingLLP', 'ParkingSingleMuon0', 'ParkingVBF0', 'Tau', 'ZeroBias'] +eras_2024 = ['Run2024B', 'Run2024C', 'Run2024D', 'Run2024E', 'Run2024F'] +for era in eras_2024: + for pd in pds_2024: + dataset = "/" + pd + "/" + era + "-v1/RAW" + for e_key,evs in event_steps_dict.items(): + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + steps[step_name] = {'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=int(evs*1e6), skimEvents=True, location='STD')} + +###2023 + +pds_2023 = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleElectronLowMass', 'ParkingDoubleMuonLowMass0', 'Tau', 'ZeroBias'] +eras_2023 = ['Run2023B', 'Run2023C', 'Run2023D'] +# 'MinimumBias' is excluded since apprently no Golden run for /MinimumBias/Run2023{B,C,D}-v1/RAW +for era in eras_2023: + for pd in pds_2023: + dataset = "/" + pd + "/" + era + "-v1/RAW" + for e_key,evs in event_steps_dict.items(): + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + steps[step_name] = {'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=int(evs*1e6), skimEvents=True, location='STD')} + +###2022 + +pds_2022_1 = ['BTagMu', 'DisplacedJet', 'DoubleMuon', 'SingleMuon', 'EGamma', 'HcalNZS', 'JetHT', 'MET', 'MinimumBias', 'MuonEG', 'NoBPTX', 'Tau', 'ZeroBias'] +eras_2022_1 = ['Run2022B', 'Run2022C'] +for era in eras_2022_1: + for pd in pds_2022_1: + dataset = "/" + pd + "/" + era + "-v1/RAW" + for e_key,evs in event_steps_dict.items(): + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + steps[step_name] = {'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=int(evs*1e6), skimEvents=True, location='STD')} + +# PD names changed during the year (!) +pds_2022_2 = ['BTagMu', 'DisplacedJet', 'Muon', 'EGamma', 'HcalNZS', 'JetMET', 'MuonEG', 'NoBPTX', 'Tau', 'ZeroBias'] +# Note: 'MinimumBias' is excluded since apprently no Golden run for /MinimumBias/Run2022{D,E}-v1/RAW +eras_2022_2 = ['Run2022D', 'Run2022E'] + +for era in eras_2022_2: + for pd in pds_2022_2: + dataset = "/" + pd + "/" + era + "-v1/RAW" + for e_key,evs in event_steps_dict.items(): + step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + steps[step_name] = {'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=int(evs*1e6), skimEvents=True, location='STD')} + + +################################################################## + # Highstat HLTPhysics Run2015DHS=selectedLS([258712,258713,258714,258741,258742,258745,258749,258750,259626,259637,259683,259685,259686,259721,259809,259810,259818,259820,259821,259822,259862,259890,259891]) steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='2015DHS',events=100000,location='STD', ls=Run2015DHS)} @@ -895,7 +960,8 @@ def identitySim(wf): 'CMSSW_12_5_1-125X_mcRun3_2022_realistic_HI_v5-v1', #23 - 2022 HI GEN-SIM for mixing 'CMSSW_11_2_0_pre8-PU_112X_upgrade2018_realistic_v4-v1', # 24 - 2018 Run-Dependent premix library 'CMSSW_13_2_0_pre1-131X_mcRun3_2023_realistic_HI_v11-v1', # 2023 HI GEN-SIM for mixing - ] + 'CMSSW_14_1_0_pre7-141X_mcRun3_2024_realistic_HI_v4_STD_Run3_HIN_MinBias_2024-v1', # 2024 HI GEN-SIM for mixing +] # note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available steps['MinBiasINPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} #was [0] @@ -1847,6 +1913,7 @@ def lhegensim2018ml(fragment,howMuch): PUHI={'-n':10,'--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2018/%s/GEN-SIM'%(baseDataSetRelease[9])} PUHI2022={'-n':10,'--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2021_ppReco/%s/GEN-SIM'%(baseDataSetRelease[23])} PUHI2023={'-n':10,'--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[25])} +PUHI2024={'-n':10,'--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2024/%s/GEN-SIM'%(baseDataSetRelease[26])} PU25UP17={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[13],)} PU25UP18={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[18],)} @@ -1982,6 +2049,7 @@ def lhegensim2018ml(fragment,howMuch): steps['DIGIHI2022PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2022_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults]) steps['DIGIHI2018PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2018_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults]) steps['DIGIHI2017']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2017, step2Upg2015Defaults]) +steps['DIGIHI2024MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2024, {'--pileup':'HiMix'}, PUHI2024, step2Upg2015Defaults]) steps['DIGIHI2023MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2023_ppReco, {'--pileup':'HiMix'}, PUHI2023, step2Upg2015Defaults]) steps['DIGIHI2022MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2022_ppReco, {'--pileup':'HiMix'}, PUHI2022, step2Upg2015Defaults]) steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2018_ppReco, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults]) @@ -2166,6 +2234,8 @@ def lhegensim2018ml(fragment,howMuch): steps['HLTDR3_2023B']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2024,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3'},steps['HLTD'] ] ) +steps['HLTDR3_2024']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2024,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3_2024'},steps['HLTD'] ] ) + steps['HLTDR3_HI2023ARawprime']=merge([{'-s':'L1REPACK:Full,HLT:HIon'}, {'--conditions':'auto:run3_hlt_HIon'}, {'--era' : 'Run3_pp_on_PbPb_approxSiStripClusters_2023'}, @@ -2696,10 +2766,11 @@ def lhegensim2018ml(fragment,howMuch): steps['RECODR3_2023']=merge([{'--era':'Run3_2023'},steps['RECODR3']]) steps['RECODR3_2024']=merge([{'--era':'Run3_2024'},steps['RECODR3']]) - + steps['RECODR3_reHLT_2022']=merge([{'--conditions':'auto:run3_data_relval', '--hltProcess':'reHLT'},steps['RECODR3']]) steps['RECODR3_reHLT_2023']=merge([{'--conditions':'auto:run3_data_prompt_relval', '--hltProcess':'reHLT'},steps['RECODR3_2023']]) steps['RECODR3_reHLT_2023B']=merge([{'--conditions':'auto:run3_data_prompt_relval', '--hltProcess':'reHLT'},steps['RECODR3']]) +steps['RECODR3_reHLT_2024']=merge([{'--conditions':'auto:run3_data_prompt_relval', '--hltProcess':'reHLT'},steps['RECODR3']]) steps['RECODR3_2023_HIN']=merge([{'--conditions':'auto:run3_data_prompt', '-s':'RAW2DIGI,L1Reco,RECO,DQM:@commonFakeHLT+@standardDQMFakeHLT', '--repacked':'', '-n':1000},steps['RECODR3_2023']]) steps['RECODR3_2023_UPC']=merge([{'--era':'Run3_2023_UPC'},steps['RECODR3_2023_HIN']]) @@ -2748,6 +2819,11 @@ def gen2023HiMix(fragment,howMuch): global step1Up2023HiMixDefaults return merge([{'cfg':fragment},howMuch,step1Up2023HiMixDefaults]) +step1Up2024HiMixDefaults = merge ([{'--beamspot':'MatchHI', '--pileup':'HiMixGEN', '--scenario':'HeavyIons'},hiDefaults2024,PUHI2024,step1Up2024HiProdDefaults]) +def gen2024HiMix(fragment,howMuch): + global step1Up2024HiMixDefaults + return merge([{'cfg':fragment},howMuch,step1Up2024HiMixDefaults]) + steps['Pyquen_GammaJet_pt20_2760GeV']=gen2018HiMix('Pyquen_GammaJet_pt20_2760GeV_cfi',Kby(9,100)) steps['Pyquen_DiJet_pt80to120_2760GeV']=gen2018HiMix('Pyquen_DiJet_pt80to120_2760GeV_cfi',Kby(9,100)) steps['Pyquen_ZeemumuJets_pt10_2760GeV']=gen2018HiMix('Pyquen_ZeemumuJets_pt10_2760GeV_cfi',Kby(9,100)) @@ -2757,6 +2833,9 @@ def gen2023HiMix(fragment,howMuch): steps['Pyquen_GammaJet_pt20_5362GeV_2023']=gen2023HiMix('Pyquen_GammaJet_pt20_5362GeV_cfi',Kby(9,100)) steps['Pyquen_DiJet_pt80to120_5362GeV_2023']=gen2023HiMix('Pyquen_DiJet_pt80to120_5362GeV_cfi',Kby(9,100)) steps['Pyquen_ZeemumuJets_pt10_5362GeV_2023']=gen2023HiMix('Pyquen_ZeemumuJets_pt10_5362GeV_cfi',Kby(9,100)) +steps['Pyquen_GammaJet_pt20_5362GeV_2024']=gen2024HiMix('Pyquen_GammaJet_pt20_5362GeV_cfi',Kby(9,100)) +steps['Pyquen_DiJet_pt80to120_5362GeV_2024']=gen2024HiMix('Pyquen_DiJet_pt80to120_5362GeV_cfi',Kby(9,100)) +steps['Pyquen_ZeemumuJets_pt10_5362GeV_2024']=gen2024HiMix('Pyquen_ZeemumuJets_pt10_5362GeV_cfi',Kby(9,100)) # step3 step3Defaults = { @@ -3058,6 +3137,8 @@ def gen2023HiMix(fragment,howMuch): steps['RECOHIRUN3_reHLT_2023']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,DQM:@standardDQM','--datatier':'RECO,MINIAOD,DQMIO','--eventcontent':'RECO,MINIAOD,DQM','--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023','--conditions':'auto:run3_data_HIon'},steps['RECODR3_reHLT_2023']]) +steps['AODNANORUN3_reHLT_2024']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM','--datatier':'AOD,MINIAOD,NANOAOD,DQMIO','--eventcontent':'AOD,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT_2024']]) + # patatrack validation in data steps['RecoData_Patatrack_AllGPU_Validation_2023'] = merge([{'-s':'RAW2DIGI:RawToDigi_pixelOnly+RawToDigi_ecalOnly+RawToDigi_hcalOnly,RECO:reconstruction_pixelTrackingOnly+reconstruction_ecalOnly+reconstruction_hcalOnly,DQM:@pixelTrackingOnlyDQM+@ecalOnly+@hcalOnly+@hcal2Only', '--conditions':'auto:run3_data_prompt', @@ -3314,6 +3395,11 @@ def gen2023HiMix(fragment,howMuch): '--procModifiers':'genJetSubEvent', },step3Up2015Defaults]) +steps['RECOHI2024MIX']=merge([hiDefaults2024,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', + '--pileup':'HiMix', + '--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2024/%s/GEN-SIM'%(baseDataSetRelease[26]) + },step3Up2015Defaults]) + steps['RECOHI2023MIX']=merge([hiDefaults2023_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--pileup':'HiMix', '--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[25]) @@ -3788,6 +3874,7 @@ def gen2023HiMix(fragment,howMuch): steps['HARVESTRUN3_COS_2022']=merge([{'--data':'', '--scenario':'cosmics', '--era':'Run3', '-s':'HARVESTING:dqmHarvesting'},steps['HARVESTDRUN3']]) steps['HARVESTRUN3_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']]) steps['HARVESTRUN3_2023B']=merge([{'--era':'Run3', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']]) +steps['HARVESTRUN3_2024']=merge([{'--era':'Run3', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']]) steps['HARVESTRUN3_HI2023A']=merge([{'--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023', '-s':'HARVESTING:@standardDQM+@miniAODDQM'},steps['HARVESTRUN3_2022']]) @@ -4363,6 +4450,9 @@ def gen2023HiMix(fragment,howMuch): } if beamspot is not None: upgradeStepDict['Gen'][k]['--beamspot']=beamspot + upgradeStepDict['GenHLBeamSpot'][k] = merge([{'--conditions' : gt+'_13TeV'}, upgradeStepDict['Gen'][k]]) + upgradeStepDict['GenHLBeamSpot14'][k] = merge([{}, upgradeStepDict['Gen'][k]]) + upgradeStepDict['GenSim'][k]= {'-s' : 'GEN,SIM', '-n' : 10, '--conditions' : gt, diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 29e4aaef27a95..7728919e058cd 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -44,6 +44,9 @@ def notForGenOnly(key,specialType): step = 'GenSimHLBeamSpotHGCALCloseBy' stepMaker = makeStepNameSim elif 'Gen' in step: + if 'HLBeamSpot' in step: + if '14TeV' in frag: + step = 'GenHLBeamSpot14' stepMaker = makeStepNameSim if 'HARVEST' in step: hasHarvest = True diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 2f84c94e85b81..d18b25c4fed20 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -1,6 +1,6 @@ from copy import copy, deepcopy from collections import OrderedDict -from .MatrixUtil import merge, Kby, Mby +from .MatrixUtil import merge, Kby, Mby, check_dups import re U2000by1={'--relval': '2000,1'} @@ -43,24 +43,10 @@ ] upgradeKeys[2026] = [ - '2026D86', - '2026D86PU', - '2026D88', - '2026D88PU', - '2026D91', - '2026D91PU', - '2026D92', - '2026D92PU', - '2026D93', - '2026D93PU', - '2026D94', - '2026D94PU', '2026D95', '2026D95PU', '2026D96', '2026D96PU', - '2026D97', - '2026D97PU', '2026D98', '2026D98PU', '2026D99', @@ -104,13 +90,12 @@ # pre-generation of WF numbers numWFStart={ 2017: 10000, - 2026: 20000, + 2026: 23600, } numWFSkip=200 # temporary measure to keep other WF numbers the same numWFConflict = [[14400,14800], #2022ReReco, 2022ReRecoPU (in 12_4) - [20400,20800], #D87 - [21200,22000], #D89-D90 + [24400,24800], #D97 [50000,51000]] numWFAll={ 2017: [], @@ -203,6 +188,8 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['baseline'] = UpgradeWorkflow_baseline( steps = [ 'Gen', + 'GenHLBeamSpot', + 'GenHLBeamSpot14', 'Sim', 'GenSim', 'GenSimHLBeamSpot', @@ -491,6 +478,56 @@ def condition_(self, fragment, stepList, key, hasHarvest): '--procModifiers': 'trackingMkFitCommon,trackingMkFitInitialStep' } +# LST on CPU, initialStep+highPtTripletStep-only tracking-only +class UpgradeWorkflow_lstOnCPUIters01TrackingOnly(UpgradeWorkflowTracking): + def setup__(self, step, stepName, stepDict, k, properties): + if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, stepDict[step][k]]) + elif 'ALCA' in step: stepDict[stepName][k] = None + def condition_(self, fragment, stepList, key, hasHarvest): + return ('2026' in key) +upgradeWFs['lstOnCPUIters01TrackingOnly'] = UpgradeWorkflow_lstOnCPUIters01TrackingOnly( + steps = [ + 'RecoGlobal', + 'HARVESTGlobal', + # Add ALCA steps explicitly, so that they can be properly removed + 'ALCA', + 'ALCAPhase2' + ], + PU = [], + suffix = '_lstOnCPUIters01TrackingOnly', + offset = 0.703, +) +upgradeWFs['lstOnCPUIters01TrackingOnly'].step3 = upgradeWFs['trackingOnly'].step3 | { + '--procModifiers': 'trackingIters01,trackingLST', + '--accelerators' : 'cpu' +} + +# LST on GPU, initialStep+highPtTripletStep-only tracking-only +class UpgradeWorkflow_lstOnGPUIters01TrackingOnly(UpgradeWorkflowTracking): + def setup__(self, step, stepName, stepDict, k, properties): + if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, stepDict[step][k]]) + elif 'ALCA' in step: stepDict[stepName][k] = None + def condition_(self, fragment, stepList, key, hasHarvest): + return ('2026' in key) +upgradeWFs['lstOnGPUIters01TrackingOnly'] = UpgradeWorkflow_lstOnGPUIters01TrackingOnly( + steps = [ + 'RecoGlobal', + 'HARVESTGlobal', + # Add ALCA steps explicitly, so that they can be properly removed + 'ALCA', + 'ALCAPhase2' + ], + PU = [], + suffix = '_lstOnGPUIters01TrackingOnly', + offset = 0.704, +) +upgradeWFs['lstOnGPUIters01TrackingOnly'].step3 = upgradeWFs['trackingOnly'].step3 | { + '--procModifiers': 'trackingIters01,trackingLST', + '--accelerators' : 'gpu-nvidia' +} + #DeepCore seeding for JetCore iteration workflow class UpgradeWorkflow_seedingDeepCore(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): @@ -726,6 +763,44 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['ticl_v5'].step3 = {'--procModifiers': 'ticl_v5'} upgradeWFs['ticl_v5'].step4 = {'--procModifiers': 'ticl_v5'} +class UpgradeWorkflow_ticl_v5_superclustering(UpgradeWorkflow): + def setup_(self, step, stepName, stepDict, k, properties): + if 'RecoGlobal' in step: + stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + if 'HARVESTGlobal' in step: + stepDict[stepName][k] = merge([self.step4, stepDict[step][k]]) + def condition(self, fragment, stepList, key, hasHarvest): + return (fragment=="ZEE_14" or 'Eta1p7_2p7' in fragment) and '2026' in key +upgradeWFs['ticl_v5_superclustering_mustache_ticl'] = UpgradeWorkflow_ticl_v5_superclustering( + steps = [ + 'RecoGlobal', + 'HARVESTGlobal' + ], + PU = [ + 'RecoGlobal', + 'HARVESTGlobal' + ], + suffix = '_ticl_v5_mustache', + offset = 0.204, +) +upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step3 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_ticl'} +upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step4 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_ticl'} + +upgradeWFs['ticl_v5_superclustering_mustache_pf'] = UpgradeWorkflow_ticl_v5_superclustering( + steps = [ + 'RecoGlobal', + 'HARVESTGlobal' + ], + PU = [ + 'RecoGlobal', + 'HARVESTGlobal' + ], + suffix = '_ticl_v5_mustache_pf', + offset = 0.205, +) +upgradeWFs['ticl_v5_superclustering_mustache_pf'].step3 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_pf'} +upgradeWFs['ticl_v5_superclustering_mustache_pf'].step4 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_pf'} + # Track DNN workflows class UpgradeWorkflow_trackdnn(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): @@ -1100,7 +1175,7 @@ def setup_(self, step, stepName, stepDict, k, properties): '--customise': 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,RecoTracker/Configuration/customizePixelOnlyForProfiling.customizePixelOnlyForProfilingGPUOnly' }, harvest = None, - suffix = 'Patatrack_PixelOnlyTripletsGPU_Profiling', + suffix = 'Patatrack_PixelOnlyTripletsGPU_Profiling', offset = 0.508, ) @@ -1111,7 +1186,7 @@ def setup_(self, step, stepName, stepDict, k, properties): upgradeWFs['PatatrackECALOnlyAlpaka'] = PatatrackWorkflow( digi = { # customize the ECAL Local Reco part of the HLT menu for Alpaka - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, reco = { @@ -1287,7 +1362,7 @@ def setup_(self, step, stepName, stepDict, k, properties): # - HCAL-only reconstruction using Alpaka with DQM and Validation upgradeWFs['PatatrackHCALOnlyAlpakaValidation'] = PatatrackWorkflow( digi = { - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, reco = { @@ -1307,7 +1382,7 @@ def setup_(self, step, stepName, stepDict, k, properties): # - HCAL-only reconstruction using GPU and Alpaka with DQM and Validation for PF Alpaka vs CPU comparisons upgradeWFs['PatatrackHCALOnlyGPUandAlpakaValidation'] = PatatrackWorkflow( digi = { - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, reco = { @@ -1327,7 +1402,7 @@ def setup_(self, step, stepName, stepDict, k, properties): # - HCAL-only reconstruction using Alpaka upgradeWFs['PatatrackHCALOnlyAlpakaProfiling'] = PatatrackWorkflow( digi = { - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', }, reco = { '-s': 'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly', @@ -1344,13 +1419,13 @@ def setup_(self, step, stepName, stepDict, k, properties): # - harvesting upgradeWFs['PatatrackFullRecoAlpaka'] = PatatrackWorkflow( digi = { - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, reco = { # skip the @pixelTrackingOnlyValidation which cannot run together with the full reconstruction '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', - '--procModifiers': 'alpaka,pixelNtupletFit', + '--procModifiers': 'alpaka', '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, harvest = { @@ -1360,6 +1435,28 @@ def setup_(self, step, stepName, stepDict, k, properties): offset = 0.492, ) +# Workflow running the Pixel triplets, ECAL and HCAL reconstruction on GPU (optional), PF using Alpaka, together with the full offline reconstruction on CPU +# - HLT on GPU (optional) +# - reconstruction on Alpaka, with DQM and validation +# - harvesting +upgradeWFs['PatatrackFullRecoAlpaka'] = PatatrackWorkflow( + digi = { + '--procModifiers': 'alpaka', + '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', + }, + reco = { + # skip the @pixelTrackingOnlyValidation which cannot run together with the full reconstruction + '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', + '--procModifiers': 'alpaka', + '--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', + }, + harvest = { + # skip the @pixelTrackingOnlyDQM harvesting + }, + suffix = 'Patatrack_FullRecoAlpakaTriplets', + offset = 0.496, +) + # Workflow running the Pixel quadruplets, ECAL and HCAL reconstruction on CPU # - HLT on CPU # - reconstruction on CPU, with DQM and validation @@ -1666,7 +1763,7 @@ def setup_(self, step, stepName, stepDict, k, properties): upgradeWFs['PatatrackPixelOnlyAlpaka'] = PatatrackWorkflow( digi = { - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, reco = { @@ -1683,7 +1780,7 @@ def setup_(self, step, stepName, stepDict, k, properties): upgradeWFs['PatatrackPixelOnlyAlpakaValidation'] = PatatrackWorkflow( digi = { - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, reco = { @@ -1692,7 +1789,8 @@ def setup_(self, step, stepName, stepDict, k, properties): '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', }, harvest = { - '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM' + '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM', + '--procModifiers': 'alpakaValidation', }, suffix = 'Patatrack_PixelOnlyAlpaka_Validation', offset = 0.403, @@ -1700,7 +1798,7 @@ def setup_(self, step, stepName, stepDict, k, properties): upgradeWFs['PatatrackPixelOnlyAlpakaProfiling'] = PatatrackWorkflow( digi = { - '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka + '--procModifiers': 'alpaka', }, reco = { '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly', @@ -1712,6 +1810,54 @@ def setup_(self, step, stepName, stepDict, k, properties): offset = 0.404, ) +upgradeWFs['PatatrackPixelOnlyTripletsAlpaka'] = PatatrackWorkflow( + digi = { + '--procModifiers': 'alpaka', + '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', + }, + reco = { + '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,VALIDATION:@pixelTrackingOnlyValidation,DQM:@pixelTrackingOnlyDQM', + '--procModifiers': 'alpaka', + '--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling' + }, + harvest = { + '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM' + }, + suffix = 'Patatrack_PixelOnlyTripletsAlpaka', + offset = 0.406, +) + +upgradeWFs['PatatrackPixelOnlyTripletsAlpakaValidation'] = PatatrackWorkflow( + digi = { + '--procModifiers': 'alpaka', + '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling', + }, + reco = { + '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,VALIDATION:@pixelTrackingOnlyValidation,DQM:@pixelTrackingOnlyDQM', + '--procModifiers': 'alpakaValidation', + '--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling' + }, + harvest = { + '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM' + }, + suffix = 'Patatrack_PixelOnlyTripletsAlpaka_Validation', + offset = 0.407, +) + +upgradeWFs['PatatrackPixelOnlyTripletsAlpakaProfiling'] = PatatrackWorkflow( + digi = { + '--procModifiers': 'alpaka', + }, + reco = { + '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly', + '--procModifiers': 'alpaka', + '--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,RecoTracker/Configuration/customizePixelOnlyForProfiling.customizePixelOnlyForProfilingGPUOnly' + }, + harvest = None, + suffix = 'Patatrack_PixelOnlyTripletsAlpaka_Profiling', + offset = 0.408, +) + # end of Patatrack workflows class UpgradeWorkflow_ProdLike(UpgradeWorkflow): @@ -1910,30 +2056,37 @@ def condition(self, fragment, stepList, key, hasHarvest): fixedPU = 180, ) -class UpgradeWorkflow_HLT75e33(UpgradeWorkflow): +class UpgradeWorkflow_HLT75e33Timing(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): - if 'HARVEST' in step: - stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]]) + # skip RECO, ALCA and HARVEST + if ('ALCA' in step) or ('Reco' in step) or ('HARVEST' in step) or ('HLT' in step): + stepDict[stepName][k] = None + elif 'DigiTrigger' in step: + stepDict[stepName][k] = merge([{'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing'}, stepDict[step][k]]) else: stepDict[stepName][k] = merge([stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return fragment=="TTbar_14TeV" and '2026' in key -upgradeWFs['HLT75e33'] = UpgradeWorkflow_HLT75e33( +upgradeWFs['HLTTiming75e33'] = UpgradeWorkflow_HLT75e33Timing( steps = [ - 'GenSimHLBeamSpot14', - 'DigiTrigger', + 'Reco', 'RecoGlobal', - 'HLT75e33', + 'RecoNano', + 'DigiTrigger', + 'ALCA', + 'ALCAPhase2', 'HARVESTGlobal', ], PU = [ - 'GenSimHLBeamSpot14', - 'DigiTrigger', + 'Reco', 'RecoGlobal', - 'HLT75e33', - 'HARVESTGlobal', + 'RecoNano', + 'DigiTrigger', + 'ALCA', + 'ALCAPhase2', + 'HARVESTGlobal' ], - suffix = '_HLT75e33', + suffix = '_HLT75e33Timing', offset = 0.75, ) @@ -2185,7 +2338,7 @@ def setupPU_(self, step, stepName, stepDict, k, properties): # override '-n' setting from PUDataSets in relval_steps.py stepDict[stepName][k] = merge([{'-n':'1'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return (fragment=="TTbar_13" or fragment=="TTbar_14TeV") and ('2017' in key or '2018' in key or '2021' in key) and ('FS' not in key) + return (fragment=="TTbar_13" or fragment=="TTbar_14TeV") and ('2017' in key or '2018' in key or '2021' in key or '2024' in key) and ('FS' not in key) upgradeWFs['0T'] = UpgradeWorkflow_0T( steps = [ 'GenSim', @@ -2819,13 +2972,41 @@ def condition(self, fragment, stepList, key, hasHarvest): offset = 0.9001, ) -# check for duplicate offsets -offsets = [specialWF.offset for specialType,specialWF in upgradeWFs.items()] -seen = set() -dups = set(x for x in offsets if x in seen or seen.add(x)) +class UpgradeWorkflow_Phase2_HeavyIon(UpgradeWorkflow): + def setup_(self, step, stepName, stepDict, k, properties): + stepDict[stepName][k] = merge([{'--procModifiers': 'phase2_pp_on_AA'}, stepDict[step][k]]) + if 'GenSim' in step: + stepDict[stepName][k] = merge([{'--conditions': stepDict[step][k]["--conditions"].replace('_13TeV',''), '-n': 1}, stepDict[stepName][k]]) + elif 'Digi' in step: + stepDict[stepName][k] = merge([{'-s': stepDict[step][k]["-s"].replace("DIGI:pdigi_valid","DIGI:pdigi_hi"), '--pileup': 'HiMixNoPU'}, stepDict[stepName][k]]) + def condition(self, fragment, stepList, key, hasHarvest): + return fragment=='HydjetQMinBias_5519GeV' and '2026' in key and 'PU' not in key + +upgradeWFs['Phase2_HeavyIon'] = UpgradeWorkflow_Phase2_HeavyIon( + steps = [ + 'GenSimHLBeamSpot', + 'DigiTrigger', + 'RecoGlobal', + 'HARVESTGlobal', + 'ALCAPhase2' + ], + PU = [], + suffix = '_hi', + offset = 0.85, +) + +# check for duplicates in offsets or suffixes +offsets = [specialWF.offset for specialType,specialWF in upgradeWFs.items()] +suffixes = [specialWF.suffix for specialType,specialWF in upgradeWFs.items()] + +dups = check_dups(offsets) if len(dups)>0: raise ValueError("Duplicate special workflow offsets not allowed: "+','.join([str(x) for x in dups])) +dups = check_dups(suffixes) +if len(dups)>0: + raise ValueError("Duplicate special workflow suffixes not allowed: "+','.join([str(x) for x in dups])) + upgradeProperties = {} upgradeProperties[2017] = { @@ -3172,18 +3353,18 @@ def condition(self, fragment, stepList, key, hasHarvest): }, '2026D110GenOnly' : { 'Geom' : 'Extended2026D110', - 'Beamspot' : 'HLLHC', + 'BeamSpot' : 'DBrealisticHLLHC', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['Gen'], + 'ScenToRun' : ['GenHLBeamSpot'], }, '2026D110SimOnGen' : { 'Geom' : 'Extended2026D110', 'HLTmenu': '@relval2026', - 'Beamspot' : 'HLLHC', + 'BeamSpot' : 'DBrealisticHLLHC', 'GT' : 'auto:phase2_realistic_T33', 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['Gen','Sim','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], + 'ScenToRun' : ['GenHLBeamSpot','Sim','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, '2026D115' : { 'Geom' : 'Extended2026D115', @@ -3357,11 +3538,12 @@ def __init__(self, howMuch, dataset): ('XiMinus_13p6TeV_SoftQCDInel_TuneCP5_cfi', UpgradeFragment(Kby(8000,90000),'XiMinus_13p6TeV')), #2.8% ('Chib1PToUpsilon1SGamma_MuFilter_TuneCP5_14TeV-pythia8_evtgen_cfi', UpgradeFragment(Kby(3600,36000),'Chib1PToUpsilon1SGamma_14TeV')), #2.8% ('ChicToJpsiGamma_MuFilter_TuneCP5_14TeV_pythia8_evtgen_cfi', UpgradeFragment(Kby(2000,20000),'ChicToJpsiGamma_14TeV')), #5% - ('B0ToJpsiK0s_JMM_Filter_DGamma0_TuneCP5_13p6TeV-pythia8-evtgen_cfi',UpgradeFragment(Kby(38000,38000),'B0ToJpsiK0s_DGamma0_13p6TeV')), #2.7% + ('B0ToJpsiK0s_JMM_Filter_DGamma0_TuneCP5_13p6TeV-pythia8-evtgen_cfi',UpgradeFragment(Kby(18000,18000),'B0ToJpsiK0s_DGamma0_13p6TeV')), #2.7% ('DStarToD0Pi_D0ToKsPiPi_inclusive_SoftQCD_TuneCP5_13p6TeV-pythia8-evtgen',UpgradeFragment(Kby(38000,38000),'DStarToD0Pi_D0ToKsPiPi_13p6TeV')), #1.3% ('LbToJpsiLambda_JMM_Filter_DGamma0_TuneCP5_13p6TeV-pythia8-evtgen_cfi',UpgradeFragment(Mby(66,660000),'LbToJpsiLambda_DGamma0_13p6TeV')), #0.3% ('LbToJpsiXiK0sPi_JMM_Filter_DGamma0_TuneCP5_13p6TeV-pythia8-evtgen_cfi',UpgradeFragment(Mby(50,500000),'LbToJpsiXiK0sPr_DGamma0_13p6TeV')), #0.6% ('OmegaMinus_13p6TeV_SoftQCDInel_TuneCP5_cfi',UpgradeFragment(Mby(100,1000000),'OmegaMinus_13p6TeV')), #0.1% ('Hydjet_Quenched_MinBias_5020GeV_cfi', UpgradeFragment(U2000by1,'HydjetQMinBias_5020GeV')), - ('Hydjet_Quenched_MinBias_5362GeV_cfi', UpgradeFragment(U2000by1,'HydjetQMinBias_5362GeV')) + ('Hydjet_Quenched_MinBias_5362GeV_cfi', UpgradeFragment(U2000by1,'HydjetQMinBias_5362GeV')), + ('Hydjet_Quenched_MinBias_5519GeV_cfi', UpgradeFragment(U2000by1,'HydjetQMinBias_5519GeV')), ]) diff --git a/Configuration/PyReleaseValidation/scripts/das-up-to-nevents.py b/Configuration/PyReleaseValidation/scripts/das-up-to-nevents.py new file mode 100755 index 0000000000000..1af66830c13bf --- /dev/null +++ b/Configuration/PyReleaseValidation/scripts/das-up-to-nevents.py @@ -0,0 +1,237 @@ +#!/usr/bin/env python3 +import pycurl +from io import BytesIO +import pycurl +import ast +import subprocess +import pandas as pd +import argparse +from bs4 import BeautifulSoup +import numpy as np +import os +import json +import sys + +## Helpers +base_cert_url = "https://cms-service-dqmdc.web.cern.ch/CAF/certification/" +base_cert_path = "/eos/user/c/cmsdqm/www/CAF/certification/" + +def get_url_clean(url): + + buffer = BytesIO() + c = pycurl.Curl() + c.setopt(c.URL, url) + c.setopt(c.WRITEDATA, buffer) + c.perform() + c.close() + + return BeautifulSoup(buffer.getvalue(), "lxml").text + +def das_do_command(cmd): + out = subprocess.check_output(cmd, shell=True, executable="/bin/bash").decode('utf8') + return out.split("\n") + +def das_file_site(dataset, site): + cmd = "dasgoclient --query='file dataset=%s site=%s'"%(dataset,site) + out = das_do_command(cmd) + df = pd.DataFrame(out,columns=["file"]) + + return df + +def das_file_data(dataset,opt=""): + cmd = "dasgoclient --query='file dataset=%s %s| grep file.name, file.nevents'"%(dataset,opt) + out = das_do_command(cmd) + out = [np.array(r.split(" "))[[0,3]] for r in out if len(r) > 0] + + df = pd.DataFrame(out,columns=["file","events"]) + df.events = df.events.values.astype(int) + + return df + +def das_lumi_data(dataset,opt=""): + cmd = "dasgoclient --query='file,lumi,run dataset=%s %s'"%(dataset,opt) + + out = das_do_command(cmd) + out = [r.split(" ") for r in out if len(r)>0] + + df = pd.DataFrame(out,columns=["file","run","lumis"]) + + return df + +def das_run_events_data(dataset,run,opt=""): + cmd = "dasgoclient --query='file dataset=%s run=%s %s | sum(file.nevents) '"%(dataset,run,opt) + out = das_do_command(cmd)[0] + + out = [o for o in out.split(" ") if "sum" not in o] + out = int([r.split(" ") for r in out if len(r)>0][0][0]) + + return out + +def das_run_data(dataset,opt=""): + cmd = "dasgoclient --query='run dataset=%s %s '"%(dataset,opt) + out = das_do_command(cmd) + + return out + +def no_intersection(): + print("No intersection between:") + print(" - json : ", best_json) + print(" - dataset: ", dataset) + print("Exiting.") + sys.exit(1) + +if __name__ == '__main__': + + parser = argparse.ArgumentParser() + parser.add_argument('--dataset','-d', default=None, help="Dataset Name (e.g. '/DisplacedJet/Run2024C-v1/RAW' )",type=str,required=True) + parser.add_argument('--threshold','-t', help ="Event threshold per file",type=int,default=-1) + parser.add_argument('--events','-e', help ="Tot number of events targeted",type=int,default=-1) + parser.add_argument('--outfile','-o', help='Dump results to file', type=str, default=None) + parser.add_argument('--pandas', '-pd',action='store_true',help="Store the whole dataset (no event or threshold cut) in a csv") + parser.add_argument('--proxy','-p', help='Allow to parse a x509 proxy if needed', type=str, default=None) + parser.add_argument('--site','-s', help='Only data at specific site', type=str, default=None) + parser.add_argument('--precheck','-pc', action='store_true', help='Check run per run before building the dataframes, to avoid huge caching.') + args = parser.parse_args() + + if args.proxy is not None: + os.environ["X509_USER_PROXY"] = args.proxy + elif "X509_USER_PROXY" not in os.environ: + print("No X509 proxy set. Exiting.") + sys.exit(1) + + ## Check if we are in the cms-bot "environment" + testing = "JENKINS_PREFIX" in os.environ + dataset = args.dataset + events = args.events + threshold = args.threshold + outfile = args.outfile + site = args.site + + ## get the greatest golden json + year = dataset.split("Run")[1][2:4] # from 20XX to XX + PD = dataset.split("/")[1] + cert_type = "Collisions" + str(year) + if "Cosmics" in dataset: + cert_type = "Cosmics" + str(year) + elif "Commisioning" in dataset: + cert_type = "Commisioning2020" + elif "HI" in PD: + cert_type = "Collisions" + str(year) + "HI" + + cert_path = base_cert_path + cert_type + "/" + web_fallback = False + + ## if we have access to eos we get from there ... + if os.path.isdir(cert_path): + json_list = os.listdir(cert_path) + if len(json_list) == 0: + web_fallback == True + json_list = [c for c in json_list if "Golden" in c and "era" not in c] + json_list = [c for c in json_list if c.startswith("Cert_C") and c.endswith("json")] + else: + web_fallback = True + ## ... if not we go to the website + if web_fallback: + cert_url = base_cert_url + cert_type + "/" + json_list = get_url_clean(cert_url).split("\n") + json_list = [c for c in json_list if "Golden" in c and "era" not in c] + json_list = [[cc for cc in c.split(" ") if cc.startswith("Cert_C") and cc.endswith("json")][0] for c in json_list] + + # the larger the better, assuming file naming schema + # Cert_X_RunStart_RunFinish_Type.json + run_ranges = [int(c.split("_")[3]) - int(c.split("_")[2]) for c in json_list] + latest_json = np.array(json_list[np.argmax(run_ranges)]).reshape(1,-1)[0].astype(str) + best_json = str(latest_json[0]) + if not web_fallback: + with open(cert_path + "/" + best_json) as js: + golden = json.load(js) + else: + golden = get_url_clean(cert_url + best_json) + golden = ast.literal_eval(golden) #converts string to dict + + # golden json with all the lumisections + golden_flat = {} + for k in golden: + R = [] + for r in golden[k]: + R = R + [f for f in range(r[0],r[1]+1)] + golden_flat[k] = R + + # let's just check there's an intersection between the + # dataset and the json + data_runs = das_run_data(dataset) + golden_data_runs = [r for r in data_runs if r in golden_flat] + + if (len(golden_data_runs)==0): + no_intersection() + + # building the dataframe, cleaning for bad lumis + golden_data_runs_tocheck = golden_data_runs + das_opt = "" + if testing or args.precheck: + golden_data_runs_tocheck = [] + # Here we check run per run. + # This implies more dasgoclient queries, but smaller outputs + # useful when running the IB/PR tests not to have huge + # query results that have to be cached. + + sum_events = 0 + + for r in golden_data_runs: + sum_events = sum_events + int(das_run_events_data(dataset,r)) + golden_data_runs_tocheck.append(r) + if events > 0 and sum_events > events: + break + + das_opt = "run in %s"%(str([int(g) for g in golden_data_runs_tocheck])) + + df = das_lumi_data(dataset,opt=das_opt).merge(das_file_data(dataset,opt=das_opt),on="file",how="inner") # merge file informations with run and lumis + + df["lumis"] = [[int(ff) for ff in f.replace("[","").replace("]","").split(",")] for f in df.lumis.values] + df_rs = [] + for r in golden_data_runs_tocheck: + cut = (df["run"] == r) + if not any(cut): + continue + + df_r = df[cut] + + # jumping low event content runs + if df_r["events"].sum() < threshold: + continue + + good_lumis = np.array([len([ll for ll in l if ll in golden_flat[r]]) for l in df_r.lumis]) + n_lumis = np.array([len(l) for l in df_r.lumis]) + df_rs.append(df_r[good_lumis==n_lumis]) + + if (len(df_rs)==0): + no_intersection() + + df = pd.concat(df_rs) + df.loc[:,"min_lumi"] = [min(f) for f in df.lumis] + df.loc[:,"max_lumi"] = [max(f) for f in df.lumis] + df = df.sort_values(["run","min_lumi","max_lumi"]) + + if site is not None: + df = df.merge(das_file_site(dataset,site),on="file",how="inner") + + if args.pandas: + df.to_csv(dataset.replace("/","")+".csv") + + if events > 0: + df = df[df["events"] <= events] #jump too big files + df.loc[:,"sum_evs"] = df.loc[:,"events"].cumsum() + df = df[df["sum_evs"] < events] + + files = df.file + + if outfile is not None: + with open(outfile, 'w') as f: + for line in files: + f.write(f"{line}\n") + else: + print("\n".join(files)) + + sys.exit(0) + + diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 5ff90f1d3fbca..a62759be9ffbc 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -96,8 +96,8 @@ def runSelected(opt): 29834.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T33 Extended2026D110 AVE_50_BX_25ns_m3p3 29696.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T33 Extended2026D110 29700.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T33 Extended2026D110 - 23234.0, # TTbar_14TeV_TuneCP5 phase2_realistic_T21 Extended2026D94 (exercise with HFNose) - + #23234.0, # Need new workflow with HFNose + 29634.75, # RelValTTbar_14TeV phase2_realistic_T33 Extended2026D110 (Phase-2 baseline - but using timing menu, and only up to step 2) ###### pp Data ## Run1 diff --git a/Configuration/PyReleaseValidation/test/BuildFile.xml b/Configuration/PyReleaseValidation/test/BuildFile.xml index 48a48732bd9e0..23681eb2d06e7 100644 --- a/Configuration/PyReleaseValidation/test/BuildFile.xml +++ b/Configuration/PyReleaseValidation/test/BuildFile.xml @@ -14,10 +14,16 @@ --> - + + + + - + + + + - diff --git a/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc b/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc index 43880d7e5b82e..a0aa9563b7502 100644 --- a/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc +++ b/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc @@ -2827,7 +2827,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } // new lumi else { nevcounter0 = 0; - } //else new lumi + } //else new lumi ++nevcounter; // #ev in LS ////// if (flagtoaskrunsorls_ == 0) { @@ -3285,7 +3285,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_2DsumADCAmplLSdepth7HEu->Fill(double(ieta), double(k3), bbbc); h_2D0sumADCAmplLSdepth7HEu->Fill(double(ieta), double(k3), bbb1); } //if(k1+1 ==7) - } //if(k0==1) =HE + } //if(k0==1) =HE // HF: if (k0 == 3) { // HFdepth1 @@ -3985,7 +3985,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } /// } //if(sumEstimator6[k0][k1][k2][k3] != 0. - } //for k2 + } //for k2 // occupancy distributions for error-A: // HB if (k0 == 0 && k1 == 0) { @@ -4045,8 +4045,8 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } // } //for k3 - } //for k1 - } //for k0 + } //for k1 + } //for k0 /////// int sub= cell.subdet(); 1-HB, 2-HE, 3-HO, 4-HF //////////// k0(sub): =0 HB; =1 HE; =2 HO; =3 HF; //////////// k1(depth-1): = 0 - 3 or depth: = 1 - 4; @@ -4103,9 +4103,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS sumEstimator6[k0][k1][k2][k3] = 0.; sum0Estimator[k0][k1][k2][k3] = 0.; } //for - } //for - } //for - } //for + } //for + } //for + } //for //------------------------------------------------------ averSIGNAL averSIGNALoccupancy_HB /= float(nevcounter0); @@ -4188,7 +4188,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS //------------------------------------------------------ } //if(nevcounter0 != 0) - // POINT1 + // POINT1 /////////////////////////////////////////////////// over DigiCollections: // for upgrade: @@ -4210,11 +4210,11 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS for (int k0 = 0; k0 < nsub; k0++) { badchannels[k0][k1][k2][k3] = 0; } //for - } //if + } //if } //for - } //for - } //for + } //for + } //for for (int k0 = 0; k0 < nsub; k0++) { for (int k1 = 0; k1 < ndepth; k1++) { for (int k2 = 0; k2 < neta; k2++) { @@ -4235,9 +4235,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS recNoiseEnergy2[k0][k1][k2][k3] = 0.; } //k3 - } //k2 - } //k1 - } //k0 + } //k2 + } //k1 + } //k0 /////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////// END of GENERAL NULLING //////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -4288,10 +4288,10 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS if (i > 1 && i < 6) signal3[3][ieta + 41][iphi] += TS_data[i]; } // TS - } // if(recordHistoes_ && studyCalibCellsHist_) - } // for - } // hf.isValid - } // end flagupgrade + } // if(recordHistoes_ && studyCalibCellsHist_) + } // for + } // hf.isValid + } // end flagupgrade ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// HFQIE10 DigiCollection //////////////////////////////////////////////////////////////////////////////////////////////////upgradeHF upgradehf @@ -4357,11 +4357,11 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_numberofhitsHFtest->Fill(nnnnnnTS); h_AmplitudeHFtest->Fill(amplitudefullTSs); } // if(recordHistoes_ && studyCalibCellsHist_) - } // for + } // for h_totalAmplitudeHF->Fill(totalAmplitudeHF); h_totalAmplitudeHFperEvent->Fill(float(eventcounter), totalAmplitudeHF); } // hfqie10.isValid - } // end flagupgrade + } // end flagupgrade //end upgrade // // @@ -4463,7 +4463,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } //if(recordHistoes_ && studyCalibCellsHist_) if (recordNtuples_ && nevent50 < maxNeventsInNtuple_) { } //if(recordNtuples_) - } // for HBHE digis + } // for HBHE digis if (totalAmplitudeHB != 0.) { h_numberofhitsHBtest->Fill(nnnnnnTSHB); h_totalAmplitudeHB->Fill(totalAmplitudeHB); @@ -4475,7 +4475,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_totalAmplitudeHEperEvent->Fill(float(eventcounter), totalAmplitudeHE); } } //hbhe.isValid - } // end flagupgrade + } // end flagupgrade //--------------------------------------------------------------- ////////////////////////////////////////////////////////////////////////////////////////////////// upgradeHBHE upgradehe HBHE with SiPM (both >=2020) // upgrade: @@ -4589,8 +4589,8 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_AmplitudeHEtest6->Fill(amplitudefullTSs6, 1.); } //HE end - } //if(recordHistoes_ && studyCalibCellsHist_) - } // for QIE11 digis + } //if(recordHistoes_ && studyCalibCellsHist_) + } // for QIE11 digis if (totalAmplitudeHBQIE11 != 0.) { h_numberofhitsHBtest->Fill(nnnnnnTSHBQIE11); @@ -4603,7 +4603,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_totalAmplitudeHEperEvent->Fill(float(eventcounter), totalAmplitudeHEQIE11); } } //heqie11.isValid - } // end flagupgrade + } // end flagupgrade /////////////////////////////////////////////////////////////////////////////////////////////////////////////// HODigiCollection edm::Handle ho; @@ -4658,12 +4658,12 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_AmplitudeHOtest->Fill(amplitudefullTSs); h_numberofhitsHOtest->Fill(nnnnnnTS); } //if(recordHistoes_ && studyCalibCellsHist_) - } //for HODigiCollection + } //for HODigiCollection h_totalAmplitudeHO->Fill(totalAmplitudeHO); h_totalAmplitudeHOperEvent->Fill(float(eventcounter), totalAmplitudeHO); } //ho.isValid( - } // flagToUseDigiCollectionsORNot_ + } // flagToUseDigiCollectionsORNot_ //////////////////////////////////// RecHits for phi-symmetry monitoring of calibration group: // AZ 04.11.2019 @@ -4724,7 +4724,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS recNoiseEnergy1[sub - 1][mdepth - 1][ieta + 41][iphi] += energyhit; recNoiseEnergy2[sub - 1][mdepth - 1][ieta + 41][iphi] += pow(energyhit, 2); } // hbheNoise - } //hbheNoise.isValid( + } //hbheNoise.isValid( ////////////////////////////////////////////////////// / HBHE Noise end // HF: HFRecHitCollection hfNoise Noise @@ -4768,7 +4768,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS recNoiseEnergy1[sub - 1][mdepth - 1][ieta + 41][iphi] += energyhit; recNoiseEnergy2[sub - 1][mdepth - 1][ieta + 41][iphi] += pow(energyhit, 2); } // hfNoise - } //hfNoise.isValid( + } //hfNoise.isValid( ////////////////////////////////////////////////////// / HF Noise end ///////////////////////////////////////////////////////////////////////////////////////////////////////////// Signal @@ -4825,7 +4825,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS recSignalEnergy1[sub - 1][mdepth - 1][ieta + 41][iphi] += energyhit; recSignalEnergy2[sub - 1][mdepth - 1][ieta + 41][iphi] += pow(energyhit, 2); } // hbheSignal - } //hbheSignal.isValid( + } //hbheSignal.isValid( ////////////////////////////////////////////////////// / HBHE Signal end // HF: HFRecHitCollection hfSignal Signal @@ -4869,7 +4869,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS recSignalEnergy1[sub - 1][mdepth - 1][ieta + 41][iphi] += energyhit; recSignalEnergy2[sub - 1][mdepth - 1][ieta + 41][iphi] += pow(energyhit, 2); } // hfSignal - } //hfSignal.isValid( + } //hfSignal.isValid( ////////////////////////////////////////////////////// HF Signal end ////////////////////////////////////////////////////// @@ -4911,7 +4911,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS std::cout << "==== nsumoverphi = " << nsumoverphi << " sumoverphi = " << sumoverphi << " k1 = " << k1 << " k2 = " << k2 << " kkk = " << kkk << " k3 = " << k3 << std::endl; } //if != 0 - } //k3 + } //k3 // PHI normalization into new massive && filling plots: for (int k3 = 0; k3 < nphi; k3++) { if (nsumoverphi != 0) { @@ -4984,11 +4984,11 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_maprphinorm0_HE7->Fill(double(kkk), double(k3), 1.); } } //if nsumoverphi != 0 - } //k3 - } //k2 - } //k1 - } //if k0 == 1 HE - } //k0 + } //k3 + } //k2 + } //k1 + } //if k0 == 1 HE + } //k0 // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // amplitudechannel amplitudechannel amplitudechannel: calibration group, Iterative method, coding start 11.11.2019 for (int k0 = 0; k0 < nsub; k0++) { @@ -5022,9 +5022,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_amplitudechannel2_HB4->Fill(double(kkk), double(k3), amplitudechannel2[k0][k1][k2][k3]); } } //k3 - } //k2 - } //k1 - } //if k0 == 0 HB + } //k2 + } //k1 + } //if k0 == 0 HB // HE: if (k0 == 1) { @@ -5071,9 +5071,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_amplitudechannel2_HE7->Fill(double(kkk), double(k3), amplitudechannel2[k0][k1][k2][k3]); } } //k3 - } //k2 - } //k1 - } //if k0 == 1 HE + } //k2 + } //k1 + } //if k0 == 1 HE // HF: 4 depthes for Digis and only 2 - for Reco !!! if (k0 == 3) { @@ -5105,9 +5105,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_amplitudechannel2_HF4->Fill(double(kkk), double(k3), amplitudechannel2[k0][k1][k2][k3]); } } //k3 - } //k2 - } //k1 - } //if k0 == 3 HF + } //k2 + } //k1 + } //if k0 == 3 HF } //k0 @@ -5166,9 +5166,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_recNoiseEnergy2_HB4->Fill(double(kkk), double(k3), recNoiseEnergy2[k0][k1][k2][k3]); } } //k3 - } //k2 - } //k1 - } //if k0 == 0 HB + } //k2 + } //k1 + } //if k0 == 0 HB // HE: if (k0 == 1) { @@ -5236,9 +5236,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_recNoiseEnergy2_HE7->Fill(double(kkk), double(k3), recNoiseEnergy2[k0][k1][k2][k3]); } } //k3 - } //k2 - } //k1 - } //if k0 == 1 HE + } //k2 + } //k1 + } //if k0 == 1 HE // HF: 4 depthes for Digis and only 2 - for Reco !!! ('ve tried to enter 4 for reco since 31.10.2021 AZ) if (k0 == 3) { @@ -5283,9 +5283,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_recNoiseEnergy2_HF4->Fill(double(kkk), double(k3), recNoiseEnergy2[k0][k1][k2][k3]); } } //k3 - } //k2 - } //k1 - } //if k0 == 3 HF + } //k2 + } //k1 + } //if k0 == 3 HF } //k0 @@ -5305,9 +5305,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS // N phi sectors w/ digihits ++mapRADDAM_HED20[k1][k2]; } //if - } //for - } //for - } //for + } //for + } //for + } //for //////////////--------------------------------------------------------------------------------- 2D treatment, zraddam2.cc script for (int k1 = 0; k1 < ndepth; k1++) { @@ -5330,8 +5330,8 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS //////////////----------------------- aver per N-phi_sectors ??? mapRADDAM_HED2[k1][k2] /= mapRADDAM_HED20[k1][k2]; } // if(mapRADDAM_HED20[k1][k2] != 0 - } //for - } //for + } //for + } //for /////////////////////////////////////////// for (int k1 = 0; k1 < ndepth; k1++) { for (int k2 = 0; k2 < neta; k2++) { @@ -5366,9 +5366,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_sigLayer2RADDAM6_HED2->Fill(double(kkk - 41), 1.); } } //if - } // if(k2!=25 && k2!=56 - } //for - } //for + } // if(k2!=25 && k2!=56 + } //for + } //for //////////////--------------------------------------------------------------------------------- 3D treatment, zraddam1.cc script @@ -5404,12 +5404,12 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_sigLayer2RADDAM6_HE->Fill(double(kkk - 41), 1.); } } //if - } //for - } // if(k2!=25 && k2!=56 - } //for - } //for - // - //////////////////////////////////////////////////////////////////////////////////////////////// + } //for + } // if(k2!=25 && k2!=56 + } //for + } //for + // + //////////////////////////////////////////////////////////////////////////////////////////////// for (int k1 = 0; k1 < ndepth; k1++) { for (int k2 = 0; k2 < neta; k2++) { mapRADDAM_HED2[k1][k2] = 0.; @@ -5418,8 +5418,8 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS mapRADDAM_HE[k1][k2][k3] = 0.; mapRADDAM0_HE[k1][k2][k3] = 0; } //for - } //for - } //for + } //for + } //for //////////////////////////////////END of RADDAM treatment: } // END TREATMENT : if(flagLaserRaddam_ == 1 @@ -5496,7 +5496,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } // } //k3 - } //k2 + } //k2 // }//k1 // SA of each sub-detector DONE. Then: summarize or find maximum throught events of LS if (k0 == 0) { @@ -5525,9 +5525,9 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS h_2D0Ataildepth2_HB->Fill(double(ieta), double(k3), 1.); } } //for - } //for - } //>60000 - } //HB + } //for + } //>60000 + } //HB if (k0 == 1) { h_eventamplitude_HE->Fill((sumamplitudesubdet + sumamplitudesubdet0)); h_eventoccupancy_HE->Fill((sumofchannels + sumofchannels0)); @@ -5564,7 +5564,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS averNOSIGNALoccupancy_HF += sumofchannels0; averNOSIGNALsumamplitude_HF += sumamplitudesubdet0; } //HF - } //k0 + } //k0 ///////////////////// ///////////////////// ////////////////////////////////////////// /////////////////////////////////////////////// for zRunRatio34.C & zRunNbadchan.C scripts: @@ -5586,7 +5586,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS if (badchannels[k0][k1][k2][k3] != 0) ++nbadchannels; } //k3 - } //k2 + } //k2 ////////// //HB if (k0 == 0) { @@ -5795,7 +5795,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS ////////// } //k1 - } //k0 + } //k0 //////////// } //if(recordHistoes_&& studyRunDependenceHist_) @@ -5858,7 +5858,7 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS double aaaaaa = (ii + 1) - aveamplitude; double aaaaaa2 = aaaaaa * aaaaaa; rmsamp += (aaaaaa2 * ampldefault); // fC - } //for 2 + } //for 2 double rmsamplitude = -100.; if ((amplitude > 0 && rmsamp > 0) || (amplitude < 0 && rmsamp < 0)) rmsamplitude = sqrt(rmsamp / amplitude); @@ -5905,14 +5905,14 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS calibcapiderror[cal_det - 1][ieta + 41][iphi] = 100; } // if(cal_det>0 && cal_det<5 - } //if(recordHistoes_ && studyCalibCellsHist_) + } //if(recordHistoes_ && studyCalibCellsHist_) ///////////////////////////////////////////// if (recordNtuples_ && nevent50 < maxNeventsInNtuple_) { } //if(recordNtuples_) { } //for(HcalCalibDigiCollection - } //if(calib.isValid( + } //if(calib.isValid( /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// if (recordHistoes_ && studyCalibCellsHist_) { ////////////////////////////////////for loop for zcalib.C and zgain.C scripts: @@ -6210,8 +6210,8 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS } // if(signal[k1][k2][k3]>0.) ////////// } // k3 - } // k2 - } // k1 + } // k2 + } // k1 ///// @@ -8630,7 +8630,7 @@ void CMTRawAnalyzer::fillDigiErrorsQIE11(QIE11DataFrame qie11df) { h_nadccounts2_HE->Fill(float(ampts[7]), 1.); } } // nadccounts2 - } // sub + } // sub if (sticking) { error1 = 1; if (verbosity == 444444) { @@ -9971,7 +9971,7 @@ void CMTRawAnalyzer::fillDigiAmplitude(HBHEDigiCollection::const_iterator& digiI } // } //amplitude > 60. - } // END RADDAM + } // END RADDAM /////////////////////////////// for HE All if (mdepth == 1) @@ -9981,7 +9981,7 @@ void CMTRawAnalyzer::fillDigiAmplitude(HBHEDigiCollection::const_iterator& digiI if (mdepth == 3) h_mapDepth3_HE->Fill(double(ieta), double(iphi), 1.); } //if ( sub == 2 ) - // + // } // fillDigiAmplitude //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -10234,7 +10234,7 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) { tocampl *= corrfortxa; } } // sub == 2 HE charge correction end - } //flagsipmcorrection_ + } //flagsipmcorrection_ /////// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!! fillDigiAmplitudeQIE11 // sub=1||2 HBHE if (sub == 1 || sub == 2) { @@ -10392,8 +10392,8 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) { h_shape_good_channels_HE->Fill(float(ii), ampldefault); h_shape0_good_channels_HE->Fill(float(ii), 1.); } // ii - } // else for good channels - } // sub HE + } // else for good channels + } // sub HE ///////////////////////////////////////Digis : over all digiHits sum0Estimator[sub - 1][mdepth - 1][ieta + 41][iphi] += 1.; // for Error B-type @@ -11158,7 +11158,7 @@ void CMTRawAnalyzer::fillDigiAmplitudeQIE11(QIE11DataFrame qie11df) { } // select entries only in TS=2 } //if ( sub == 2 ) - // + // } ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// void CMTRawAnalyzer::fillDigiAmplitudeHF(HFDigiCollection::const_iterator& digiItr) { @@ -12306,7 +12306,7 @@ void CMTRawAnalyzer::fillDigiAmplitudeHO(HODigiCollection::const_iterator& digiI timeww += (ii + 1) * ampldefault; if (ii < 3 && ampldefault > 0.) flagTS012 = 1; - } //for 1 + } //for 1 amplitudechannel[sub - 1][mdepth - 1][ieta + 41][iphi] += amplitude; // 0-neta ; 0-71 HO pedestalaver9 /= TSsize; @@ -13485,9 +13485,9 @@ void CMTRawAnalyzer::endRun(const edm::Run& r, const edm::EventSetup& iSetup) { /// /// } //for - } //for - } //for - } //for + } //for + } //for + } //for //------------------------------------------------------ averSIGNAL averSIGNALoccupancy_HB /= float(nevcounter0); @@ -13568,7 +13568,7 @@ void CMTRawAnalyzer::endRun(const edm::Run& r, const edm::EventSetup& iSetup) { maxxOCCUP4 = 0.; } //if( nevcounter0 != 0 ) - /////////////////////////////// ------------------------------------------------------------------- + /////////////////////////////// ------------------------------------------------------------------- std::cout << " ==== Edn of run " << std::endl; } @@ -13675,8 +13675,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta for (int eta = 1; eta <= 16; eta++) { for (int phi = 1; phi <= nphi; phi++) { for (int depth = 1; depth <= 2; depth++) { @@ -13697,8 +13697,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta // HE for (int eta = -20; eta <= -20; eta++) { @@ -13721,8 +13721,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta for (int eta = -19; eta <= -16; eta++) { for (int phi = nphi; phi <= nphi; phi++) { @@ -13744,8 +13744,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta for (int eta = -29; eta <= -16; eta++) { for (int phi = 1; phi <= 71; phi++) { for (int depth = 1; depth <= 3; depth++) { @@ -13766,8 +13766,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta for (int eta = 16; eta <= 29; eta++) { for (int phi = 1; phi <= nphi; phi++) { for (int depth = 1; depth <= 3; depth++) { @@ -13788,8 +13788,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta // HF @@ -13813,8 +13813,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta for (int eta = 29; eta <= 41; eta++) { for (int phi = 1; phi <= nphi; phi += 2) { @@ -13836,8 +13836,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta // HO @@ -13861,8 +13861,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta for (int eta = 1; eta <= 15; eta++) { for (int phi = 1; phi <= nphi; phi++) { @@ -13884,8 +13884,8 @@ void CMTRawAnalyzer::fillMAP() { MAPfile << "}," << std::endl; delete detid; } //Depth - } //Phi - } //Eta + } //Phi + } //Eta MAPfile << "};" << std::endl; MAPfile << std::endl; diff --git a/DPGAnalysis/MuonTools/plugins/MuCSCTnPFlatTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuCSCTnPFlatTableProducer.cc index ad0b36aa31e45..3590d04680fb5 100644 --- a/DPGAnalysis/MuonTools/plugins/MuCSCTnPFlatTableProducer.cc +++ b/DPGAnalysis/MuonTools/plugins/MuCSCTnPFlatTableProducer.cc @@ -527,8 +527,8 @@ void MuCSCTnPFlatTableProducer::fillTable(edm::Event& ev) { } } // end loop over CSC Z planes - } // endl loop over tracks - } // end loop over muons + } // endl loop over tracks + } // end loop over muons } // End if good physics objects diff --git a/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc b/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc index f7e96197b8885..6a56f33c93a84 100644 --- a/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc +++ b/DPGAnalysis/MuonTools/plugins/MuGEMMuonExtTableProducer.cc @@ -360,9 +360,9 @@ void MuGEMMuonExtTableProducer::fillTable(edm::Event& ev) { propagated_isinsideout.push_back(is_insideout); propagated_isincoming.push_back(is_incoming); - } //propagation is inside boundaries - } //loop on EtaPartitions - } //is_csc therefore perform propagation + } //propagation is inside boundaries + } //loop on EtaPartitions + } //is_csc therefore perform propagation } else { //!muon.outerTrack().isNull() innermost_x.push_back(DEFAULT_DOUBLE_VAL); innermost_y.push_back(DEFAULT_DOUBLE_VAL); diff --git a/DPGAnalysis/SiStripTools/interface/APVCyclePhaseCollection.h b/DPGAnalysis/SiStripTools/interface/APVCyclePhaseCollection.h index 0bbf59375a20d..a17753d354486 100644 --- a/DPGAnalysis/SiStripTools/interface/APVCyclePhaseCollection.h +++ b/DPGAnalysis/SiStripTools/interface/APVCyclePhaseCollection.h @@ -7,8 +7,8 @@ class APVCyclePhaseCollection { public: - APVCyclePhaseCollection() : _apvmap(){}; - ~APVCyclePhaseCollection(){}; + APVCyclePhaseCollection() : _apvmap() {} + ~APVCyclePhaseCollection() {} const std::map& get() const { return _apvmap; }; diff --git a/DPGAnalysis/SiStripTools/interface/DigiBXCorrHistogramMaker.h b/DPGAnalysis/SiStripTools/interface/DigiBXCorrHistogramMaker.h index fa1773d91aac1..923bd46809439 100644 --- a/DPGAnalysis/SiStripTools/interface/DigiBXCorrHistogramMaker.h +++ b/DPGAnalysis/SiStripTools/interface/DigiBXCorrHistogramMaker.h @@ -25,7 +25,7 @@ class DigiBXCorrHistogramMaker { DigiBXCorrHistogramMaker(edm::ConsumesCollector&& iC, const int ncorbins = 1000); DigiBXCorrHistogramMaker(const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iC); - ~DigiBXCorrHistogramMaker(){}; + ~DigiBXCorrHistogramMaker() {} void book(const char* dirname, const std::map& labels); void beginRun(const unsigned int nrun); diff --git a/DPGAnalysis/SiStripTools/interface/DigiCollectionProfiler.h b/DPGAnalysis/SiStripTools/interface/DigiCollectionProfiler.h index bac4482c1a961..09a12f1519988 100644 --- a/DPGAnalysis/SiStripTools/interface/DigiCollectionProfiler.h +++ b/DPGAnalysis/SiStripTools/interface/DigiCollectionProfiler.h @@ -20,7 +20,7 @@ class DigiCollectionProfiler { public: DigiCollectionProfiler(); DigiCollectionProfiler(const edm::ParameterSet& iConfig); - ~DigiCollectionProfiler(){}; + ~DigiCollectionProfiler() {} void fill(edm::Handle digis, const std::vector&, diff --git a/DPGAnalysis/Skims/src/CSCSkim.cc b/DPGAnalysis/Skims/src/CSCSkim.cc index 57f7f8ae06130..93d5c69d45409 100644 --- a/DPGAnalysis/Skims/src/CSCSkim.cc +++ b/DPGAnalysis/Skims/src/CSCSkim.cc @@ -830,7 +830,7 @@ bool CSCSkim::doDTOverlap(Handle cscSegments) { } } } // this is a good segment - } // end loop over segments + } // end loop over segments // --------------------------------------------- // veto messy events @@ -972,7 +972,7 @@ bool CSCSkim::doHaloLike(Handle cscSegments) { } } } // this is a good segment - } // end loop over segments + } // end loop over segments // --------------------------------------------- // veto messy events @@ -1262,7 +1262,7 @@ bool CSCSkim::doBFieldStudySelection(edm::Handle saMuons, } } // this is a global muon - } // end loop over stand-alone muon collection + } // end loop over stand-alone muon collection //----------------------------------- // do we accept this event? diff --git a/DPGAnalysis/Skims/src/PickEvents.cc b/DPGAnalysis/Skims/src/PickEvents.cc index 1ce402347a99d..4d8cdc4a89aab 100644 --- a/DPGAnalysis/Skims/src/PickEvents.cc +++ b/DPGAnalysis/Skims/src/PickEvents.cc @@ -140,7 +140,7 @@ bool PickEvents::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) { } } - } // end of isRunLsBased_ + } // end of isRunLsBased_ else { // !isRunLsBased_ for (unsigned int cond = 0; cond < whattodo.size(); cond++) { diff --git a/DQM/BeamMonitor/plugins/BeamMonitor.cc b/DQM/BeamMonitor/plugins/BeamMonitor.cc index fdd12ec8a4732..705cbc16e02a8 100644 --- a/DQM/BeamMonitor/plugins/BeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/BeamMonitor.cc @@ -572,7 +572,7 @@ void BeamMonitor::beginLuminosityBlock(const LuminosityBlock& lumiSeg, const Eve mapBeginBSTime[countLumi_] = ftmptime; mapBeginPVTime[countLumi_] = ftmptime; } //processed fails for last lumi - } //nthLumi > nextlumi + } //nthLumi > nextlumi if (StartAverage_) { //Just Make sure it get rest @@ -742,9 +742,9 @@ void BeamMonitor::analyze(const Event& iEvent, const EventSetup& iSetup) { if (triggerResults->accept(thisTrigger_)) JetTrigPass = true; } //if trigger found - } //for(t=0;..) - } //for(i=0; ..) - } //if trigger colleciton exist) + } //for(t=0;..) + } //for(i=0; ..) + } //if trigger colleciton exist) //------ Primary Vertices------- edm::Handle PVCollection; @@ -1106,7 +1106,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& h_PVz[1]->getTH1()->Fit(fgaus.get(), "QLM"); } } //check if found min Vertices - } //do PVfit + } //do PVfit if ((resetPVNLumi_ > 0 && countLumi_ == resetPVNLumi_) || StartAverage_) { beginLumiOfPVFit_ = 0; @@ -1468,7 +1468,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& } edm::LogInfo("BeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline payload created \n" << std::endl; - } //if (theBeamFitter->runPVandTrkFitter()) + } //if (theBeamFitter->runPVandTrkFitter()) else { // beam fit fails reco::BeamSpot bs = theBeamFitter->getBeamSpot(); edm::LogInfo("BeamMonitor") << "FitAndFill:: [BeamMonitor] Beam fit fails!!! \n" << endl; @@ -1490,7 +1490,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& hs[k_z0_lumi]->ShiftFillLast(bs.z0(), bs.z0Error(), fitNLumi_); } // end of beam fit fails - } //-------- end of countFitting------------------------------------------ + } //-------- end of countFitting------------------------------------------ else { // no fit // Overwrite Fit LS and fit time when no event processed or no track selected theBeamFitter->setFitLSRange(beginLumiOfBSFit_, endLumiOfBSFit_); diff --git a/DQM/BeamMonitor/plugins/BeamMonitorBx.cc b/DQM/BeamMonitor/plugins/BeamMonitorBx.cc index 6fe5ac7e6dea8..897d43ae05773 100644 --- a/DQM/BeamMonitor/plugins/BeamMonitorBx.cc +++ b/DQM/BeamMonitor/plugins/BeamMonitorBx.cc @@ -312,7 +312,7 @@ void BeamMonitorBx::BookTrendHistos( } } } //End of variable loop - } // End of type loop (lumi, time) + } // End of type loop (lumi, time) // num of PVs(#Bx) per LS dbe_->cd(monitorName_ + subDir_ + "/All_nPVs"); diff --git a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc index eb1410b6fb6cb..c7897b2ba79b0 100644 --- a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc @@ -559,7 +559,7 @@ void FakeBeamMonitor::beginLuminosityBlock(const LuminosityBlock& lumiSeg, const mapBeginBSTime[countLumi_] = ftmptime; mapBeginPVTime[countLumi_] = ftmptime; } //processed fails for last lumi - } //nthLumi > nextlumi + } //nthLumi > nextlumi if (StartAverage_) { //Just Make sure it get rest @@ -1059,7 +1059,7 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, h_PVz[1]->getTH1()->Fit(fgaus.get(), "QLM"); } } //check if found min Vertices - // } //do PVfit + // } //do PVfit if ((resetPVNLumi_ > 0 && countLumi_ == resetPVNLumi_) || StartAverage_) { beginLumiOfPVFit_ = 0; diff --git a/DQM/CSCMonitorModule/plugins/CSCDQM_Configuration.h b/DQM/CSCMonitorModule/plugins/CSCDQM_Configuration.h index 9df35b0f0f48b..168f8ef1f3764 100644 --- a/DQM/CSCMonitorModule/plugins/CSCDQM_Configuration.h +++ b/DQM/CSCMonitorModule/plugins/CSCDQM_Configuration.h @@ -149,7 +149,7 @@ #define CONFIG_PARAMETER_LOADPS_MACRO(r, data, i, elem) \ BOOST_PP_CAT(set, BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)) \ (ps.getUntrackedParameter( \ - BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)), \ + BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)), \ BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 2, elem))); #endif @@ -157,10 +157,10 @@ #ifdef DQMLOCAL /** Load parameter from XML node line (Local DQM) */ -#define CONFIG_PARAMETER_LOADXML_MACRO(r, data, i, elem) \ +#define CONFIG_PARAMETER_LOADXML_MACRO(r, data, i, elem) \ if (nodeName.compare(BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem))) == 0) { \ - stm >> BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem); \ - continue; \ + stm >> BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem); \ + continue; \ } /** Include parameter into XML stream for printing */ @@ -169,7 +169,7 @@ DOMComment* comment = \ doc->createComment(XERCES_TRANSCODE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 3, elem))); \ DOMElement* el = doc->createElement( \ - XERCES_TRANSCODE(BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)))); \ + XERCES_TRANSCODE(BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem)))); \ std::string value = toString(config.BOOST_PP_CAT(get, BOOST_PP_TUPLE_ELEM(CONFIG_PARAMETERS_SEQ_LEN, 1, elem))()); \ DOMText* tdata = doc->createTextNode(XERCES_TRANSCODE(value.c_str())); \ el->appendChild(tdata); \ diff --git a/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processCSC.cc b/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processCSC.cc index 3e2846656a34f..7151407cda98c 100644 --- a/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processCSC.cc +++ b/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processCSC.cc @@ -358,7 +358,7 @@ namespace cscdqm { mo->Fill(0.0); float alct_dav_number = mo->GetBinContent(1); if (getCSCHisto(h::CSC_DMB_FEB_DAV_EFFICIENCY, crateID, dmbID, mo)) { - mo->SetBinContent(1, ((float)alct_dav_number / (float)(DMBEvents)*100.0)); + mo->SetBinContent(1, ((float)alct_dav_number / (float)(DMBEvents) * 100.0)); mo->SetEntries((int)DMBEvents); } } @@ -367,7 +367,7 @@ namespace cscdqm { mo->Fill(1.0); float tmb_dav_number = mo->GetBinContent(2); if (getCSCHisto(h::CSC_DMB_FEB_DAV_EFFICIENCY, crateID, dmbID, mo)) { - mo->SetBinContent(2, ((float)tmb_dav_number / (float)(DMBEvents)*100.0)); + mo->SetBinContent(2, ((float)tmb_dav_number / (float)(DMBEvents) * 100.0)); mo->SetEntries((int)DMBEvents); } } @@ -376,7 +376,7 @@ namespace cscdqm { mo->Fill(2.0); float cfeb_dav2_number = mo->GetBinContent(3); if (getCSCHisto(h::CSC_DMB_FEB_DAV_EFFICIENCY, crateID, dmbID, mo)) { - mo->SetBinContent(3, ((float)cfeb_dav2_number / (float)(DMBEvents)*100.0)); + mo->SetBinContent(3, ((float)cfeb_dav2_number / (float)(DMBEvents) * 100.0)); mo->SetEntries((int)DMBEvents); } } @@ -404,7 +404,7 @@ namespace cscdqm { float feb_combination_dav_number = mo->GetBinContent((int)(feb_combination_dav + 1.0)); if (getCSCHisto(h::CSC_DMB_FEB_COMBINATIONS_DAV_EFFICIENCY, crateID, dmbID, mo)) { mo->SetBinContent((int)(feb_combination_dav + 1.0), - ((float)feb_combination_dav_number / (float)(DMBEvents)*100.0)); + ((float)feb_combination_dav_number / (float)(DMBEvents) * 100.0)); mo->SetEntries((int)DMBEvents); } } @@ -444,7 +444,7 @@ namespace cscdqm { if (config->getNEvents() > 0) { /** KK */ /** h[hname]->SetBinContent(3, ((float)ALCTEvent/(float)(config->getNEvents()) * 100.0)); */ - mo->SetBinContent(1, ((float)ALCTEvent / (float)(DMBEvents)*100.0)); + mo->SetBinContent(1, ((float)ALCTEvent / (float)(DMBEvents) * 100.0)); /** KKend */ mo->SetEntries((int)DMBEvents); } @@ -503,7 +503,7 @@ namespace cscdqm { mo->Fill(alctsDatas.size()); int nALCT = (int)mo->GetBinContent((int)(alctsDatas.size() + 1)); if (getCSCHisto(h::CSC_ALCT_NUMBER_EFFICIENCY, crateID, dmbID, mo)) - mo->SetBinContent((int)(alctsDatas.size() + 1), (float)(nALCT) / (float)(DMBEvents)*100.0); + mo->SetBinContent((int)(alctsDatas.size() + 1), (float)(nALCT) / (float)(DMBEvents) * 100.0); } if (getCSCHisto(h::CSC_ALCT_WORD_COUNT, crateID, dmbID, mo)) @@ -790,7 +790,7 @@ namespace cscdqm { mo->Fill(0); int nALCT = (int)mo->GetBinContent(1); if (getCSCHisto(h::CSC_ALCT_NUMBER_EFFICIENCY, crateID, dmbID, mo)) - mo->SetBinContent(1, (float)(nALCT) / (float)(DMBEvents)*100.0); + mo->SetBinContent(1, (float)(nALCT) / (float)(DMBEvents) * 100.0); } if ((alct_dav > 0) && (getCSCHisto(h::CSC_DMB_FEB_UNPACKED_VS_DAV, crateID, dmbID, mo))) { @@ -959,12 +959,12 @@ namespace cscdqm { /// Fill summary GEM VFATs occupancies plots for endcaps if ((cid.endcap() == 1) && getEMUHisto(h::EMU_GEM_PLUS_ENDCAP_VFAT_OCCUPANCY, mo)) { int vfat = (pads_hits[0] / 192) + ((pads_hits[0] % 192) / 64) * 8; - mo->Fill((cscPosition)*2 + i - 1, vfat); + mo->Fill((cscPosition) * 2 + i - 1, vfat); } if ((cid.endcap() == 2) && getEMUHisto(h::EMU_GEM_MINUS_ENDCAP_VFAT_OCCUPANCY, mo)) { int vfat = (pads_hits[0] / 192) + ((pads_hits[0] % 192) / 64) * 8; - mo->Fill((cscPosition)*2 + i - 1, vfat); + mo->Fill((cscPosition) * 2 + i - 1, vfat); } for (unsigned pad = 0; pad < pads_hits.size(); pad++) { @@ -1042,7 +1042,7 @@ namespace cscdqm { } } } // OTMB hasGEM - } // isGEM_df + } // isGEM_df /// Summary occupancy plot for Anode HMT bits from OTMB if (getEMUHisto(h::EMU_CSC_ANODE_HMT_REPORTING, mo)) { @@ -1389,7 +1389,7 @@ namespace cscdqm { config->setChamberCounterValue(CLCT_TRIGGERS, crateID, dmbID, CLCTEvent); if (getCSCHisto(h::CSC_CSC_EFFICIENCY, crateID, dmbID, mo)) { if (config->getNEvents() > 0) { - mo->SetBinContent(2, ((float)CLCTEvent / (float)(DMBEvents)*100.0)); + mo->SetBinContent(2, ((float)CLCTEvent / (float)(DMBEvents) * 100.0)); mo->SetEntries(DMBEvents); } } @@ -1440,7 +1440,7 @@ namespace cscdqm { mo->Fill(clctsDatas.size()); int nCLCT = (int)mo->GetBinContent((int)(clctsDatas.size() + 1)); if (getCSCHisto(h::CSC_CLCT_NUMBER, crateID, dmbID, mo)) - mo->SetBinContent((int)(clctsDatas.size() + 1), (float)(nCLCT) / (float)(DMBEvents)*100.0); + mo->SetBinContent((int)(clctsDatas.size() + 1), (float)(nCLCT) / (float)(DMBEvents) * 100.0); } if (clctsDatas.size() == 1) { @@ -1804,7 +1804,7 @@ namespace cscdqm { mo->Fill(0); int nCLCT = (int)mo->GetBinContent(1); if (getCSCHisto(h::CSC_CLCT_NUMBER, crateID, dmbID, mo)) - mo->SetBinContent(1, (float)(nCLCT) / (float)(DMBEvents)*100.0); + mo->SetBinContent(1, (float)(nCLCT) / (float)(DMBEvents) * 100.0); } if ((tmb_dav > 0) && (getCSCHisto(h::CSC_DMB_FEB_UNPACKED_VS_DAV, crateID, dmbID, mo))) { mo->Fill(1.0, 1.0); @@ -1886,7 +1886,7 @@ namespace cscdqm { config->setChamberCounterValue(CFEB_TRIGGERS, crateID, dmbID, CFEBEvent); if (getCSCHisto(h::CSC_CSC_EFFICIENCY, crateID, dmbID, mo)) { if (config->getNEvents() > 0) { - mo->SetBinContent(3, ((float)CFEBEvent / (float)(DMBEvents)*100.0)); + mo->SetBinContent(3, ((float)CFEBEvent / (float)(DMBEvents) * 100.0)); mo->SetEntries((int)DMBEvents); } } diff --git a/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processExaminer.cc b/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processExaminer.cc index d1f6c07a95866..85cc62d13e28e 100644 --- a/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processExaminer.cc +++ b/DQM/CSCMonitorModule/plugins/CSCDQM_EventProcessor_processExaminer.cc @@ -184,7 +184,7 @@ namespace cscdqm { mo->Fill(i); } float cfeb_entries = mo->GetBinContent(i + 1); - mof->SetBinContent(i + 1, ((float)cfeb_entries / (float)(DMBEvents)*100.0)); + mof->SetBinContent(i + 1, ((float)cfeb_entries / (float)(DMBEvents) * 100.0)); } mof->SetEntries((int)DMBEvents); } @@ -193,7 +193,7 @@ namespace cscdqm { getCSCHisto(h::CSC_ACTUAL_DMB_CFEB_DAV_MULTIPLICITY_FREQUENCY, crateID, dmbSlot, mof)) { for (unsigned short i = 1; i < 7; i++) { float cfeb_entries = mo->GetBinContent(i); - mof->SetBinContent(i, ((float)cfeb_entries / (float)(DMBEvents)*100.0)); + mof->SetBinContent(i, ((float)cfeb_entries / (float)(DMBEvents) * 100.0)); } mof->SetEntries((int)DMBEvents); @@ -219,7 +219,7 @@ namespace cscdqm { if (getCSCHisto(h::CSC_ACTUAL_DMB_FEB_DAV_FREQUENCY, crateID, dmbSlot, mo1)) { for (int i = 1; i < 4; i++) { float dav_num = mo->GetBinContent(i); - mo1->SetBinContent(i, ((float)dav_num / (float)(DMBEvents)*100.0)); + mo1->SetBinContent(i, ((float)dav_num / (float)(DMBEvents) * 100.0)); } mo1->SetEntries((int)DMBEvents); @@ -272,7 +272,7 @@ namespace cscdqm { if (getCSCHisto(h::CSC_ACTUAL_DMB_FEB_COMBINATIONS_DAV_FREQUENCY, crateID, dmbSlot, mo1)) { for (int i = 1; i < 9; i++) { float feb_combination_dav_number = mo->GetBinContent(i); - mo1->SetBinContent(i, ((float)feb_combination_dav_number / (float)(DMBEvents)*100.0)); + mo1->SetBinContent(i, ((float)feb_combination_dav_number / (float)(DMBEvents) * 100.0)); } mo1->SetEntries(DMBEvents); diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc index bf686120ae6d8..ae2f602e0efd7 100644 --- a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc @@ -114,7 +114,7 @@ class CTPPSDiamondDQMSource : public DQMOneEDAnalyzer rocMapping = mapping->ROCMapping; @@ -1240,8 +1240,8 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const } // end if(RPindexValid[index]) { } } // end if(StationStatus[station]) { - } // end for(const auto &ds_error : *pixDigi) - } // if(pixError.isValid()) + } // end for(const auto &ds_error : *pixDigi) + } // if(pixError.isValid()) if (pixClus.isValid() && onlinePlots) for (const auto &ds : *pixClus) { diff --git a/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc b/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc index 9c3734d8e8e96..7730a626d1682 100644 --- a/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSRandomDQMSource.cc @@ -147,8 +147,8 @@ void CTPPSRandomDQMSource::bookHistograms(DQMStore::IBooker &ibooker, edm::Run c h2HitsVsBXRandoms_[indexP]->getTH2F()->SetOption("colz"); } // end for(int rp=0; rp { MonitorElement *hitDistribution2d = nullptr; MonitorElement *recHitTime = nullptr; - PotPlots(){}; + PotPlots() {} PotPlots(DQMStore::IBooker &ibooker, unsigned int id); }; diff --git a/DQM/CTPPS/plugins/DiamondSampicDQMSource.cc b/DQM/CTPPS/plugins/DiamondSampicDQMSource.cc index f867d8ffa9bc3..88eb7ddb62fea 100644 --- a/DQM/CTPPS/plugins/DiamondSampicDQMSource.cc +++ b/DQM/CTPPS/plugins/DiamondSampicDQMSource.cc @@ -106,7 +106,7 @@ class DiamondSampicDQMSource : public DQMOneEDAnalyzer sectorPlots_; @@ -146,7 +146,7 @@ class DiamondSampicDQMSource : public DQMOneEDAnalyzer planesWithDigisSet; std::set planesWithTimeSet; - PotPlots(){}; + PotPlots() {} PotPlots(DQMStore::IBooker &ibooker, unsigned int id, bool plotOnline); }; diff --git a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc index a863e564ff112..2a458e4922f68 100644 --- a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc +++ b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc @@ -158,7 +158,7 @@ class TotemTimingDQMSource : public DQMOneEDAnalyzer planesWithDigisSet; std::set planesWithTimeSet; - PotPlots(){}; + PotPlots() {} PotPlots(DQMStore::IBooker &ibooker, unsigned int id); }; diff --git a/DQM/DTMonitorClient/src/DTBlockedROChannelsTest.cc b/DQM/DTMonitorClient/src/DTBlockedROChannelsTest.cc index ea8c9801018da..3bf49486f6212 100644 --- a/DQM/DTMonitorClient/src/DTBlockedROChannelsTest.cc +++ b/DQM/DTMonitorClient/src/DTBlockedROChannelsTest.cc @@ -89,9 +89,9 @@ void DTBlockedROChannelsTest::fillChamberMap(DQMStore::IGetter& igetter, const E << " not in the mapping!" << endl; } } //loop on links - } //loop on mapSlots - } //loop on crates - } //checkUros + } //loop on mapSlots + } //loop on crates + } //checkUros else { // fill the map of the robs per chamber // //FIXME: monitoring only real used FEDs @@ -249,7 +249,7 @@ void DTBlockedROChannelsTest::performClientDiagnostic(DQMStore::IGetter& igetter // Fill the summary summaryHisto->Fill(sectorForPlot, chId.wheel(), 0.25 * scale * chPercent); } - } //Uros case + } //Uros case else { //Legacy case // loop over all chambers and fill the wheel plots for (map::iterator chAndRobs = chamberMap.begin(); chAndRobs != chamberMap.end(); @@ -275,7 +275,7 @@ void DTBlockedROChannelsTest::performClientDiagnostic(DQMStore::IGetter& igetter summaryHisto->Fill(sectorForPlot, chId.wheel(), 0.25 * scale * chPercent); } } //Legacy case - } //nevents != 0 + } //nevents != 0 if (!offlineMode) { // fill trend histo only in online hSystFractionVsLS->accumulateValueTimeSlot(totalPerc); diff --git a/DQM/DTMonitorClient/src/DTDataIntegrityTest.cc b/DQM/DTMonitorClient/src/DTDataIntegrityTest.cc index 579661932c0fc..31d3a25af08f3 100644 --- a/DQM/DTMonitorClient/src/DTDataIntegrityTest.cc +++ b/DQM/DTMonitorClient/src/DTDataIntegrityTest.cc @@ -225,9 +225,9 @@ void DTDataIntegrityTest::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker, if (nFEDEvtsUros != 0) sectPerc2 = max((float)0., ((float)nFEDEvtsUros - nErrors2) / (float)nFEDEvtsUros); glbSummaryHisto->setBinContent(iros, wheel * 2 + 3, sectPerc2); - } //loop in three ros - } // this uROS is active - } //loop on uros + } //loop in three ros + } // this uROS is active + } //loop on uros } else { // no data in this FED: it is off, no ROS suummary/status or evLength and fedNotReadout for (int i = 1; i <= DOCESLOTS; ++i) { summaryHisto->setBinContent(i, wheel + 3, 0.5); @@ -239,7 +239,7 @@ void DTDataIntegrityTest::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker, summaryTDCHisto->setBinContent(i, wheel * 2 + 3, 1.5); glbSummaryHisto->setBinContent(i, wheel * 2 + 3, 0.5); } //loop on uros - } // no data in this FED: it is off, no ROS suummary/status or evLength + } // no data in this FED: it is off, no ROS suummary/status or evLength } //FEDentry diff --git a/DQM/DTMonitorClient/src/DTEfficiencyTest.cc b/DQM/DTMonitorClient/src/DTEfficiencyTest.cc index 81d547138ca24..39c3ce8554172 100644 --- a/DQM/DTMonitorClient/src/DTEfficiencyTest.cc +++ b/DQM/DTMonitorClient/src/DTEfficiencyTest.cc @@ -172,8 +172,8 @@ void DTEfficiencyTest::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker, } } } // loop on layers - } // loop on superlayers - } //loop on chambers + } // loop on superlayers + } //loop on chambers // Efficiency test //cout<<"[DTEfficiencyTest]: Efficiency Tests results"<()){}; + DTLocalTriggerBaseTest() : muonGeomToken_(esConsumes()) {} /// Destructor ~DTLocalTriggerBaseTest() override; diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc index bdf478dcb6c2f..cd0175129efa9 100644 --- a/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc +++ b/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc @@ -321,7 +321,7 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker& ibooker, DQMStor } // closes BXvsQual && Flag1stvsQual && BestQual } // Check on TM source - //Theta part + //Theta part if (hwSource == "TM") { // Perform TM plot analysis (Theta ones) TH2F* ThetaPosvsBX = getHisto(igetter.get(getMEName("PositionvsBX", "LocalTriggerTheta", chId))); diff --git a/DQM/DTMonitorClient/src/DTOfflineSummaryClients.cc b/DQM/DTMonitorClient/src/DTOfflineSummaryClients.cc index 1a334e1c56907..43f06adcac9f5 100644 --- a/DQM/DTMonitorClient/src/DTOfflineSummaryClients.cc +++ b/DQM/DTMonitorClient/src/DTOfflineSummaryClients.cc @@ -35,7 +35,7 @@ DTOfflineSummaryClients::~DTOfflineSummaryClients() { << "DTOfflineSummaryClients: analyzed " << nevents << " events"; } -void DTOfflineSummaryClients::beginRun(const edm::Run& r, const edm::EventSetup& c){}; +void DTOfflineSummaryClients::beginRun(const edm::Run& r, const edm::EventSetup& c) {} void DTOfflineSummaryClients::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, diff --git a/DQM/DTMonitorClient/src/DTResolutionAnalysisTest.cc b/DQM/DTMonitorClient/src/DTResolutionAnalysisTest.cc index b1ec19d05d6c6..6dccb68b03789 100644 --- a/DQM/DTMonitorClient/src/DTResolutionAnalysisTest.cc +++ b/DQM/DTMonitorClient/src/DTResolutionAnalysisTest.cc @@ -293,7 +293,7 @@ void DTResolutionAnalysisTest::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::I << "[DTResolutionAnalysisTask] Histo: " << getMEName(slID) << " not found" << endl; } } // loop on SLs - } // Loop on Stations + } // Loop on Stations } void DTResolutionAnalysisTest::bookHistos(DQMStore::IBooker& ibooker, int wh) { diff --git a/DQM/DTMonitorClient/src/DTRunConditionVarClient.cc b/DQM/DTMonitorClient/src/DTRunConditionVarClient.cc index 161c09d01400b..a5c620110d9b9 100644 --- a/DQM/DTMonitorClient/src/DTRunConditionVarClient.cc +++ b/DQM/DTMonitorClient/src/DTRunConditionVarClient.cc @@ -243,8 +243,8 @@ void DTRunConditionVarClient::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IG } } // end loop on stations - } // end loop on sectors - } //end loop on wheels + } // end loop on sectors + } //end loop on wheels return; } diff --git a/DQM/DTMonitorModule/src/DTDataIntegrityTask.cc b/DQM/DTMonitorModule/src/DTDataIntegrityTask.cc index 4bc424ae3ac96..99cb46ae6d4ee 100644 --- a/DQM/DTMonitorModule/src/DTDataIntegrityTask.cc +++ b/DQM/DTMonitorModule/src/DTDataIntegrityTask.cc @@ -315,7 +315,7 @@ void DTDataIntegrityTask::bookHistosROS(DQMStore::IBooker& ibooker, const int wh string linkUp_s = to_string(linkUp); string histoName = "W" + wheel_s + "_" + "Sector" + ros_s + "_" + histoType; string histoTitle = histoName + " (Channel " + linkDown_s + "-" + linkUp_s + " error summary)"; - unsigned int keyHisto = (uROSError)*1000 + (wheel + 2) * 100 + (ros - 1); + unsigned int keyHisto = (uROSError) * 1000 + (wheel + 2) * 100 + (ros - 1); if (mode < 1) // Online only urosHistos[keyHisto] = ibooker.book2D(histoName, histoTitle, 11, 0, 11, 25, 0, 25); else if (mode > 1) @@ -412,7 +412,7 @@ void DTDataIntegrityTask::bookHistosROS(DQMStore::IBooker& ibooker, const int wh linkUp_s = to_string(linkUp); histoName = "W" + wheel_s + "_" + "Sector" + ros_s + "_" + histoType; histoTitle = histoName + " (Channel " + linkDown_s + "-" + linkUp_s + " error summary)"; - keyHisto = (TDCError)*1000 + (wheel + 2) * 100 + (ros - 1); + keyHisto = (TDCError) * 1000 + (wheel + 2) * 100 + (ros - 1); urosHistos[keyHisto] = ibooker.book2D(histoName, histoTitle, 24, 0, 24, 25, 0, 25); histo = urosHistos[keyHisto]; // TDC error bins @@ -504,7 +504,7 @@ void DTDataIntegrityTask::bookHistosuROS(DQMStore::IBooker& ibooker, const int f string histoType = "uROSEventLength"; string histoName = "FED" + fed_s + "_uROS" + uRos_s + "_" + "EventLength"; string histoTitle = "Event Length (Bytes) FED " + fed_s + " uROS" + uRos_s; - unsigned int keyHisto = (uROSEventLength)*1000 + (fed - FEDIDmin) * 100 + (uRos - 1); + unsigned int keyHisto = (uROSEventLength) * 1000 + (fed - FEDIDmin) * 100 + (uRos - 1); urosHistos[keyHisto] = ibooker.book1D(histoName, histoTitle, 101, 0, 5000); histoType = "uROSAvgEventLengthvsLumi"; @@ -566,10 +566,10 @@ void DTDataIntegrityTask::processuROS(DTuROSROSData& data, int fed, int uRos) { return; } - uROSError0 = urosHistos[(uROSError)*1000 + (wheel + 2) * 100 + (ros - 1)]; //links 0-23 - uROSError1 = urosHistos[(uROSError)*1000 + (wheel + 2) * 100 + (ros)]; //links 24-47 - uROSError2 = urosHistos[(uROSError)*1000 + (wheel + 2) * 100 + (ros + 1)]; //links 48-71 - uROSErrorS4 = urosHistos[(uROSError)*1000 + (wheel + 2) * 100 + 3]; + uROSError0 = urosHistos[(uROSError) * 1000 + (wheel + 2) * 100 + (ros - 1)]; //links 0-23 + uROSError1 = urosHistos[(uROSError) * 1000 + (wheel + 2) * 100 + (ros)]; //links 24-47 + uROSError2 = urosHistos[(uROSError) * 1000 + (wheel + 2) * 100 + (ros + 1)]; //links 48-71 + uROSErrorS4 = urosHistos[(uROSError) * 1000 + (wheel + 2) * 100 + 3]; if ((!uROSError2) || (!uROSError1) || (!uROSError0)) { LogError("DTRawToDigi|DTDQM|DTMonitorModule|DTDataIntegrityTask") @@ -605,9 +605,9 @@ void DTDataIntegrityTask::processuROS(DTuROSROSData& data, int fed, int uRos) { uROSError2->Fill(value - 1, link - 48); } } //flag value - } //loop on flags - } //loop on links - } //uROS>2 + } //loop on flags + } //loop on links + } //uROS>2 else { //uRos<3 25th Channel slot @@ -625,7 +625,7 @@ void DTDataIntegrityTask::processuROS(DTuROSROSData& data, int fed, int uRos) { if (sector == 9) sector = 10; unsigned int keyHisto = - (uROSError)*1000 + (wheel + 2) * 100 + abs(sector - 1); //ros -1 = link in this case + (uROSError) * 1000 + (wheel + 2) * 100 + abs(sector - 1); //ros -1 = link in this case uROSError0 = urosHistos[keyHisto]; if (!uROSError0) { LogError("DTRawToDigi|DTDQM|DTMonitorModule|DTDataIntegrityTask") @@ -638,9 +638,9 @@ void DTDataIntegrityTask::processuROS(DTuROSROSData& data, int fed, int uRos) { uROSError0->Fill(value - 1, ch25); //bins start at 0 despite labeling, this is the old SC } } //flag values - } //loop on flags - } //loop on links - } //else uRos<3 + } //loop on flags + } //loop on links + } //else uRos<3 if (mode != 1) { // Global Errors for uROS @@ -737,14 +737,14 @@ void DTDataIntegrityTask::processuROS(DTuROSROSData& data, int fed, int uRos) { ROSSummary->Fill(tdcError_ROSSummary, sector - 1); //link 0 = ROS 1 int ch25 = 24; if (mode <= 2) { - urosHistos[(uROSError)*1000 + (wheel + 2) * 100 + (sector - 1)]->Fill(tdcError_ROSError, ch25); + urosHistos[(uROSError) * 1000 + (wheel + 2) * 100 + (sector - 1)]->Fill(tdcError_ROSError, ch25); if (mode < 1) - urosHistos[(TDCError)*1000 + (wheel + 2) * 100 + (sector - 1)]->Fill(tdcError_TDCHisto + 6 * tdc, - ch25); // ros-1=link in this case - } //mode <= 2 - } //mode!=1 - } //uRos<3 - else { //uRos>2 + urosHistos[(TDCError) * 1000 + (wheel + 2) * 100 + (sector - 1)]->Fill(tdcError_TDCHisto + 6 * tdc, + ch25); // ros-1=link in this case + } //mode <= 2 + } //mode!=1 + } //uRos<3 + else { //uRos>2 if (link < 24) { if (tdcError_ROSSummary == 5) errorX[5][ros - 1][wheel + 2] += 1; @@ -783,16 +783,16 @@ void DTDataIntegrityTask::processuROS(DTuROSROSData& data, int fed, int uRos) { if (mode < 1) { if (link < 24) - urosHistos[(TDCError)*1000 + (wheel + 2) * 100 + (ros - 1)]->Fill(tdcError_TDCHisto + 6 * tdc, link); + urosHistos[(TDCError) * 1000 + (wheel + 2) * 100 + (ros - 1)]->Fill(tdcError_TDCHisto + 6 * tdc, link); else if (link < 48) - urosHistos[(TDCError)*1000 + (wheel + 2) * 100 + (ros)]->Fill(tdcError_TDCHisto + 6 * tdc, link - 24); + urosHistos[(TDCError) * 1000 + (wheel + 2) * 100 + (ros)]->Fill(tdcError_TDCHisto + 6 * tdc, link - 24); else if (link < 72) - urosHistos[(TDCError)*1000 + (wheel + 2) * 100 + (ros + 1)]->Fill(tdcError_TDCHisto + 6 * tdc, link - 48); + urosHistos[(TDCError) * 1000 + (wheel + 2) * 100 + (ros + 1)]->Fill(tdcError_TDCHisto + 6 * tdc, link - 48); } //mode<1 - } //mode<=2 && mode != 1 - } //uROS>2 - } //loop on errors + } //mode<=2 && mode != 1 + } //uROS>2 + } //loop on errors // 1D histograms for TTS values per uROS if (mode < 1) { diff --git a/DQM/DTMonitorModule/src/DTEfficiencyTask.cc b/DQM/DTMonitorModule/src/DTEfficiencyTask.cc index 26d07a1ef72f0..f97843f606f42 100644 --- a/DQM/DTMonitorModule/src/DTEfficiencyTask.cc +++ b/DQM/DTMonitorModule/src/DTEfficiencyTask.cc @@ -126,8 +126,8 @@ void DTEfficiencyTask::bookHistograms(DQMStore::IBooker& ibooker, histosPerL[layerId] = histos; } // layer - } // superlayer - } // chambers + } // superlayer + } // chambers } void DTEfficiencyTask::beginLuminosityBlock(LuminosityBlock const& lumiSeg, EventSetup const& context) { @@ -402,7 +402,7 @@ void DTEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetup& s } } // End of loop over the 4D segments inside a sigle chamber - } // End of loop over all tha chamber with at least a 4D segment in the event + } // End of loop over all tha chamber with at least a 4D segment in the event } // Fill a set of histograms for a given Layer diff --git a/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc b/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc index 454b52219f728..0a69537d18d86 100644 --- a/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc +++ b/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.cc @@ -36,7 +36,7 @@ using namespace std; class DTTPGCompareUnit { public: DTTPGCompareUnit() { m_qual = -1; } - ~DTTPGCompareUnit(){}; + ~DTTPGCompareUnit() {} void setTM(int qual, int bx) { m_qual = qual; diff --git a/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc b/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc index 5034e3f366728..02ae4896cad0d 100644 --- a/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc +++ b/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.cc @@ -197,7 +197,7 @@ void DTResolutionAnalysisTask::analyze(const edm::Event& event, const edm::Event fillHistos(wireId.superlayerId(), distSegmToWire, residual); } // End of loop over 1D RecHit inside 4D segment - } // End of loop over the rechits of this ChamerId + } // End of loop over the rechits of this ChamerId } // ----------------------------------------------------------------------------- } diff --git a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc index a94035d27b6c7..aff475ac718e0 100644 --- a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc +++ b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.cc @@ -181,8 +181,8 @@ void DTTriggerEfficiencyTask::analyze(const edm::Event& e, const edm::EventSetup } } // end loop on matched segments - } // end loop on compatible chambers - } // end loop on muons + } // end loop on compatible chambers + } // end loop on muons // Plot filling vector::const_iterator btrack; diff --git a/DQM/EcalCommon/interface/EcalMEFormatter.h b/DQM/EcalCommon/interface/EcalMEFormatter.h index 7990f24b578c2..5c564853b64f9 100644 --- a/DQM/EcalCommon/interface/EcalMEFormatter.h +++ b/DQM/EcalCommon/interface/EcalMEFormatter.h @@ -12,7 +12,7 @@ class EcalMEFormatter : public DQMEDHarvester, public ecaldqm::DQWorker { typedef dqm::harvesting::DQMStore DQMStore; EcalMEFormatter(edm::ParameterSet const &); - ~EcalMEFormatter() override{}; + ~EcalMEFormatter() override {} static void fillDescriptions(edm::ConfigurationDescriptions &); diff --git a/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py b/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py index 7f631d75a86da..2a2e61d0aecbf 100644 --- a/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py +++ b/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py @@ -27,7 +27,7 @@ kind = cms.untracked.string('TH2F'), otype = cms.untracked.string('Ecal3P'), btype = cms.untracked.string('Crystal'), - description = cms.untracked.string('Summary of the data integrity. A channel is red if more than ' + str(errFractionThreshold) + ' of its entries have integrity errors.') + description = cms.untracked.string('Summary of the data integrity. A channel is red if more than ' + str(errFractionThreshold) + ' of its entries have integrity errors. Also, an entire SuperModule can show red if more than 0.01 of its entries have DCC-SRP or DCC-TCC Desync errors.') ), Quality = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityClient/%(prefix)sIT data integrity quality %(sm)s'), diff --git a/DQM/EcalMonitorClient/src/IntegrityClient.cc b/DQM/EcalMonitorClient/src/IntegrityClient.cc index 159904346cce8..281ff3590fb1e 100644 --- a/DQM/EcalMonitorClient/src/IntegrityClient.cc +++ b/DQM/EcalMonitorClient/src/IntegrityClient.cc @@ -123,15 +123,23 @@ namespace ecaldqm { } } - // Quality check: set an entire FED to BAD if "any" DCC-SRP or DCC-TCC mismatch errors are detected + // Quality check: set an entire FED to BAD if "any" DCC-SRP or DCC-TCC mismatch errors are detected AND the number of events affected by the DCC-SRP or DCC-TCC mismatch errors is more than 1% of the events analyzed in the run // Fill mismatch statistics MESet const& sBXSRP(sources_.at("BXSRP")); MESet const& sBXTCC(sources_.at("BXTCC")); std::vector hasMismatchDCC(nDCC, false); for (unsigned iDCC(0); iDCC < nDCC; ++iDCC) { - if (sBXSRP.getBinContent(getEcalDQMSetupObjects(), iDCC + 1) > 50. || - sBXTCC.getBinContent(getEcalDQMSetupObjects(), iDCC + 1) > 50.) // "any" => 50 - hasMismatchDCC[iDCC] = true; + int nBXSRPdesync = sBXSRP.getBinContent(getEcalDQMSetupObjects(), iDCC + 1); + int nBXTCCdesync = sBXTCC.getBinContent(getEcalDQMSetupObjects(), iDCC + 1); + + if (nBXSRPdesync > 50. || nBXTCCdesync > 50.) { // "any" => 50 + if (nBXSRPdesync > int(0.01 * processedEvents) || + nBXTCCdesync > + int(0.01 * + processedEvents)) { // check if the events with DCC-SRP or DCC-TCC desyncs for the given DCC is more than 1% of the events analyzed + hasMismatchDCC[iDCC] = true; + } + } } // Analyze mismatch statistics for (MESet::iterator qsItr(meQualitySummary.beginChannel(GetElectronicsMap())); diff --git a/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py b/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py index 25c4fe7e05018..6ba4284e2e8cd 100644 --- a/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py @@ -49,6 +49,34 @@ ecalRawDataTask = cms.untracked.PSet( MEs = cms.untracked.PSet( + TrendBXTCC = cms.untracked.PSet( + path = cms.untracked.string('Ecal/Trends/RawDataTask number of %(prefix)sRDT bunch crossing TCC errors'), + kind = cms.untracked.string('TH1F'), + otype = cms.untracked.string('Ecal2P'), + btype = cms.untracked.string('Trend'), + description = cms.untracked.string('Trend of the number of bunch crossing value mismatches between DCC and TCC.') + ), + TrendL1ATCC = cms.untracked.PSet( + path = cms.untracked.string('Ecal/Trends/RawDataTask number of %(prefix)sRDT L1A TCC errors'), + kind = cms.untracked.string('TH1F'), + otype = cms.untracked.string('Ecal2P'), + btype = cms.untracked.string('Trend'), + description = cms.untracked.string('Trend of the number of L1A value mismatches between DCC and TCC.') + ), + TrendBXSRP = cms.untracked.PSet( + path = cms.untracked.string('Ecal/Trends/RawDataTask number of %(prefix)sRDT bunch crossing SRP errors'), + kind = cms.untracked.string('TH1F'), + otype = cms.untracked.string('Ecal2P'), + btype = cms.untracked.string('Trend'), + description = cms.untracked.string('Trend of the number of bunch crossing value mismatches between DCC and SRP.') + ), + TrendL1ASRP = cms.untracked.PSet( + path = cms.untracked.string('Ecal/Trends/RawDataTask number of %(prefix)sRDT L1A SRP errors'), + kind = cms.untracked.string('TH1F'), + otype = cms.untracked.string('Ecal2P'), + btype = cms.untracked.string('Trend'), + description = cms.untracked.string('Trend of the number of L1A value mismatches between DCC and SRP.') + ), BXSRP = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sRawDataTask/%(prefix)sRDT bunch crossing SRP errors'), kind = cms.untracked.string('TH1F'), diff --git a/DQM/EcalMonitorTasks/src/PiZeroTask.cc b/DQM/EcalMonitorTasks/src/PiZeroTask.cc index 22edc223cdd92..95d2f4fb45b3a 100644 --- a/DQM/EcalMonitorTasks/src/PiZeroTask.cc +++ b/DQM/EcalMonitorTasks/src/PiZeroTask.cc @@ -278,10 +278,10 @@ namespace ecaldqm { if (npi0_s == MAXPI0S) return; } // pi0 inv mass window - } // pt and S4S9 cut - } // cluster "j" index loop - } // cluster "i" index loop - } // runonEBRecHits() + } // pt and S4S9 cut + } // cluster "j" index loop + } // cluster "i" index loop + } // runonEBRecHits() DEFINE_ECALDQM_WORKER(PiZeroTask); } // namespace ecaldqm diff --git a/DQM/EcalMonitorTasks/src/PresampleTask.cc b/DQM/EcalMonitorTasks/src/PresampleTask.cc index 6e1ce28c56493..e7b512519c2cd 100644 --- a/DQM/EcalMonitorTasks/src/PresampleTask.cc +++ b/DQM/EcalMonitorTasks/src/PresampleTask.cc @@ -116,7 +116,7 @@ namespace ecaldqm { } } // _digis loop - } // runOnDigis + } // runOnDigis DEFINE_ECALDQM_WORKER(PresampleTask); } // namespace ecaldqm diff --git a/DQM/EcalMonitorTasks/src/RawDataTask.cc b/DQM/EcalMonitorTasks/src/RawDataTask.cc index 225dbac456508..041bf82222a49 100644 --- a/DQM/EcalMonitorTasks/src/RawDataTask.cc +++ b/DQM/EcalMonitorTasks/src/RawDataTask.cc @@ -88,6 +88,10 @@ namespace ecaldqm { MESet& meBXSRP(MEs_.at("BXSRP")); MESet& meL1ASRP(MEs_.at("L1ASRP")); MESet& meTrendNSyncErrors(MEs_.at("L1ATCC")); + MESet& meTrendBXTCC(MEs_.at("TrendBXTCC")); + MESet& meTrendL1ATCC(MEs_.at("TrendL1ATCC")); + MESet& meTrendBXSRP(MEs_.at("TrendBXSRP")); + MESet& meTrendL1ASRP(MEs_.at("TrendL1ASRP")); MESet& meEventTypePreCalib(MEs_.at("EventTypePreCalib")); MESet& meEventTypeCalib(MEs_.at("EventTypeCalib")); MESet& meEventTypePostCalib(MEs_.at("EventTypePostCalib")); @@ -214,30 +218,52 @@ namespace ecaldqm { if (tccBx.size() == 4) { // EB uses tccBx[0]; EE uses all if (dccId <= kEEmHigh + 1 || dccId >= kEEpLow + 1) { for (int iTCC(0); iTCC < 4; iTCC++) { - if (tccBx[iTCC] != dccBX && tccBx[iTCC] != -1 && dccBX != -1) + if (tccBx[iTCC] != dccBX && tccBx[iTCC] != -1 && dccBX != -1) { meBXTCC.fill(getEcalDQMSetupObjects(), dccId); + meTrendBXTCC.fill(getEcalDQMSetupObjects(), EcalEndcap, double(timestamp_.iLumi), 1); + } - if (tccL1[iTCC] != dccL1AShort && tccL1[iTCC] != -1 && dccL1AShort != 0) + if (tccL1[iTCC] != dccL1AShort && tccL1[iTCC] != -1 && dccL1AShort != 0) { meL1ATCC.fill(getEcalDQMSetupObjects(), dccId); + meTrendL1ATCC.fill(getEcalDQMSetupObjects(), EcalEndcap, double(timestamp_.iLumi), 1); + } } } else { - if (tccBx[0] != dccBX && tccBx[0] != -1 && dccBX != -1) + if (tccBx[0] != dccBX && tccBx[0] != -1 && dccBX != -1) { meBXTCC.fill(getEcalDQMSetupObjects(), dccId); + meTrendBXTCC.fill(getEcalDQMSetupObjects(), EcalBarrel, double(timestamp_.iLumi), 1); + } - if (tccL1[0] != dccL1AShort && tccL1[0] != -1 && dccL1AShort != 0) + if (tccL1[0] != dccL1AShort && tccL1[0] != -1 && dccL1AShort != 0) { meL1ATCC.fill(getEcalDQMSetupObjects(), dccId); + meTrendL1ATCC.fill(getEcalDQMSetupObjects(), EcalBarrel, double(timestamp_.iLumi), 1); + } } } short srpBx(dcchItr->getSRPBx()); short srpL1(dcchItr->getSRPLv1()); - if (srpBx != dccBX && srpBx != -1 && dccBX != -1) + if (srpBx != dccBX && srpBx != -1 && dccBX != -1) { meBXSRP.fill(getEcalDQMSetupObjects(), dccId); - if (srpL1 != dccL1AShort && srpL1 != -1 && dccL1AShort != 0) + if (dccId <= kEEmHigh + 1 || dccId >= kEEpLow + 1) { // EE + meTrendBXSRP.fill(getEcalDQMSetupObjects(), EcalEndcap, double(timestamp_.iLumi), 1); + } else { // EB + meTrendBXSRP.fill(getEcalDQMSetupObjects(), EcalBarrel, double(timestamp_.iLumi), 1); + } + } + + if (srpL1 != dccL1AShort && srpL1 != -1 && dccL1AShort != 0) { meL1ASRP.fill(getEcalDQMSetupObjects(), dccId); + if (dccId <= kEEmHigh + 1 || dccId >= kEEpLow + 1) { // EE + meTrendL1ASRP.fill(getEcalDQMSetupObjects(), EcalEndcap, double(timestamp_.iLumi), 1); + } else { // EB + meTrendL1ASRP.fill(getEcalDQMSetupObjects(), EcalBarrel, double(timestamp_.iLumi), 1); + } + } + const int calibBX(3490); short runType(dcchItr->getRunType() + 1); diff --git a/DQM/EcalMonitorTasks/src/TrigPrimTask.cc b/DQM/EcalMonitorTasks/src/TrigPrimTask.cc index 59ea0edb1e12f..5197562d1d527 100644 --- a/DQM/EcalMonitorTasks/src/TrigPrimTask.cc +++ b/DQM/EcalMonitorTasks/src/TrigPrimTask.cc @@ -102,7 +102,7 @@ namespace ecaldqm { //if(ttid.subDet() == EcalBarrel) meTTMaskMap.fill(getEcalDQMSetupObjects(), ttid, 1); } //masked - } //loop on towers + } //loop on towers for (EcalTPGStripStatusMap::const_iterator stItr(stripMap.begin()); stItr != stripMap.end(); ++stItr) { if ((*stItr).second > 0) { @@ -110,7 +110,7 @@ namespace ecaldqm { //if(stid.subdet() == EcalEndcap); meTTMaskMap.fill(getEcalDQMSetupObjects(), stid, 1); } //masked - } //loop on pseudo-strips + } //loop on pseudo-strips // if(HLTCaloPath_.size() || HLTMuonPath_.size()){ // edm::TriggerResultsByName results(_evt.triggerResultsByName("HLT")); @@ -266,7 +266,7 @@ namespace ecaldqm { const EcalTrigTowerDetId ttid(ttItr->first); if (ttItr->second > 0) meTTMaskMapAll.setBinContent(getEcalDQMSetupObjects(), ttid, 1); // TT is masked - } // TTs + } // TTs // Fill from Strip Status Rcd const EcalTPGStripStatusMap& StripStatusMap(StripStatus->getMap()); @@ -277,7 +277,7 @@ namespace ecaldqm { const EcalTrigTowerDetId ttid(GetElectronicsMap()->getTrigTowerDetId(stid.tccId(), stid.ttId())); if (stItr->second > 0) meTTMaskMapAll.setBinContent(getEcalDQMSetupObjects(), ttid, 1); // PseudoStrip is masked - } // PseudoStrips + } // PseudoStrips } // TrigPrimTask::runOnRealTPs() @@ -347,7 +347,7 @@ namespace ecaldqm { break; } } // Et match found - } // iDigi + } // iDigi if (matchedIndex.empty()) matchedIndex.push_back(0); // no Et match found => no emul diff --git a/DQM/GEM/interface/GEMDAQStatusSource.h b/DQM/GEM/interface/GEMDAQStatusSource.h index 2ccd5aed37606..ddf66f7b0a7a0 100644 --- a/DQM/GEM/interface/GEMDAQStatusSource.h +++ b/DQM/GEM/interface/GEMDAQStatusSource.h @@ -33,13 +33,13 @@ class GEMDAQStatusSource : public GEMDQMBase { public: explicit GEMDAQStatusSource(const edm::ParameterSet &cfg); - ~GEMDAQStatusSource() override{}; + ~GEMDAQStatusSource() override {} static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); protected: void LoadROMap(edm::EventSetup const &iSetup); - void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override{}; + void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override {} void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; diff --git a/DQM/GEM/interface/GEMDQMBase.h b/DQM/GEM/interface/GEMDQMBase.h index 86217cf85e2b2..b0166249da5da 100644 --- a/DQM/GEM/interface/GEMDQMBase.h +++ b/DQM/GEM/interface/GEMDQMBase.h @@ -102,7 +102,7 @@ class GEMDQMBase : public DQMEDAnalyzer { template class MEMapInfT { public: - MEMapInfT() : bOperating_(false), bIsNoUnderOverflowBin_(false){}; + MEMapInfT() : bOperating_(false), bIsNoUnderOverflowBin_(false) {} MEMapInfT( GEMDQMBase *pDQMBase, TString strName, TString strTitle, TString strTitleX = "", TString strTitleY = "Entries") @@ -111,7 +111,7 @@ class GEMDQMBase : public DQMEDAnalyzer { strTitle_(strTitle), strTitleX_(strTitleX), strTitleY_(strTitleY), - log_category_own_(pDQMBase->log_category_){}; + log_category_own_(pDQMBase->log_category_) {} MEMapInfT(GEMDQMBase *pDQMBase, TString strName, @@ -133,7 +133,7 @@ class GEMDQMBase : public DQMEDAnalyzer { dXL_(dXL), dXH_(dXH), nBinsY_(-1), - log_category_own_(pDQMBase->log_category_){}; + log_category_own_(pDQMBase->log_category_) {} MEMapInfT(GEMDQMBase *pDQMBase, TString strName, @@ -183,7 +183,7 @@ class GEMDQMBase : public DQMEDAnalyzer { dYH_(dYH), dZL_(0), dZH_(1024), - log_category_own_(pDQMBase->log_category_){}; + log_category_own_(pDQMBase->log_category_) {} MEMapInfT(GEMDQMBase *pDQMBase, // For TProfile2D TString strName, @@ -214,7 +214,7 @@ class GEMDQMBase : public DQMEDAnalyzer { dYH_(dYH), dZL_(dZL), dZH_(dZH), - log_category_own_(pDQMBase->log_category_){}; + log_category_own_(pDQMBase->log_category_) {} //MEMapInfT(GEMDQMBase *pDQMBase, // TString strName, @@ -238,7 +238,7 @@ class GEMDQMBase : public DQMEDAnalyzer { // dYH_(dYH), // log_category_own_(pDQMBase->log_category_){}; - ~MEMapInfT(){}; + ~MEMapInfT() {} Bool_t isOperating() { return bOperating_; }; void SetOperating(Bool_t bOperating) { bOperating_ = bOperating; }; @@ -477,7 +477,7 @@ class GEMDQMBase : public DQMEDAnalyzer { class MEStationInfo { public: - MEStationInfo() : nNumChambers_(-1){}; + MEStationInfo() : nNumChambers_(-1) {} MEStationInfo(Int_t nRegion, Int_t nStation, Int_t nLayer, @@ -500,7 +500,7 @@ class GEMDQMBase : public DQMEDAnalyzer { nNumDigi_(nNumDigi), nMinIdxChamber_(nMinIdxChamber), nMaxIdxChamber_(nMaxIdxChamber), - fMinPhi_(0){}; + fMinPhi_(0) {} bool operator==(const MEStationInfo &other) const { return (nRegion_ == other.nRegion_ && nStation_ == other.nStation_ && nLayer_ == other.nLayer_ && @@ -532,7 +532,7 @@ class GEMDQMBase : public DQMEDAnalyzer { public: explicit GEMDQMBase(const edm::ParameterSet &cfg); - ~GEMDQMBase() override{}; + ~GEMDQMBase() override {} enum { GEMDQM_RUNTYPE_ONLINE, diff --git a/DQM/GEM/interface/GEMDigiSource.h b/DQM/GEM/interface/GEMDigiSource.h index 038ac73db2de8..c200eae6292c5 100644 --- a/DQM/GEM/interface/GEMDigiSource.h +++ b/DQM/GEM/interface/GEMDigiSource.h @@ -32,13 +32,13 @@ class GEMDigiSource : public GEMDQMBase { public: explicit GEMDigiSource(const edm::ParameterSet& cfg); - ~GEMDigiSource() override{}; + ~GEMDigiSource() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); protected: void LoadROMap(edm::EventSetup const& iSetup); - void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override{}; + void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override {} void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; diff --git a/DQM/GEM/interface/GEMPadDigiClusterSource.h b/DQM/GEM/interface/GEMPadDigiClusterSource.h index d1fa8e52c8f4d..09d907942a57c 100644 --- a/DQM/GEM/interface/GEMPadDigiClusterSource.h +++ b/DQM/GEM/interface/GEMPadDigiClusterSource.h @@ -31,11 +31,11 @@ class GEMPadDigiClusterSource : public GEMDQMBase { public: explicit GEMPadDigiClusterSource(const edm::ParameterSet& cfg); - ~GEMPadDigiClusterSource() override{}; + ~GEMPadDigiClusterSource() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); protected: - void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override{}; + void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override {} void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; diff --git a/DQM/GEM/interface/GEMRecHitSource.h b/DQM/GEM/interface/GEMRecHitSource.h index 11d797efd3f19..8f6b60ed87035 100644 --- a/DQM/GEM/interface/GEMRecHitSource.h +++ b/DQM/GEM/interface/GEMRecHitSource.h @@ -14,11 +14,11 @@ class GEMRecHitSource : public GEMDQMBase { public: explicit GEMRecHitSource(const edm::ParameterSet& cfg); - ~GEMRecHitSource() override{}; + ~GEMRecHitSource() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); protected: - void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override{}; + void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override {} void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; diff --git a/DQM/GEM/plugins/GEMDQMHarvester.cc b/DQM/GEM/plugins/GEMDQMHarvester.cc index 8437308c764e4..adce88a18f430 100644 --- a/DQM/GEM/plugins/GEMDQMHarvester.cc +++ b/DQM/GEM/plugins/GEMDQMHarvester.cc @@ -22,7 +22,7 @@ using namespace edm; class GEMDQMHarvester : public DQMEDHarvester { public: GEMDQMHarvester(const edm::ParameterSet &); - ~GEMDQMHarvester() override{}; + ~GEMDQMHarvester() override {} static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); typedef std::tuple IdChamber; @@ -69,7 +69,7 @@ class GEMDQMHarvester : public DQMEDHarvester { DQMStore::IGetter &, edm::LuminosityBlock const &iLumi, edm::EventSetup const &) override; - void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override{}; // Cannot use; it is called after dqmSaver + void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override {} // Cannot use; it is called after dqmSaver void drawSummaryHistogram(edm::Service &store, Int_t nLumiCurr); void createTableWatchingSummary(); @@ -349,12 +349,13 @@ void GEMDQMHarvester::getGeometryInfo(edm::Service &store, MonitorElem if (h2Src != nullptr) { // For online and offline Int_t nBinY = h2Src->getNbinsY(); listLayer_.push_back(""); + Int_t nNumMerge = std::max((Int_t)(h2Src->getBinContent(0, 0) + 0.5), 1); for (Int_t i = 1; i <= nBinY; i++) { std::string strLabelFull = h2Src->getTH2F()->GetYaxis()->GetBinLabel(i); auto nPos = strLabelFull.find(';'); auto strLayer = strLabelFull.substr(nPos + 1); - Int_t nBinXActual = (Int_t)(h2Src->getBinContent(0, i) + 0.5); + Int_t nBinXActual = ((Int_t)(h2Src->getBinContent(0, i) + 0.5)) / nNumMerge; if (nBinXActual > 108) { // When the number seems wrong if (strLayer.find("GE11") != std::string::npos) { nBinXActual = 36; diff --git a/DQM/GEM/plugins/GEMEffByGEMCSCSegmentClient.h b/DQM/GEM/plugins/GEMEffByGEMCSCSegmentClient.h index ef8275c74a9de..b5de2e636eff0 100644 --- a/DQM/GEM/plugins/GEMEffByGEMCSCSegmentClient.h +++ b/DQM/GEM/plugins/GEMEffByGEMCSCSegmentClient.h @@ -15,7 +15,7 @@ class GEMEffByGEMCSCSegmentClient : public GEMDQMEfficiencyClientBase { public: GEMEffByGEMCSCSegmentClient(const edm::ParameterSet &); - ~GEMEffByGEMCSCSegmentClient() override{}; + ~GEMEffByGEMCSCSegmentClient() override {} static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); protected: @@ -24,7 +24,7 @@ class GEMEffByGEMCSCSegmentClient : public GEMDQMEfficiencyClientBase { edm::LuminosityBlock const &, edm::EventSetup const &) override; - void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override{}; + void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override {} const std::string kFolder_; }; diff --git a/DQM/GEM/plugins/GEMEffByGEMCSCSegmentSource.cc b/DQM/GEM/plugins/GEMEffByGEMCSCSegmentSource.cc index 42af49478ac80..3b5c408cadbb2 100644 --- a/DQM/GEM/plugins/GEMEffByGEMCSCSegmentSource.cc +++ b/DQM/GEM/plugins/GEMEffByGEMCSCSegmentSource.cc @@ -320,8 +320,8 @@ void GEMEffByGEMCSCSegmentSource::findMatchedME11Segments(const reco::MuonCollec } matched_me11_segment_vector_.push_back(segment_match.cscSegmentRef.get()); } // MuonSegmentMatch - } // MuonChamberMatch - } // MuonCollection + } // MuonChamberMatch + } // MuonCollection } // TODO diff --git a/DQM/GEM/plugins/GEMEfficiencyAnalyzer.cc b/DQM/GEM/plugins/GEMEfficiencyAnalyzer.cc index dc44a9646a058..d9302836c24e8 100644 --- a/DQM/GEM/plugins/GEMEfficiencyAnalyzer.cc +++ b/DQM/GEM/plugins/GEMEfficiencyAnalyzer.cc @@ -374,7 +374,7 @@ void GEMEfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run me_cutflow_matched_[key] = bookNumerator1D(ibooker, me_cutflow_.at(key)); } } // shadowing - } // GEMChamber + } // GEMChamber //////////////////////////////////////////////////////////////////////////// // Region - Station - iEta @@ -449,8 +449,8 @@ void GEMEfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run me_residual_strip_[key]->setAxisTitle("propagation strip - hit strip", 1); } } // shadowing - } // GEMEtaPartition - } // GEMStataion + } // GEMEtaPartition + } // GEMStataion } // In the `cosmics` scenario, TODO doc @@ -486,8 +486,8 @@ void GEMEfficiencyAnalyzer::buildGEMLayers(const GEMGeometry* gem) { } chambers_per_layer.at(key).push_back(chamber); } // GEMChamber => iterate over layer ids - } // GEMSuperChamber => iterate over chamber ids - } // GEMStation + } // GEMSuperChamber => iterate over chamber ids + } // GEMStation gem_layers_.reserve(chambers_per_layer.size()); for (auto [gem_id, chambers] : chambers_per_layer) { @@ -586,7 +586,7 @@ GEMEfficiencyAnalyzer::StartingState GEMEfficiencyAnalyzer::buildStartingState( found = false; } } // isGEM - } // found + } // found return std::make_tuple(found, state, det_id); } @@ -784,7 +784,7 @@ const CSCSegment* GEMEfficiencyAnalyzer::findCSCSegmentCosmics(const reco::Muon& best_csc_segment = segment_match.cscSegmentRef.get(); } } // MuonSegmentMatch - } // MuonChamberMatch + } // MuonChamberMatch return best_csc_segment; } @@ -869,7 +869,7 @@ const GEMEtaPartition* GEMEfficiencyAnalyzer::findEtaPartition(const GlobalPoint break; } } // GEMEtaPartition - } // GEMChamber + } // GEMChamber return bound; } @@ -1235,7 +1235,7 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet fillMEWithinLimits(me_residual_phi_antimuon_, rse_key, residual_phi); } } // kModeDev_ - } // passed_all_cuts - } // destination - } // Muon + } // passed_all_cuts + } // destination + } // Muon } // analyze diff --git a/DQM/GEM/src/GEMDQMBase.cc b/DQM/GEM/src/GEMDQMBase.cc index 0544639cdcf7a..5328c0e204bc4 100644 --- a/DQM/GEM/src/GEMDQMBase.cc +++ b/DQM/GEM/src/GEMDQMBase.cc @@ -189,6 +189,8 @@ dqm::impl::MonitorElement* GEMDQMBase::CreateSummaryHist(DQMStore::IBooker& iboo h2Res->setBinContent(0, i, nNumCh); } + h2Res->setBinContent(0, 0, 1.0); + return h2Res; } diff --git a/DQM/GEM/src/GEMDQMEfficiencySourceBase.cc b/DQM/GEM/src/GEMDQMEfficiencySourceBase.cc index 39f863b4ab8b7..a24a790441c17 100644 --- a/DQM/GEM/src/GEMDQMEfficiencySourceBase.cc +++ b/DQM/GEM/src/GEMDQMEfficiencySourceBase.cc @@ -251,8 +251,8 @@ bool GEMDQMEfficiencySourceBase::maskChamberWithError(const GEMDetId& chamber_id // GEMOHStatus is bad. Mask this chamber. return mask; } // isBad - } // range - } // collection + } // range + } // collection for (auto iter = vfat_status_collection->begin(); iter != vfat_status_collection->end(); iter++) { const auto [vfat_id, range] = (*iter); @@ -264,7 +264,7 @@ bool GEMDQMEfficiencySourceBase::maskChamberWithError(const GEMDetId& chamber_id return mask; } } // range - } // collection + } // collection return not mask; } diff --git a/DQM/HLTEvF/plugins/FourVectorHLT.h b/DQM/HLTEvF/plugins/FourVectorHLT.h index 4b346989dd776..67a1b3eaf9f60 100644 --- a/DQM/HLTEvF/plugins/FourVectorHLT.h +++ b/DQM/HLTEvF/plugins/FourVectorHLT.h @@ -81,7 +81,7 @@ class FourVectorHLT : public edm::one::EDAnalyzer { public: - PathInfoCollection() : std::vector(){}; + PathInfoCollection() : std::vector() {} std::vector::iterator find(std::string pathName) { return std::find(begin(), end(), pathName); } }; PathInfoCollection hltPaths_; diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitor.cc b/DQM/HLTEvF/plugins/HLTObjectMonitor.cc index f05ff73a84891..9801169c12587 100644 --- a/DQM/HLTEvF/plugins/HLTObjectMonitor.cc +++ b/DQM/HLTEvF/plugins/HLTObjectMonitor.cc @@ -730,7 +730,7 @@ void HLTObjectMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& firedMap[pathName] = true; } //end if trigger accept - } //end loop over plots/paths + } //end loop over plots/paths // sleep(1); //sleep for 1s, used to calibrate timing double end = get_wall_time(); diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc b/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc index bb4e16b92e471..50ab30e597f74 100644 --- a/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc +++ b/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc @@ -549,7 +549,7 @@ void HLTObjectMonitorProtonLead::analyze(const edm::Event& iEvent, const edm::Ev firedMap[pathName] = true; } //end if trigger accept - } //end loop over plots/paths + } //end loop over plots/paths // sleep(1); //sleep for 1s, used to calibrate timing double end = get_wall_time(); diff --git a/DQM/HcalCommon/interface/ContainerProf2D.h b/DQM/HcalCommon/interface/ContainerProf2D.h index 8b4a10ad87174..d0108eef77e5d 100644 --- a/DQM/HcalCommon/interface/ContainerProf2D.h +++ b/DQM/HcalCommon/interface/ContainerProf2D.h @@ -77,12 +77,12 @@ namespace hcaldqm { void fill(HcalTrigTowerDetId const &, double, double, double); private: - void fill(uint32_t) override{}; - void fill(uint32_t, int) override{}; - void fill(uint32_t, double) override{}; - void fill(uint32_t, int, double) override{}; - void fill(uint32_t, int, int) override{}; - void fill(uint32_t, double, double) override{}; + void fill(uint32_t) override {} + void fill(uint32_t, int) override {} + void fill(uint32_t, double) override {} + void fill(uint32_t, int, double) override {} + void fill(uint32_t, int, int) override {} + void fill(uint32_t, double, double) override {} }; } // namespace hcaldqm diff --git a/DQM/HcalTasks/data/HcalQualityTests.xml b/DQM/HcalTasks/data/HcalQualityTests.xml index 7834b0539311e..da9042610b4ff 100644 --- a/DQM/HcalTasks/data/HcalQualityTests.xml +++ b/DQM/HcalTasks/data/HcalQualityTests.xml @@ -30,4 +30,20 @@ BadCapIDThreshold + + ContentsWithinExpected + 1.0 + 1.0 + -1.0 + 0.0 + 0.0 + 0.0 + -1.0 + 0 + 1 + + + BadQualityThreshold + + diff --git a/DQM/HcalTasks/interface/DigiTask.h b/DQM/HcalTasks/interface/DigiTask.h index e13f532ee5a15..e2664eb15c3ee 100644 --- a/DQM/HcalTasks/interface/DigiTask.h +++ b/DQM/HcalTasks/interface/DigiTask.h @@ -169,7 +169,7 @@ class DigiTask : public hcaldqm::DQTask { hcaldqm::ContainerSingle2D _cCapidMinusBXmod4_CrateSlotuTCA[4]; // CrateSlot 2D histograms for each (capid-BX)%4 hcaldqm::ContainerSingle2D _cCapid_BadvsFEDvsLS; hcaldqm::ContainerSingle2D - _cCapid_BadvsFEDvsLSmod60; // Same as _cCapid_BadvsFEDvsLS, but only for last 50 LSes (for sound alarm turning off when problem goes away) + _cCapid_BadvsFEDvsLSmod10; // Same as _cCapid_BadvsFEDvsLS, but only for last 50 LSes (for sound alarm turning off when problem goes away) // #events counters MonitorElement *meNumEvents1LS; // to transfer the #events to harvesting diff --git a/DQM/HcalTasks/interface/RawTask.h b/DQM/HcalTasks/interface/RawTask.h index 99b35969afdf6..fe994a5538518 100644 --- a/DQM/HcalTasks/interface/RawTask.h +++ b/DQM/HcalTasks/interface/RawTask.h @@ -51,7 +51,7 @@ class RawTask : public hcaldqm::DQTask { // physics vs calib processing switch bool _calibProcessing; int _thresh_calib_nbadq; - + int _NBadQEvent; // vector of HcalElectronicsId for FEDs std::vector _vhashFEDs; @@ -75,8 +75,9 @@ class RawTask : public hcaldqm::DQTask { hcaldqm::Container2D _cOrnMsm_ElectronicsuTCA; hcaldqm::ContainerXXX _xEvnMsmLS, _xBcnMsmLS, _xOrnMsmLS, _xBadQLS; - hcaldqm::Container2D _cSummaryvsLS_FED; // online only - hcaldqm::ContainerSingle2D _cSummaryvsLS; // online only + hcaldqm::Container2D _cSummaryvsLS_FED; // online only + hcaldqm::ContainerSingle2D _cSummaryvsLS; // online only + hcaldqm::ContainerSingle2D _cBadQ_FEDvsLSmod10; // online only }; #endif diff --git a/DQM/HcalTasks/plugins/DigiTask.cc b/DQM/HcalTasks/plugins/DigiTask.cc index 7b9daa4e19052..69bede7bd69db 100644 --- a/DQM/HcalTasks/plugins/DigiTask.cc +++ b/DQM/HcalTasks/plugins/DigiTask.cc @@ -459,9 +459,9 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), 0); - _cCapid_BadvsFEDvsLSmod60.initialize(_name, + _cCapid_BadvsFEDvsLSmod10.initialize(_name, "CapID", - new hcaldqm::quantity::LumiSection(60), + new hcaldqm::quantity::LumiSection(10), new hcaldqm::quantity::FEDQuantity(vFEDs), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN, true), 0); @@ -658,7 +658,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _cCapidMinusBXmod4_SubdetPM.book(ib, _emap, _subsystem); if (_ptype == fOnline) { _cCapid_BadvsFEDvsLS.book(ib, _subsystem, "BadvsLS"); - _cCapid_BadvsFEDvsLSmod60.book(ib, _subsystem, "BadvsLSmod60"); + _cCapid_BadvsFEDvsLSmod10.book(ib, _subsystem, "BadvsLSmod10"); } for (int i = 0; i < 4; ++i) { constexpr unsigned int kSize = 32; @@ -787,10 +787,10 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) _xQuality = lumiCache->xQuality; if (_ptype == fOnline && - lumiCache->EvtCntLS == 1) { // Reset the bin for _cCapid_BadvsFEDvsLSmod60 at the beginning of each new LS + lumiCache->EvtCntLS == 1) { // Reset the bin for _cCapid_BadvsFEDvsLSmod10 at the beginning of each new LS for (std::vector::const_iterator it = _vhashFEDs.begin(); it != _vhashFEDs.end(); ++it) { HcalElectronicsId eid = HcalElectronicsId(*it); - _cCapid_BadvsFEDvsLSmod60.setBinContent(eid, _currentLS % 60, 0); + _cCapid_BadvsFEDvsLSmod10.setBinContent(eid, _currentLS % 10, 0); } } @@ -898,7 +898,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) if (!good_capidmbx) { _xBadCapid.get(eid)++; _cCapid_BadvsFEDvsLS.fill(eid, _currentLS); - _cCapid_BadvsFEDvsLSmod60.fill(eid, _currentLS % 60); + _cCapid_BadvsFEDvsLSmod10.fill(eid, _currentLS % 10); } if (!eid.isVMEid()) { _cCapidMinusBXmod4_CrateSlotuTCA[this_capidmbx].fill(eid); @@ -1091,7 +1091,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) if (!good_capidmbx) { _xBadCapid.get(eid)++; _cCapid_BadvsFEDvsLS.fill(eid, _currentLS); - _cCapid_BadvsFEDvsLSmod60.fill(eid, _currentLS % 60); + _cCapid_BadvsFEDvsLSmod10.fill(eid, _currentLS % 10); } if (!eid.isVMEid()) { _cCapidMinusBXmod4_CrateSlotuTCA[this_capidmbx].fill(eid); @@ -1256,7 +1256,7 @@ DigiTask::DigiTask(edm::ParameterSet const& ps) if (!good_capidmbx) { _xBadCapid.get(eid)++; _cCapid_BadvsFEDvsLS.fill(eid, _currentLS); - _cCapid_BadvsFEDvsLSmod60.fill(eid, _currentLS % 60); + _cCapid_BadvsFEDvsLSmod10.fill(eid, _currentLS % 10); } if (!eid.isVMEid()) { _cCapidMinusBXmod4_CrateSlotuTCA[this_capidmbx].fill(eid); diff --git a/DQM/HcalTasks/plugins/RawTask.cc b/DQM/HcalTasks/plugins/RawTask.cc index 1206a6a5166e3..3fe1693c98fa9 100644 --- a/DQM/HcalTasks/plugins/RawTask.cc +++ b/DQM/HcalTasks/plugins/RawTask.cc @@ -18,6 +18,7 @@ RawTask::RawTask(edm::ParameterSet const& ps) _vflags[fBcnMsm] = flag::Flag("BcnMsm"); _vflags[fBadQ] = flag::Flag("BadQ"); _vflags[fOrnMsm] = flag::Flag("OrnMsm"); + _NBadQEvent = 0; } /* virtual */ void RawTask::bookHistograms(DQMStore::IBooker& ib, edm::Run const& r, edm::EventSetup const& es) { @@ -131,6 +132,12 @@ RawTask::RawTask(edm::ParameterSet const& ps) new hcaldqm::quantity::FEDQuantity(vFEDs), new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fState), 0); + _cBadQ_FEDvsLSmod10.initialize(_name, + "BadQ_FEDvsLSmod10", + new hcaldqm::quantity::LumiSection(10), + new hcaldqm::quantity::FEDQuantity(vFEDs), + new hcaldqm::quantity::ValueQuantity(hcaldqm::quantity::fN), + 0); // FED Size vs LS _cDataSizevsLS_FED.initialize(_name, "DataSizevsLS", @@ -166,6 +173,7 @@ RawTask::RawTask(edm::ParameterSet const& ps) _xBadQLS.book(_emap); _cSummaryvsLS_FED.book(ib, _emap, _subsystem); _cSummaryvsLS.book(ib, _subsystem); + _cBadQ_FEDvsLSmod10.book(ib, _subsystem); _cDataSizevsLS_FED.book(ib, _emap, _subsystem); } @@ -224,6 +232,12 @@ RawTask::RawTask(edm::ParameterSet const& ps) // TODO: Include for Online Calibration Channels marked as bad // a comment below is left on purpose! //_cBadQualityvsBX.fill(bx, creport->badQualityDigis()); + int Nbadq = creport->badQualityDigis(); + if (lumiCache->EvtCntLS == 1) + _NBadQEvent = 0; // Reset at the beginning of each new LS + if (Nbadq > 0) + _NBadQEvent++; + //std::cout << " Nbadq "<< Nbadq << " NBadQEvent " <<_NBadQEvent<< std::endl; for (std::vector::const_iterator it = creport->bad_quality_begin(); it != creport->bad_quality_end(); ++it) { // skip non HCAL det ids if (!HcalGenericDetId(*it).isHcalDetId()) @@ -242,7 +256,9 @@ RawTask::RawTask(edm::ParameterSet const& ps) _cBadQuality_depth.fill(HcalDetId(*it)); // ONLINE ONLY! if (_ptype == fOnline) + //Number of BadQualityDigis _xBadQLS.get(eid)++; + //std::cout << " event _xBadQLS "<< double(_xBadQLS.get(eid)) << std::endl; if (_ptype != fOffline) { // hidefed2crate if (!eid.isVMEid()) { if (_filter_FEDsuTCA.filter(eid)) @@ -393,13 +409,15 @@ std::shared_ptr RawTask::globalBeginLuminosityBlock(edm::Luminos for (std::vector::const_iterator it = _vhashFEDs.begin(); it != _vhashFEDs.end(); ++it) { flag::Flag fSum("RAW"); HcalElectronicsId eid = HcalElectronicsId(*it); - + int fed = hcaldqm::utilities::crate2fed(eid.crateId(), eid.slot()); std::vector::const_iterator cit = std::find(_vcdaqEids.begin(), _vcdaqEids.end(), *it); if (cit == _vcdaqEids.end()) { // not @cDAQ for (uint32_t iflag = 0; iflag < _vflags.size(); iflag++) _cSummaryvsLS_FED.setBinContent(eid, _currentLS, int(iflag), int(flag::fNCDAQ)); _cSummaryvsLS.setBinContent(eid, _currentLS, int(flag::fNCDAQ)); + if (!hcaldqm::utilities::isFEDHO(eid) && fed != 1136) + _cBadQ_FEDvsLSmod10.setBinContent(eid, _currentLS % 10, int(flag::fNCDAQ)); continue; } @@ -419,9 +437,13 @@ std::shared_ptr RawTask::globalBeginLuminosityBlock(edm::Luminos _vflags[fOrnMsm]._state = flag::fGOOD; if (double(_xBadQLS.get(eid)) > double(12 * _evsPerLS)) _vflags[fBadQ]._state = flag::fBAD; - else if (_xBadQLS.get(eid) > 0) + //else if (_xBadQLS.get(eid) > 0){ + // Following line added due to https://gitlab.cern.ch/cmshcal/docs/-/issues/233 + // BadQ > (5%) of number of events in this LS. + else if (double(_xBadQLS.get(eid)) > 0 && double(_NBadQEvent) > double(0.05 * _evsPerLS)) { _vflags[fBadQ]._state = flag::fPROBLEMATIC; - else + + } else _vflags[fBadQ]._state = flag::fGOOD; } @@ -431,6 +453,12 @@ std::shared_ptr RawTask::globalBeginLuminosityBlock(edm::Luminos // - reset each flag right after using it for (std::vector::iterator ft = _vflags.begin(); ft != _vflags.end(); ++ft) { _cSummaryvsLS_FED.setBinContent(eid, _currentLS, int(iflag), ft->_state); + + if (ft->_name == "BadQ") { + if (!hcaldqm::utilities::isFEDHO(eid) && fed != 1136 && ft->_state != 3) { + _cBadQ_FEDvsLSmod10.setBinContent(eid, _currentLS % 10, (double(_NBadQEvent) / double(_evsPerLS)) * 100); + } + } fSum += (*ft); iflag++; diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index a15d331b490d1..184d73e337dfd 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -336,7 +336,7 @@ #---------------------------- # Pixel tracks/vertices reco -process.load("RecoTracker.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") from RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi import * process.pixelVertices = pixelVertices.clone( TkFilterParameters = dict( minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin) diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py index a20d7e6435458..ce2037d83d50b 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -93,7 +93,7 @@ from RecoTracker.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import * process.siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(src = 'siPixelClustersPreSplitting') process.load("RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi") -process.load("RecoTracker.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") from RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi import * process.pixelVertices = pixelVertices.clone( TkFilterParameters = dict( diff --git a/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py index 886ec86875cfa..3984628de29b8 100644 --- a/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcalgpu_dqm_sourceclient-live_cfg.py @@ -108,8 +108,8 @@ # New Style Modules #------------------------------------- oldsubsystem = subsystem -process.hcalGPUComparisonTask.tagHBHE_ref = "hltHbherecoLegacy" -process.hcalGPUComparisonTask.tagHBHE_target = "hltHbherecoFromGPU" +process.hcalGPUComparisonTask.tagHBHE_ref = "hltHbherecoSerialSync" +process.hcalGPUComparisonTask.tagHBHE_target = "hltHbhereco" process.hcalGPUComparisonTask.runkeyVal = runType process.hcalGPUComparisonTask.runkeyName = runTypeName diff --git a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py index 0350ce6412c73..80024d91aa6cd 100644 --- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import sys -from Configuration.Eras.Era_Run3_cff import Run3 -process = cms.Process("L1TStage2DQM", Run3) +from Configuration.Eras.Era_Run3_2024_cff import Run3_2024 +process = cms.Process("L1TStage2DQM", Run3_2024) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py index 41e11e6a4bd97..906f9456f8686 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import sys -from Configuration.Eras.Era_Run3_cff import Run3 -process = cms.Process("L1TStage2EmulatorDQM", Run3) +from Configuration.Eras.Era_Run3_2024_cff import Run3_2024 +process = cms.Process("L1TStage2EmulatorDQM", Run3_2024) unitTest = False if 'unitTest=True' in sys.argv: @@ -164,6 +164,7 @@ process.selfFatEventFilter.rawInput = rawDataRepackerLabel process.rpcTwinMuxRawToDigi.inputTag = rawDataRepackerLabel process.rpcCPPFRawToDigi.inputTag = rawDataRepackerLabel + process.rpcunpacker.InputLabel = rawDataRepackerLabel #-------------------------------------------------- # L1T Emulator Online DQM Schedule diff --git a/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py index c01e0e55bb68c..9096336e1e175 100644 --- a/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py @@ -2,9 +2,12 @@ import FWCore.ParameterSet.Config as cms import sys -from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA -from Configuration.Eras.Era_Run3_cff import Run3 -process = cms.Process("MUTRKDQM", Run3) +if 'runkey=hi_run' in sys.argv: + from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters + process = cms.Process("MUTRKDQM", Run3_pp_on_PbPb_approxSiStripClusters) +else: + from Configuration.Eras.Era_Run3_cff import Run3 + process = cms.Process("MUTRKDQM", Run3) live=True unitTest=False @@ -14,7 +17,6 @@ offlineTesting=not live - #---------------------------- #### Event Source #---------------------------- @@ -101,9 +103,22 @@ from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '') +### HEAVY ION SETTING +if process.runType.getRunType() == process.runType.hi_run: + rawDataRepackerLabel = 'rawDataRepacker' + process.muonCSCDigis.InputObjects = rawDataRepackerLabel + process.muonDTDigis.inputLabel = rawDataRepackerLabel + process.muonRPCDigis.InputLabel = rawDataRepackerLabel + process.muonGEMDigis.InputLabel = rawDataRepackerLabel + process.twinMuxStage2Digis.DTTM7_FED_Source = rawDataRepackerLabel + process.bmtfDigis.InputLabel = rawDataRepackerLabel + process.omtfStage2Digis.inputLabel = rawDataRepackerLabel + process.emtfStage2Digis.InputLabel = rawDataRepackerLabel + process.gmtStage2Digis.InputLabel = rawDataRepackerLabel + process.rpcTwinMuxRawToDigi.inputTag = rawDataRepackerLabel + process.rpcCPPFRawToDigi.inputTag = rawDataRepackerLabel - -#------------------------------------ +#------------------------------------ # Cosmic muons reconstruction modules #------------------------------------ diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py index c069029538198..53944ce845a36 100644 --- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py @@ -108,16 +108,19 @@ process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi") process.siPixelDigis.cpu.IncludeErrors = True -if (process.runType.getRunType() == process.runType.hi_run): - #-------------------------------- - # Heavy Ion Configuration Changes - #-------------------------------- - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" - process.siStripDigis.ProductLabel = "rawDataRepacker" - process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" +if (process.runType.getRunType() == process.runType.hi_run): + rawDataRepackerLabel = 'rawDataRepacker' + #-------------------------------- + # Heavy Ion Configuration Changes + #-------------------------------- + process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel + process.siStripDigis.ProductLabel = rawDataRepackerLabel + process.scalersRawToDigi.scalersInputTag = rawDataRepackerLabel + process.tcdsDigis.InputLabel = rawDataRepackerLabel else : - process.siPixelDigis.cpu.InputLabel = "rawDataCollector" - process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector") + rawDataCollectorLabel = 'rawDataCollector' + process.siPixelDigis.cpu.InputLabel = rawDataCollectorLabel + process.siStripDigis.ProductLabel = rawDataCollectorLabel ## Collision Reconstruction process.load("Configuration.StandardSequences.RawToDigi_Data_cff") diff --git a/DQM/Integration/python/clients/pixelgpu_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixelgpu_dqm_sourceclient-live_cfg.py index abfa60c5b0d75..78e036c4008ec 100644 --- a/DQM/Integration/python/clients/pixelgpu_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixelgpu_dqm_sourceclient-live_cfg.py @@ -87,14 +87,20 @@ # Pixel DQM Tasks and Harvesters import #------------------------------------- process.load('DQM.SiPixelHeterogeneous.SiPixelHeterogenousDQM_FirstStep_cff') +process.load('DQM.SiPixelHeterogeneous.SiPixelHeterogenousDQMHarvesting_cff') +process.siPixelTrackComparisonHarvesterAlpaka.topFolderName = cms.string('SiPixelHeterogeneous/PixelTrackCompareGPUvsCPU') #------------------------------------- # Some Settings before Finishing up #------------------------------------- if process.runType.getRunType() == process.runType.hi_run: - process.siPixelPhase1RawDataErrorComparator.pixelErrorSrcGPU = 'hltSiPixelDigisFromSoAPPOnAA' - process.siPixelPhase1RawDataErrorComparator.pixelErrorSrcCPU = 'hltSiPixelDigisLegacyPPOnAA' + process.siPixelPhase1MonitorRawDataASerial.src = 'hltSiPixelDigiErrorsPPOnAASerialSync' + process.siPixelPhase1MonitorRawDataADevice.src = 'hltSiPixelDigiErrorsPPOnAA' + process.siPixelPhase1RawDataErrorComparator.pixelErrorSrcGPU = 'hltSiPixelDigiErrorsPPOnAA' + process.siPixelPhase1RawDataErrorComparator.pixelErrorSrcCPU = 'hltSiPixelDigiErrorsPPOnAASerialSync' else: + process.siPixelPhase1MonitorRawDataASerial.src = 'hltSiPixelDigiErrorsSerialSync' + process.siPixelPhase1MonitorRawDataADevice.src = 'hltSiPixelDigiErrors' process.siPixelPhase1RawDataErrorComparator.pixelErrorSrcGPU = 'hltSiPixelDigiErrors' process.siPixelPhase1RawDataErrorComparator.pixelErrorSrcCPU = 'hltSiPixelDigiErrorsSerialSync' #------------------------------------- @@ -106,7 +112,11 @@ #------------------------------------- # Hcal DQM Tasks/Clients Sequences Definition #------------------------------------- -process.tasksPath = cms.Path(process.siPixelPhase1RawDataErrorComparator) +process.tasksPath = cms.Path(process.siPixelPhase1MonitorRawDataASerial * + process.siPixelPhase1MonitorRawDataADevice * + process.siPixelPhase1RawDataErrorComparator * + process.siPixelHeterogeneousDQMComparisonHarvestingAlpaka + ) #------------------------------------- # Paths/Sequences Definitions diff --git a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py index b65ddb665870f..353a171155d95 100644 --- a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py @@ -196,6 +196,7 @@ process.scalersRawToDigi.scalersInputTag = rawDataRepackerLabel process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel process.siStripDigis.ProductLabel = rawDataRepackerLabel + process.tcdsDigis.InputLabel = rawDataRepackerLabel if ((process.runType.getRunType() == process.runType.hi_run) and live): process.source.SelectEvents = [ diff --git a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py index a163378a36e39..979624000d2c5 100644 --- a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py @@ -547,6 +547,7 @@ process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel process.siStripDigis.ProductLabel = rawDataRepackerLabel process.siStripFEDMonitor.RawDataTag = rawDataRepackerLabel + process.tcdsDigis.InputLabel = rawDataRepackerLabel if ((process.runType.getRunType() == process.runType.hi_run) and live): process.source.SelectEvents = [ diff --git a/DQM/L1TMonitor/interface/L1TCaloLayer1Summary.h b/DQM/L1TMonitor/interface/L1TCaloLayer1Summary.h new file mode 100644 index 0000000000000..bc11d45e7f9ac --- /dev/null +++ b/DQM/L1TMonitor/interface/L1TCaloLayer1Summary.h @@ -0,0 +1,74 @@ +// -*- C++ -*- +// +// Package: L1TMonitor/L1TCaloLayer1Summary +// Class: L1TCaloLayer1Summary +// +/**\class L1TCaloLayer1Summary L1TCaloLayer1Summary.cc Demo/L1TCaloLayer1Summary/plugins/L1TCaloLayer1Summary.cc + + Description: DQM Analyzer for CaloLayer1 regions and CICADAScore + + Implementation: + This module uses emulator sequence for CaloLayer1. +*/ +// +// Original Author: Max Zhao +// Created: 31 Jul 2024 +// +// + +// system include files +#include +#include + +#include "DQMServices/Core/interface/DQMStore.h" +#include "DQMServices/Core/interface/DQMEDAnalyzer.h" + +// user include files +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" + +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" + +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Utilities/interface/InputTag.h" + +#include "FWCore/ServiceRegistry/interface/Service.h" + +#include "DataFormats/L1CaloTrigger/interface/CICADA.h" +#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h" +#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" +#include "EventFilter/L1TXRawToDigi/interface/UCTDAQRawData.h" +#include "EventFilter/L1TXRawToDigi/interface/UCTAMCRawData.h" +#include "DataFormats/FEDRawData/interface/FEDNumbering.h" + +class L1TCaloLayer1Summary : public DQMEDAnalyzer { +public: + explicit L1TCaloLayer1Summary(const edm::ParameterSet&); + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + +private: + void analyze(const edm::Event&, const edm::EventSetup&) override; + void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; + + // ----------member data --------------------------- + edm::EDGetTokenT caloLayer1CICADAScoreToken_; + edm::EDGetTokenT gtCICADAScoreToken_; + edm::EDGetTokenT simCICADAScoreToken_; + edm::EDGetTokenT caloLayer1RegionsToken_; + edm::EDGetTokenT simRegionsToken_; + edm::EDGetTokenT fedRawData_; + + dqm::reco::MonitorElement* histoCaloLayer1CICADAScore; + dqm::reco::MonitorElement* histoGtCICADAScore; + dqm::reco::MonitorElement* histoSimCICADAScore; + dqm::reco::MonitorElement* histoCaloMinusSim; + dqm::reco::MonitorElement* histoCaloMinusGt; + dqm::reco::MonitorElement* histoSlot7MinusDaqBxid; + dqm::reco::MonitorElement* histoCaloRegions; + dqm::reco::MonitorElement* histoSimRegions; + dqm::reco::MonitorElement* histoCaloMinusSimRegions; + + std::string histFolder_; +}; \ No newline at end of file diff --git a/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h index d9f6193c61345..7453ed625ace8 100644 --- a/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h +++ b/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h @@ -240,7 +240,7 @@ class L1TStage2CaloLayer1 std::unique_ptr beginStream(edm::StreamID) const override { return std::make_unique(); }; - void streamEndLuminosityBlock(edm::StreamID, edm::LuminosityBlock const &, edm::EventSetup const &) const override{}; + void streamEndLuminosityBlock(edm::StreamID, edm::LuminosityBlock const &, edm::EventSetup const &) const override {} //lumi summary functionality void streamEndLuminosityBlockSummary(edm::StreamID, diff --git a/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h index 105c1c91030f5..7a4a1facd5ea2 100644 --- a/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h +++ b/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h @@ -56,7 +56,7 @@ class L1TdeStage2CaloLayer1 : public DQMOneEDAnalyzer> 0; }; // ET bits 0-8 inline int er() const { return (data_ & 0x0e00) >> 9; }; // ET ratio bits 9-11 inline int fb() const { return (data_ & 0xf000) >> 12; }; // Feature bits 12-15 diff --git a/DQM/L1TMonitor/plugins/SealModule.cc b/DQM/L1TMonitor/plugins/SealModule.cc index 0d5311f961517..38f2e1a69283e 100644 --- a/DQM/L1TMonitor/plugins/SealModule.cc +++ b/DQM/L1TMonitor/plugins/SealModule.cc @@ -27,6 +27,9 @@ DEFINE_FWK_MODULE(L1TGMT); #include "DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h" DEFINE_FWK_MODULE(L1TStage2CaloLayer1); +#include "DQM/L1TMonitor/interface/L1TCaloLayer1Summary.h" +DEFINE_FWK_MODULE(L1TCaloLayer1Summary); + #include "DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h" DEFINE_FWK_MODULE(L1TStage2CaloLayer2); diff --git a/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cff.py b/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cff.py new file mode 100644 index 0000000000000..551c4aa1c9295 --- /dev/null +++ b/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cff.py @@ -0,0 +1,22 @@ +import FWCore.ParameterSet.Config as cms + +from L1Trigger.Configuration.CaloTriggerPrimitives_cff import * +simEcalTriggerPrimitiveDigis.Label = 'ecalDigis' +simHcalTriggerPrimitiveDigis.inputLabel = cms.VInputTag( + cms.InputTag('hcalDigis'), + cms.InputTag('hcalDigis') +) +simHcalTriggerPrimitiveDigis.inputUpgradeLabel = cms.VInputTag( + cms.InputTag('hcalDigis'), + cms.InputTag('hcalDigis') +) + +from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Summary_cfi import * +from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Digis_cfi import * +from DQM.L1TMonitor.L1TCaloLayer1Summary_cfi import * + +simCaloStage2Layer1Summary.caloLayer1Regions = cms.InputTag("caloLayer1Digis", "") +simCaloStage2Layer1Digis.ecalToken = cms.InputTag("ecalDigis", "EcalTriggerPrimitives") +simCaloStage2Layer1Digis.hcalToken = cms.InputTag("hcalDigis", "") + +l1tCaloLayer1SummarySeq = cms.Sequence(simEcalTriggerPrimitiveDigis * simHcalTriggerPrimitiveDigis * simCaloStage2Layer1Digis * simCaloStage2Layer1Summary * l1tCaloLayer1Summary) \ No newline at end of file diff --git a/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cfi.py b/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cfi.py new file mode 100644 index 0000000000000..7e50633658ffb --- /dev/null +++ b/DQM/L1TMonitor/python/L1TCaloLayer1Summary_cfi.py @@ -0,0 +1,12 @@ +import FWCore.ParameterSet.Config as cms +from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer + +l1tCaloLayer1Summary = DQMEDAnalyzer("L1TCaloLayer1Summary", + caloLayer1CICADAScore = cms.InputTag("caloLayer1Digis", "CICADAScore"), + gtCICADAScore = cms.InputTag("gtTestcrateStage2Digis", "CICADAScore"), + simCICADAScore = cms.InputTag("simCaloStage2Layer1Summary", "CICADAScore"), + caloLayer1Regions = cms.InputTag("caloLayer1Digis", ""), + simRegions = cms.InputTag("simCaloStage2Layer1Digis", ""), + fedRawDataLabel = cms.InputTag("rawDataCollector"), + histFolder = cms.string('L1T/L1TCaloLayer1Summary') +) \ No newline at end of file diff --git a/DQM/L1TMonitor/python/L1TStage2_cff.py b/DQM/L1TMonitor/python/L1TStage2_cff.py index 0d830856c7396..ef089869a4b5e 100644 --- a/DQM/L1TMonitor/python/L1TStage2_cff.py +++ b/DQM/L1TMonitor/python/L1TStage2_cff.py @@ -9,6 +9,9 @@ # CaloLayer2 from DQM.L1TMonitor.L1TStage2CaloLayer2_cfi import * +# CaloLayer1Summary +from DQM.L1TMonitor.L1TCaloLayer1Summary_cff import * + # BMTF from DQM.L1TMonitor.L1TStage2BMTF_cff import * @@ -47,7 +50,8 @@ l1tStage2RegionalShower + l1tStage2uGMTOnlineDQMSeq + l1tObjectsTiming + - l1tStage2uGTOnlineDQMSeq + l1tStage2uGTOnlineDQMSeq + + l1tCaloLayer1SummarySeq ) # sequence to run only for validation events diff --git a/DQM/L1TMonitor/python/L1TStage2uGTTiming_cfi.py b/DQM/L1TMonitor/python/L1TStage2uGTTiming_cfi.py index a6ffae4956720..f3d76de4717ec 100644 --- a/DQM/L1TMonitor/python/L1TStage2uGTTiming_cfi.py +++ b/DQM/L1TMonitor/python/L1TStage2uGTTiming_cfi.py @@ -1,44 +1,65 @@ import FWCore.ParameterSet.Config as cms from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer +unprescaledAlgoList = cms.untracked.vstring( + "L1_SingleMu22_BMTF", + "L1_SingleMu22_OMTF", + "L1_SingleMu22_EMTF", + "L1_SingleIsoEG28er1p5", + "L1_SingleIsoEG32er2p5", + "L1_SingleEG40er2p5", + "L1_SingleEG60", + "L1_SingleTau120er2p1", + "L1_SingleJet180", + "L1_ETMHF130", + "L1_HTT360er", + "L1_ETT2000" +) +prescaledAlgoList = cms.untracked.vstring( + "L1_FirstCollisionInTrain", + "L1_LastCollisionInTrain", + "L1_IsolatedBunch", + "L1_SingleMu0_BMTF", + "L1_SingleMu0_OMTF", + "L1_SingleMu0_EMTF", + "L1_SingleEG10er2p5", + "L1_SingleEG15er2p5", + "L1_SingleEG26er2p5", + "L1_SingleLooseIsoEG28er1p5", + "L1_SingleJet35", + "L1_SingleJet35er2p5", + "L1_SingleJet35_FWD2p5", + "L1_ETMHF100", + "L1_HTT120er", + "L1_ETT1600" +) + +unprescaledAlgoList_2024 = cms.untracked.vstring(unprescaledAlgoList) +unprescaledAlgoList_2024.extend([ + "L1_AXO_Nominal", + "L1_AXO_VTight", + "L1_CICADA_Medium", + "L1_CICADA_VTight" +]) + +prescaledAlgoList_2024 = cms.untracked.vstring(prescaledAlgoList) +if "L1_ETT1600" in prescaledAlgoList_2024: + prescaledAlgoList_2024.remove("L1_ETT1600") + l1tStage2uGTTiming = DQMEDAnalyzer('L1TStage2uGTTiming', - l1tStage2uGtSource = cms.InputTag("gtStage2Digis"), + l1tStage2uGtSource = cms.InputTag("gtStage2Digis"), monitorDir = cms.untracked.string("L1T/L1TStage2uGT/timing_aux"), verbose = cms.untracked.bool(False), firstBXInTrainAlgo = cms.untracked.string("L1_FirstCollisionInTrain"), - lastBXInTrainAlgo = cms.untracked.string("L1_LastCollisionInTrain"), - isoBXAlgo = cms.untracked.string("L1_IsolatedBunch"), - unprescaledAlgoShortList = cms.untracked.vstring( - "L1_SingleMu22_BMTF", - "L1_SingleMu22_OMTF", - "L1_SingleMu22_EMTF", - "L1_SingleIsoEG28er1p5", - "L1_SingleIsoEG32er2p5", - "L1_SingleEG40er2p5", - "L1_SingleEG60", - "L1_SingleTau120er2p1", - "L1_SingleJet180", - "L1_ETMHF130", - "L1_HTT360er", - "L1_ETT2000" - ), - prescaledAlgoShortList = cms.untracked.vstring( - "L1_FirstCollisionInTrain", - "L1_LastCollisionInTrain", - "L1_IsolatedBunch", - "L1_SingleMu0_BMTF", - "L1_SingleMu0_OMTF", - "L1_SingleMu0_EMTF", - "L1_SingleEG10er2p5", - "L1_SingleEG15er2p5", - "L1_SingleEG26er2p5", - "L1_SingleLooseIsoEG28er1p5", - "L1_SingleJet35", - "L1_SingleJet35er2p5", - "L1_SingleJet35_FWD2p5", - "L1_ETMHF100", - "L1_HTT120er", - "L1_ETT1600" - ), + lastBXInTrainAlgo = cms.untracked.string("L1_LastCollisionInTrain"), + isoBXAlgo = cms.untracked.string("L1_IsolatedBunch"), + unprescaledAlgoShortList = unprescaledAlgoList, + prescaledAlgoShortList = prescaledAlgoList, useAlgoDecision = cms.untracked.string("initial") ) + +from Configuration.Eras.Modifier_stage2L1Trigger_2024_cff import stage2L1Trigger_2024 +stage2L1Trigger_2024.toModify(l1tStage2uGTTiming, + unprescaledAlgoShortList = unprescaledAlgoList_2024, + prescaledAlgoShortList = prescaledAlgoList_2024 +) diff --git a/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py b/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py index 12f37b25be2cb..668a8be3f34f2 100644 --- a/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py +++ b/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py @@ -2,6 +2,7 @@ from DQM.L1TMonitor.L1TdeStage2EMTF_cfi import * from DQM.L1TMonitor.L1TdeStage2RegionalShower_cfi import * +from Configuration.Eras.Modifier_stage2L1Trigger_2024_cff import stage2L1Trigger_2024 # List of bins to ignore ignoreBinsDeStage2Emtf = [1] @@ -20,6 +21,12 @@ ignoreBadTrackAddress = cms.untracked.bool(True), ignoreBin = cms.untracked.vint32(ignoreBinsDeStage2Emtf), verbose = cms.untracked.bool(False), + hasDisplacementInfo = cms.untracked.bool(False), +) + +stage2L1Trigger_2024.toModify( + l1tdeStage2EmtfComp, + hasDisplacementInfo = cms.untracked.bool(True) # Linden Burack 7/26/2024 ) # sequences diff --git a/DQM/L1TMonitor/src/L1TCSCTF.cc b/DQM/L1TMonitor/src/L1TCSCTF.cc index 8165a103b4336..29e815fbdcd0b 100644 --- a/DQM/L1TMonitor/src/L1TCSCTF.cc +++ b/DQM/L1TMonitor/src/L1TCSCTF.cc @@ -1041,7 +1041,7 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c) { theStub.setEtaPacked(gblEta.global_eta); float etaG = theStub.etaValue(); - float phiG = fmod(theStub.phiValue() + 15.0 * M_PI / 180 + (sector)*60.0 * M_PI / 180, 2. * M_PI); + float phiG = fmod(theStub.phiValue() + 15.0 * M_PI / 180 + (sector) * 60.0 * M_PI / 180, 2. * M_PI); //BX plots // endcap==1: minus side; endcap==0: plus side @@ -1284,8 +1284,8 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c) { //std::cout << "LCT Eta & Phi Coordinates: " << etaP << ", " << phiP << "." << std::endl; //csctfoccupancies->Fill( gblEta.global_eta/127. * 1.5 + 0.9, (gblPhi.global_phi + ( sector + (endcap?0:6) )*4096 + station*4096*12) * 1./(4*4096*12) ); } //lct != range1.scond - } //csc!=corrlcts.product()->end() - } // lctProducer.label() != "null" + } //csc!=corrlcts.product()->end() + } // lctProducer.label() != "null" if (trackProducer.label() != "null") { edm::Handle tracks; @@ -1293,7 +1293,7 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c) { for (L1CSCTrackCollection::const_iterator trk = tracks->begin(); trk < tracks->end(); trk++) { NumCSCTfTracksRep++; long LUTAdd = trk->first.ptLUTAddress(); - int trigMode = ((LUTAdd)&0xf0000) >> 16; + int trigMode = ((LUTAdd) & 0xf0000) >> 16; int trEta = (trk->first.eta_packed()); // trk->first.endcap() = 2 for - endcap @@ -1540,8 +1540,8 @@ void L1TCSCTF::analyze(const Event& e, const EventSetup& c) { DTstubsTimeTrackMenTimeArrival[mbId - 1]->Fill(bxDT - trkBX - 6, subDT); //subsec } } // loop on the tracks - } //if (isCSCcand_){ - } //if (stub->getKeyWG() == 0) { + } //if (isCSCcand_){ + } //if (stub->getKeyWG() == 0) { } } } diff --git a/DQM/L1TMonitor/src/L1TCaloLayer1Summary.cc b/DQM/L1TMonitor/src/L1TCaloLayer1Summary.cc new file mode 100644 index 0000000000000..30955ee3ffb9b --- /dev/null +++ b/DQM/L1TMonitor/src/L1TCaloLayer1Summary.cc @@ -0,0 +1,143 @@ +#include "DQM/L1TMonitor/interface/L1TCaloLayer1Summary.h" + +L1TCaloLayer1Summary::L1TCaloLayer1Summary(const edm::ParameterSet& iConfig) + : caloLayer1CICADAScoreToken_( + consumes(iConfig.getParameter("caloLayer1CICADAScore"))), + gtCICADAScoreToken_(consumes(iConfig.getParameter("gtCICADAScore"))), + simCICADAScoreToken_(consumes(iConfig.getParameter("simCICADAScore"))), + caloLayer1RegionsToken_( + consumes(iConfig.getParameter("caloLayer1Regions"))), + simRegionsToken_(consumes(iConfig.getParameter("simRegions"))), + fedRawData_(consumes(iConfig.getParameter("fedRawDataLabel"))), + histFolder_(iConfig.getParameter("histFolder")) {} + +// ------------ method called for each event ------------ +void L1TCaloLayer1Summary::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { + edm::Handle fedRawDataCollection; + iEvent.getByToken(fedRawData_, fedRawDataCollection); + if (fedRawDataCollection.isValid()) { + for (int iFed = FEDNumbering::MINRCTFEDID + 4; iFed < FEDNumbering::MAXRCTFEDID; iFed += 2) { + const FEDRawData& fedRawData = fedRawDataCollection->FEDData(iFed); + if (fedRawData.size() == 0) { + continue; + } + const uint64_t* fedRawDataArray = (const uint64_t*)fedRawData.data(); + UCTDAQRawData daqData(fedRawDataArray); + + if (daqData.nAMCs() == 7) { + UCTAMCRawData amcSlot7(daqData.amcPayload(3)); + if (amcSlot7.amcNo() == 7) { + histoSlot7MinusDaqBxid->Fill(amcSlot7.BXID() - daqData.BXID()); + } + } + } + } + + L1CaloRegionCollection caloLayer1Regions = iEvent.get(caloLayer1RegionsToken_); + L1CaloRegionCollection simRegions = iEvent.get(simRegionsToken_); + int nRegions = caloLayer1Regions.size(); + + unsigned int maxEtaIdx = 0; + for (int iRegion = 0; iRegion < nRegions; iRegion++) { + if (maxEtaIdx < caloLayer1Regions[iRegion].gctEta()) { + maxEtaIdx = caloLayer1Regions[iRegion].gctEta(); + } + } + int matrixSize = maxEtaIdx + 1; + + bool foundMatrix[2][matrixSize][matrixSize]; + int etMatrix[2][matrixSize][matrixSize]; + for (int i = 0; i < 2; i++) { + for (int j = 0; j < matrixSize; j++) { + for (int k = 0; k < matrixSize; k++) { + foundMatrix[i][j][k] = false; + etMatrix[i][j][k] = 0; + } + } + } + + for (int iRegion = 0; iRegion < nRegions; iRegion++) { + L1CaloRegion cRegion = caloLayer1Regions[iRegion]; + L1CaloRegion sRegion = simRegions[iRegion]; + + foundMatrix[0][cRegion.gctEta()][cRegion.gctPhi()] = true; + etMatrix[0][cRegion.gctEta()][cRegion.gctPhi()] = cRegion.et(); + foundMatrix[1][sRegion.gctEta()][sRegion.gctPhi()] = true; + etMatrix[1][sRegion.gctEta()][sRegion.gctPhi()] = sRegion.et(); + } + int iRegion = 0; + for (int iEta = 0; iEta < matrixSize; iEta++) { + for (int iPhi = 0; iPhi < matrixSize; iPhi++) { + if (foundMatrix[0][iEta][iPhi] && foundMatrix[1][iEta][iPhi]) { + histoCaloRegions->Fill(iRegion, etMatrix[0][iEta][iPhi]); + histoSimRegions->Fill(iRegion, etMatrix[1][iEta][iPhi]); + histoCaloMinusSimRegions->Fill(iRegion, etMatrix[0][iEta][iPhi] - etMatrix[1][iEta][iPhi]); + iRegion++; + } + } + } + + auto caloCICADAScores = iEvent.get(caloLayer1CICADAScoreToken_); + auto gtCICADAScores = iEvent.get(gtCICADAScoreToken_); + auto simCICADAScores = iEvent.get(simCICADAScoreToken_); + + if (caloCICADAScores.size() > 0) { + histoCaloLayer1CICADAScore->Fill(caloCICADAScores[0]); + if (gtCICADAScores.size() > 0) { + histoGtCICADAScore->Fill(gtCICADAScores.at(0, 0)); + histoCaloMinusGt->Fill(caloCICADAScores[0] - gtCICADAScores.at(0, 0)); + } + if (simCICADAScores.size() > 0) { + histoSimCICADAScore->Fill(simCICADAScores[0]); + histoCaloMinusSim->Fill(caloCICADAScores[0] - simCICADAScores[0]); + } + } +} + +void L1TCaloLayer1Summary::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) { + ibooker.setCurrentFolder(histFolder_); + histoSlot7MinusDaqBxid = ibooker.book1D("slot7BXID", "Slot 7- DAQ BXID", 50, -20, 20); + + ibooker.setCurrentFolder(histFolder_ + "/CICADAScore"); + histoCaloLayer1CICADAScore = ibooker.book1D("caloLayer1CICADAScore", "CaloLayer1 CICADAScore", 50, 0, 200); + histoGtCICADAScore = ibooker.book1D("gtCICADAScore", "GT CICADAScore at BX0", 50, 0, 200); + histoCaloMinusGt = ibooker.book1D("caloMinusGtCICADAScore", "CaloLayer1 - GT CICADAScore at BX0", 50, -50, 50); + histoSimCICADAScore = + ibooker.book1D("simCaloLayer1CICADAScore", "simCaloLayer1 CICADAScore (input: DAQ regions)", 50, 0, 200); + histoCaloMinusSim = ibooker.book1D( + "caloMinusSimCICADAScore", "CaloLayer1 - simCaloLayer1 (input: DAQ regions) CICADAScore", 50, -50, 50); + + ibooker.setCurrentFolder(histFolder_ + "/Regions"); + histoCaloMinusSimRegions = + ibooker.book2D("caloMinusSumRegions", + "CaloLayer1 - simCaloLayer1 (input: DAQ trigger primatives) Regions;Region;ET Difference", + 252, + -0.5, + 252.5, + 100, + -400, + 400); + histoCaloRegions = ibooker.book2D("caloLayer1Regions", "CaloLayer1 Regions;Region;ET", 252, -0.5, 252.5, 100, 0, 800); + histoSimRegions = ibooker.book2D("simCaloLayer1Regions", + "simCaloLayer1 Regions (input: DAQ trigger primatives);Region;ET", + 252, + -0.5, + 252.5, + 100, + 0, + 800); +} + +// ------------ method fills 'descriptions' with the allowed parameters for the module ------------ +void L1TCaloLayer1Summary::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + // l1tCaloLayer1Summary + edm::ParameterSetDescription desc; + desc.add("caloLayer1CICADAScore", edm::InputTag("caloLayer1Digis", "CICADAScore")); + desc.add("gtCICADAScore", edm::InputTag("gtTestcrateStage2Digis", "CICADAScore")); + desc.add("simCICADAScore", edm::InputTag("simCaloStage2Layer1Summary", "CICADAScore")); + desc.add("caloLayer1Regions", edm::InputTag("caloLayer1Digis")); + desc.add("simRegions", edm::InputTag("simCaloStage2Layer1Digis")); + desc.add("fedRawDataLabel", edm::InputTag("rawDataCollector")); + desc.add("histFolder", "L1T/L1TCaloLayer1Summary"); + descriptions.add("l1tCaloLayer1Summary", desc); +} \ No newline at end of file diff --git a/DQM/L1TMonitor/src/L1TRPCTF.cc b/DQM/L1TMonitor/src/L1TRPCTF.cc index 9302b122d04bf..3eae90f053cea 100644 --- a/DQM/L1TMonitor/src/L1TRPCTF.cc +++ b/DQM/L1TMonitor/src/L1TRPCTF.cc @@ -252,10 +252,10 @@ void L1TRPCTF::analyze(const Event& e, const EventSetup& c) { all_bxdelays.push_back(bx_del); } // if !empty - } // end candidates iteration + } // end candidates iteration ++beIndex; } // end brl/endcap iteration - } // end GMT records iteration + } // end GMT records iteration for (int bxI = 0; bxI < 3; ++bxI) { rpctfntrack_b[bxI]->Fill(nrpctftrack_b[bxI]); diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc index 4787f0fa96d41..c7f7a5e723048 100644 --- a/DQM/L1TMonitor/src/L1TStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2EMTF.cc @@ -1018,7 +1018,7 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { gemHitOccupancy->Fill((Hit->Sector() % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); // follow CSC convention } } // End of if (Hit->Is_GEM() == true) - } // End of for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) + } // End of for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) // Tracks edm::Handle TrackCollection; @@ -1176,7 +1176,7 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { rpcHitTimingTot->Fill((Hit->Sector_RPC() - 1) * 7 + get_subsector_rpc_cppf(Hit->Subsector_RPC()), hist_index + 0.5); } // End loop: for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) - } // End conditional: if (trackHitBX == 0 && ring == 2) + } // End conditional: if (trackHitBX == 0 && ring == 2) // Fill GEM timing with matched CSC LCTs if (trackHitBX == 0 && station == 1 && ring == 1) { // GEM only in station 1 @@ -1206,8 +1206,8 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { } } // End loop: for (auto Hit = HitCollection->begin(); Hit != HitCollection->end(); ++Hit) - } // End conditional: if (trackHitBX == 0 && station == 1 && ring == 1) - } // End conditional: if (TrkHit.Is_CSC() == true) + } // End conditional: if (trackHitBX == 0 && station == 1 && ring == 1) + } // End conditional: if (TrkHit.Is_CSC() == true) if (TrkHit.Is_RPC() == true && neighbor == false) { hist_index = histIndexRPC.at({station, ring}); @@ -1236,7 +1236,7 @@ void L1TStage2EMTF::analyze(const edm::Event& e, const edm::EventSetup& c) { gemHitTimingTot->Fill((sector % 6 + 1) * 7 - 4, (endcap > 0) ? 1.5 : 0.5); } } // End condition: if (TrkHit.Is_GEM() == true) - } // End loop: for (int iHit = 0; iHit < numHits; ++iHit) + } // End loop: for (int iHit = 0; iHit < numHits; ++iHit) } ////////////////////////////////////////////////// /// End block for CSC LCT and RPC hit timing /// diff --git a/DQM/L1TMonitor/src/L1TdeStage2uGT.cc b/DQM/L1TMonitor/src/L1TdeStage2uGT.cc index 0655ae4816007..805e0c0865982 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2uGT.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2uGT.cc @@ -172,7 +172,7 @@ void L1TdeStage2uGT::analyze(const edm::Event& event, const edm::EventSetup& es) } } // end loop over algoBits - } // end loop over globalalgblk vector + } // end loop over globalalgblk vector if (foundInitalMismatchDataNoEmul) { fillHist(m_SummaryHistograms, hsummary, float(NInitalMismatchDataNoEmul), 1.); } diff --git a/DQM/L1TMonitorClient/src/L1TRPCTFClient.cc b/DQM/L1TMonitorClient/src/L1TRPCTFClient.cc index a4cf359ea216a..886d17d07d67b 100644 --- a/DQM/L1TMonitorClient/src/L1TRPCTFClient.cc +++ b/DQM/L1TMonitorClient/src/L1TRPCTFClient.cc @@ -99,7 +99,7 @@ void L1TRPCTFClient::processHistograms(DQMStore::IGetter &igetter) { ++channel) { m_deadChannels->setBinContent((*channel).getBinX(), (*channel).getBinY(), 100); } // for(badchannels) - } //if (qreport) + } //if (qreport) qreport = me->getQReport("HotChannels_RPCTF_2D"); if (qreport) { @@ -109,9 +109,9 @@ void L1TRPCTFClient::processHistograms(DQMStore::IGetter &igetter) { // (*channel).getBinY() == 0 for NoisyChannels QTEST m_noisyChannels->setBinContent((*channel).getBinX(), 100); } // for(badchannels) - } //if (qreport) - // else std::cout << "dupa" << std::endl; - } // if (me) + } //if (qreport) + // else std::cout << "dupa" << std::endl; + } // if (me) } if (verbose_) { diff --git a/DQM/Physics/interface/TopDQMHelpers.h b/DQM/Physics/interface/TopDQMHelpers.h index c38d18bcfa599..4af769267c823 100644 --- a/DQM/Physics/interface/TopDQMHelpers.h +++ b/DQM/Physics/interface/TopDQMHelpers.h @@ -73,7 +73,7 @@ class Calculate_miniAOD { /// default constructor Calculate_miniAOD(int maxNJets, double wMass); /// default destructor - ~Calculate_miniAOD(){}; + ~Calculate_miniAOD() {} /// calculate W boson mass estimate double massWBoson(const std::vector& jets); @@ -130,7 +130,7 @@ class Calculate { /// default constructor Calculate(int maxNJets, double wMass); /// default destructor - ~Calculate(){}; + ~Calculate() {} /// calculate W boson mass estimate double massWBoson(const std::vector& jets); @@ -242,7 +242,7 @@ class SelectionStep { /// default constructor SelectionStep(const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC); /// default destructor - ~SelectionStep(){}; + ~SelectionStep() {} /// apply selection bool select(const edm::Event& event); diff --git a/DQM/Physics/src/BPhysicsOniaDQM.cc b/DQM/Physics/src/BPhysicsOniaDQM.cc index a38dc6438738d..494d0c951a9ed 100644 --- a/DQM/Physics/src/BPhysicsOniaDQM.cc +++ b/DQM/Physics/src/BPhysicsOniaDQM.cc @@ -190,9 +190,9 @@ void BPhysicsOniaDQM::analyze(const Event &iEvent, const EventSetup &iSetup) { } } } // end of 2nd MuonCollection - } // end of GLB,STA,TRK muon check - } // end of 1st MuonCollection - } // Is this MuonCollection vaild? + } // end of GLB,STA,TRK muon check + } // end of 1st MuonCollection + } // Is this MuonCollection vaild? } float BPhysicsOniaDQM::computeMass(const math::XYZVector &vec1, const math::XYZVector &vec2) { diff --git a/DQM/Physics/src/HiggsDQM.cc b/DQM/Physics/src/HiggsDQM.cc index 3ebc00fa3305d..e2c007fa9e056 100644 --- a/DQM/Physics/src/HiggsDQM.cc +++ b/DQM/Physics/src/HiggsDQM.cc @@ -288,7 +288,7 @@ void HiggsDQM::analyze(const edm::Event& e, const edm::EventSetup& eSetup) { // recoElectron->deltaEtaSuperClusterTrackAtVtx() > 0.01 || // recoElectron->sigmaIetaIeta() > 0.027 ) continue; } // end of loop over electrons - } // end if passed HLT + } // end if passed HLT nEle = posEle + negEle; if (nEle > 9.) nEle = 9.; diff --git a/DQM/Physics/src/QcdUeDQM.cc b/DQM/Physics/src/QcdUeDQM.cc index 9fe3cb09d7158..17dfa3334f9e2 100644 --- a/DQM/Physics/src/QcdUeDQM.cc +++ b/DQM/Physics/src/QcdUeDQM.cc @@ -1058,8 +1058,8 @@ void QcdUeDQM::fillUE_with_MaxpTtrack(const std::vector &tr } } } // track loop - } // leading track - // non empty collection + } // leading track + // non empty collection fillProfile(hdNdEtadPhi_pTMax_Toward500_, track[0]->pt(), nTrk500_TowardReg, w); fillProfile(hdNdEtadPhi_pTMax_Transverse500_, track[0]->pt(), nTrk500_TransReg, w); fillProfile(hdNdEtadPhi_pTMax_Away500_, track[0]->pt(), nTrk500_AwayReg, w); diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM.h b/DQM/Physics/src/SingleTopTChannelLeptonDQM.h index 210f0a51377f9..4899bd5c1bb10 100644 --- a/DQM/Physics/src/SingleTopTChannelLeptonDQM.h +++ b/DQM/Physics/src/SingleTopTChannelLeptonDQM.h @@ -277,7 +277,7 @@ class SingleTopTChannelLeptonDQM : public DQMOneEDAnalyzer<> { /// default constructor SingleTopTChannelLeptonDQM(const edm::ParameterSet& cfg); /// default destructor - ~SingleTopTChannelLeptonDQM() override{}; + ~SingleTopTChannelLeptonDQM() override {} /// do this during the event loop void analyze(const edm::Event& event, const edm::EventSetup& setup) override; diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h index ea03fd96fd68d..94adaa0f26cdb 100644 --- a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h +++ b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h @@ -35,7 +35,7 @@ namespace SingleTopTChannelLepton_miniAOD { /// default contructor MonitorEnsemble(const char* label, const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC); /// default destructor - ~MonitorEnsemble(){}; + ~MonitorEnsemble() {} /// book histograms in subdirectory _directory_ void book(DQMStore::IBooker& ibooker); @@ -184,7 +184,7 @@ class SingleTopTChannelLeptonDQM_miniAOD : public DQMOneEDAnalyzer<> { /// default constructor SingleTopTChannelLeptonDQM_miniAOD(const edm::ParameterSet& cfg); /// default destructor - ~SingleTopTChannelLeptonDQM_miniAOD() override{}; + ~SingleTopTChannelLeptonDQM_miniAOD() override {} /// do this during the event loop void analyze(const edm::Event& event, const edm::EventSetup& setup) override; diff --git a/DQM/Physics/src/TopDiLeptonOfflineDQM.h b/DQM/Physics/src/TopDiLeptonOfflineDQM.h index e254b78a5bfe2..956e7d407a19b 100644 --- a/DQM/Physics/src/TopDiLeptonOfflineDQM.h +++ b/DQM/Physics/src/TopDiLeptonOfflineDQM.h @@ -64,7 +64,7 @@ namespace TopDiLeptonOffline { /// MonitorEnsemble(const char* label, const edm::ParameterSet& cfg); MonitorEnsemble(const char* label, const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC); /// default destructor - ~MonitorEnsemble(){}; + ~MonitorEnsemble() {} /// book histograms in subdirectory _directory_ void book(DQMStore::IBooker& ibooker); diff --git a/DQM/Physics/src/TopSingleLeptonDQM.h b/DQM/Physics/src/TopSingleLeptonDQM.h index ec12b89b51e74..78217cce9e01d 100644 --- a/DQM/Physics/src/TopSingleLeptonDQM.h +++ b/DQM/Physics/src/TopSingleLeptonDQM.h @@ -58,7 +58,7 @@ namespace TopSingleLepton { /// default contructor MonitorEnsemble(const char* label, const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC); /// default destructor - ~MonitorEnsemble(){}; + ~MonitorEnsemble() {} /// book histograms in subdirectory _directory_ void book(DQMStore::IBooker& ibooker); @@ -266,7 +266,7 @@ class TopSingleLeptonDQM : public DQMOneEDAnalyzer<> { /// default constructor TopSingleLeptonDQM(const edm::ParameterSet& cfg); /// default destructor - ~TopSingleLeptonDQM() override{}; + ~TopSingleLeptonDQM() override {} /// do this during the event loop void analyze(const edm::Event& event, const edm::EventSetup& setup) override; diff --git a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h index 998c4c6f336b7..e8e9d84e2b11d 100644 --- a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h +++ b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h @@ -35,7 +35,7 @@ namespace TopSingleLepton_miniAOD { /// default contructor MonitorEnsemble(const char* label, const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC); /// default destructor - ~MonitorEnsemble(){}; + ~MonitorEnsemble() {} /// book histograms in subdirectory _directory_ void book(DQMStore::IBooker& ibooker); @@ -184,7 +184,7 @@ class TopSingleLeptonDQM_miniAOD : public DQMOneEDAnalyzer<> { /// default constructor TopSingleLeptonDQM_miniAOD(const edm::ParameterSet& cfg); /// default destructor - ~TopSingleLeptonDQM_miniAOD() override{}; + ~TopSingleLeptonDQM_miniAOD() override {} /// do this during the event loop void analyze(const edm::Event& event, const edm::EventSetup& setup) override; diff --git a/DQM/PixelLumi/plugins/BrilClient.h b/DQM/PixelLumi/plugins/BrilClient.h index 561a87a24cd67..cc4056c467774 100644 --- a/DQM/PixelLumi/plugins/BrilClient.h +++ b/DQM/PixelLumi/plugins/BrilClient.h @@ -20,12 +20,12 @@ class BrilClient : public DQMEDHarvester { ~BrilClient() override; protected: - void beginJob() override{}; + void beginJob() override {} void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; - void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override{}; + void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override {} private: edm::EDGetTokenT pathToken_; diff --git a/DQM/RPCMonitorClient/plugins/RPCDqmClient.cc b/DQM/RPCMonitorClient/plugins/RPCDqmClient.cc index 7f0ddfc90884c..3184d8a70035a 100644 --- a/DQM/RPCMonitorClient/plugins/RPCDqmClient.cc +++ b/DQM/RPCMonitorClient/plugins/RPCDqmClient.cc @@ -162,7 +162,7 @@ void RPCDqmClient::getMonitorElements(DQMStore::IGetter& igetter) { myDetIds.push_back(detId); } //end loop on clients - } //end loop on all geometry and get all histos + } //end loop on all geometry and get all histos //Clustersize std::vector myMeVectCl; diff --git a/DQM/RPCMonitorClient/plugins/RPCEventSummary.cc b/DQM/RPCMonitorClient/plugins/RPCEventSummary.cc index 85a07777a70db..be357e2155b49 100644 --- a/DQM/RPCMonitorClient/plugins/RPCEventSummary.cc +++ b/DQM/RPCMonitorClient/plugins/RPCEventSummary.cc @@ -189,7 +189,7 @@ void RPCEventSummary::clientOperation(DQMStore::IGetter& igetter) { barrelFactor += wheelFactor; } // - } //end loop on wheel + } //end loop on wheel barrelFactor = barrelFactor / 5; diff --git a/DQM/RPCMonitorDigi/src/RPCBookDetUnitME.cc b/DQM/RPCMonitorDigi/src/RPCBookDetUnitME.cc index 6ad27f08853c5..f4750923eeca8 100644 --- a/DQM/RPCMonitorDigi/src/RPCBookDetUnitME.cc +++ b/DQM/RPCMonitorDigi/src/RPCBookDetUnitME.cc @@ -180,8 +180,8 @@ void RPCMonitorDigi::bookSectorRingME(DQMStore::IBooker& ibooker, meMap[meClus3] = mecl3; meMap[meClus4] = mecl4; } //loop ring - } //loop disk - } //loop region + } //loop disk + } //loop region } void RPCMonitorDigi::bookWheelDiskME(DQMStore::IBooker& ibooker, diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareRecHitsSoAAlpaka.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareRecHitsSoAAlpaka.cc deleted file mode 100644 index 474194ad72616..0000000000000 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareRecHitsSoAAlpaka.cc +++ /dev/null @@ -1,244 +0,0 @@ -#include "DQMServices/Core/interface/MonitorElement.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" -#include "DQMServices/Core/interface/DQMStore.h" -#include "DataFormats/Math/interface/approx_atan2.h" -#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsHost.h" -#include "DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsSoA.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" - -template -class SiPixelCompareRecHitsSoAAlpaka : public DQMEDAnalyzer { -public: - using HitsOnHost = TrackingRecHitHost; - - explicit SiPixelCompareRecHitsSoAAlpaka(const edm::ParameterSet&); - ~SiPixelCompareRecHitsSoAAlpaka() override = default; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) override; - void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - -private: - const edm::ESGetToken geomToken_; - const edm::ESGetToken topoToken_; - const edm::EDGetTokenT tokenSoAHitsHost_; //these two are both on Host but originally they have been - const edm::EDGetTokenT tokenSoAHitsDevice_; //produced on Host or on Device - const std::string topFolderName_; - const float mind2cut_; - static constexpr uint32_t invalidHit_ = std::numeric_limits::max(); - static constexpr float micron_ = 10000.; - const TrackerGeometry* tkGeom_ = nullptr; - const TrackerTopology* tTopo_ = nullptr; - MonitorElement* hnHits_; - MonitorElement* hBchargeL_[4]; // max 4 barrel hits - MonitorElement* hBsizexL_[4]; - MonitorElement* hBsizeyL_[4]; - MonitorElement* hBposxL_[4]; - MonitorElement* hBposyL_[4]; - MonitorElement* hFchargeD_[2][12]; // max 12 endcap disks - MonitorElement* hFsizexD_[2][12]; - MonitorElement* hFsizeyD_[2][12]; - MonitorElement* hFposxD_[2][12]; - MonitorElement* hFposyD_[2][12]; - //differences - MonitorElement* hBchargeDiff_; - MonitorElement* hFchargeDiff_; - MonitorElement* hBsizeXDiff_; - MonitorElement* hFsizeXDiff_; - MonitorElement* hBsizeYDiff_; - MonitorElement* hFsizeYDiff_; - MonitorElement* hBposXDiff_; - MonitorElement* hFposXDiff_; - MonitorElement* hBposYDiff_; - MonitorElement* hFposYDiff_; -}; - -// -// constructors -// -template -SiPixelCompareRecHitsSoAAlpaka::SiPixelCompareRecHitsSoAAlpaka(const edm::ParameterSet& iConfig) - : geomToken_(esConsumes()), - topoToken_(esConsumes()), - tokenSoAHitsHost_(consumes(iConfig.getParameter("pixelHitsSrcHost"))), - tokenSoAHitsDevice_(consumes(iConfig.getParameter("pixelHitsSrcDevice"))), - topFolderName_(iConfig.getParameter("topFolderName")), - mind2cut_(iConfig.getParameter("minD2cut")) {} - -// -// Begin Run -// -template -void SiPixelCompareRecHitsSoAAlpaka::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) { - tkGeom_ = &iSetup.getData(geomToken_); - tTopo_ = &iSetup.getData(topoToken_); -} - -// -// -- Analyze -// -template -void SiPixelCompareRecHitsSoAAlpaka::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - const auto& rhsoaHandleHost = iEvent.getHandle(tokenSoAHitsHost_); - const auto& rhsoaHandleDevice = iEvent.getHandle(tokenSoAHitsDevice_); - if (not rhsoaHandleHost or not rhsoaHandleDevice) { - edm::LogWarning out("SiPixelCompareRecHitsSoAAlpaka"); - if (not rhsoaHandleHost) { - out << "reference (Host) rechits not found; "; - } - if (not rhsoaHandleDevice) { - out << "target (Device) rechits not found; "; - } - out << "the comparison will not run."; - return; - } - - auto const& rhsoaHost = *rhsoaHandleHost; - auto const& rhsoaDevice = *rhsoaHandleDevice; - - auto const& soa2dHost = rhsoaHost.const_view(); - auto const& soa2dDevice = rhsoaDevice.const_view(); - - uint32_t nHitsHost = soa2dHost.metadata().size(); - uint32_t nHitsDevice = soa2dDevice.metadata().size(); - - hnHits_->Fill(nHitsHost, nHitsDevice); - auto detIds = tkGeom_->detUnitIds(); - for (uint32_t i = 0; i < nHitsHost; i++) { - float minD = mind2cut_; - uint32_t matchedHit = invalidHit_; - uint16_t indHost = soa2dHost[i].detectorIndex(); - float xLocalHost = soa2dHost[i].xLocal(); - float yLocalHost = soa2dHost[i].yLocal(); - for (uint32_t j = 0; j < nHitsDevice; j++) { - if (soa2dDevice.detectorIndex(j) == indHost) { - float dx = xLocalHost - soa2dDevice[j].xLocal(); - float dy = yLocalHost - soa2dDevice[j].yLocal(); - float distance = dx * dx + dy * dy; - if (distance < minD) { - minD = distance; - matchedHit = j; - } - } - } - DetId id = detIds[indHost]; - uint32_t chargeHost = soa2dHost[i].chargeAndStatus().charge; - int16_t sizeXHost = std::ceil(float(std::abs(soa2dHost[i].clusterSizeX()) / 8.)); - int16_t sizeYHost = std::ceil(float(std::abs(soa2dHost[i].clusterSizeY()) / 8.)); - uint32_t chargeDevice = 0; - int16_t sizeXDevice = -99; - int16_t sizeYDevice = -99; - float xLocalDevice = -999.; - float yLocalDevice = -999.; - if (matchedHit != invalidHit_) { - chargeDevice = soa2dDevice[matchedHit].chargeAndStatus().charge; - sizeXDevice = std::ceil(float(std::abs(soa2dDevice[matchedHit].clusterSizeX()) / 8.)); - sizeYDevice = std::ceil(float(std::abs(soa2dDevice[matchedHit].clusterSizeY()) / 8.)); - xLocalDevice = soa2dDevice[matchedHit].xLocal(); - yLocalDevice = soa2dDevice[matchedHit].yLocal(); - } - switch (id.subdetId()) { - case PixelSubdetector::PixelBarrel: - hBchargeL_[tTopo_->pxbLayer(id) - 1]->Fill(chargeHost, chargeDevice); - hBsizexL_[tTopo_->pxbLayer(id) - 1]->Fill(sizeXHost, sizeXDevice); - hBsizeyL_[tTopo_->pxbLayer(id) - 1]->Fill(sizeYHost, sizeYDevice); - hBposxL_[tTopo_->pxbLayer(id) - 1]->Fill(xLocalHost, xLocalDevice); - hBposyL_[tTopo_->pxbLayer(id) - 1]->Fill(yLocalHost, yLocalDevice); - hBchargeDiff_->Fill(chargeHost - chargeDevice); - hBsizeXDiff_->Fill(sizeXHost - sizeXDevice); - hBsizeYDiff_->Fill(sizeYHost - sizeYDevice); - hBposXDiff_->Fill(micron_ * (xLocalHost - xLocalDevice)); - hBposYDiff_->Fill(micron_ * (yLocalHost - yLocalDevice)); - break; - case PixelSubdetector::PixelEndcap: - hFchargeD_[tTopo_->pxfSide(id) - 1][tTopo_->pxfDisk(id) - 1]->Fill(chargeHost, chargeDevice); - hFsizexD_[tTopo_->pxfSide(id) - 1][tTopo_->pxfDisk(id) - 1]->Fill(sizeXHost, sizeXDevice); - hFsizeyD_[tTopo_->pxfSide(id) - 1][tTopo_->pxfDisk(id) - 1]->Fill(sizeYHost, sizeYDevice); - hFposxD_[tTopo_->pxfSide(id) - 1][tTopo_->pxfDisk(id) - 1]->Fill(xLocalHost, xLocalDevice); - hFposyD_[tTopo_->pxfSide(id) - 1][tTopo_->pxfDisk(id) - 1]->Fill(yLocalHost, yLocalDevice); - hFchargeDiff_->Fill(chargeHost - chargeDevice); - hFsizeXDiff_->Fill(sizeXHost - sizeXDevice); - hFsizeYDiff_->Fill(sizeYHost - sizeYDevice); - hFposXDiff_->Fill(micron_ * (xLocalHost - xLocalDevice)); - hFposYDiff_->Fill(micron_ * (yLocalHost - yLocalDevice)); - break; - } - } -} - -// -// -- Book Histograms -// -template -void SiPixelCompareRecHitsSoAAlpaka::bookHistograms(DQMStore::IBooker& iBook, - edm::Run const& iRun, - edm::EventSetup const& iSetup) { - iBook.cd(); - iBook.setCurrentFolder(topFolderName_); - - // clang-format off - //Global - hnHits_ = iBook.book2I("nHits", "HostvsDevice RecHits per event;#Host RecHits;#Device RecHits", 200, 0, 5000,200, 0, 5000); - //Barrel Layer - for(unsigned int il=0;ilnumberOfLayers(PixelSubdetector::PixelBarrel);il++){ - hBchargeL_[il] = iBook.book2I(Form("recHitsBLay%dCharge",il+1), Form("HostvsDevice RecHits Charge Barrel Layer%d;Host Charge;Device Charge",il+1), 250, 0, 100000, 250, 0, 100000); - hBsizexL_[il] = iBook.book2I(Form("recHitsBLay%dSizex",il+1), Form("HostvsDevice RecHits SizeX Barrel Layer%d;Host SizeX;Device SizeX",il+1), 30, 0, 30, 30, 0, 30); - hBsizeyL_[il] = iBook.book2I(Form("recHitsBLay%dSizey",il+1), Form("HostvsDevice RecHits SizeY Barrel Layer%d;Host SizeY;Device SizeY",il+1), 30, 0, 30, 30, 0, 30); - hBposxL_[il] = iBook.book2D(Form("recHitsBLay%dPosx",il+1), Form("HostvsDevice RecHits x-pos in Barrel Layer%d;Host pos x;Device pos x",il+1), 200, -5, 5, 200,-5,5); - hBposyL_[il] = iBook.book2D(Form("recHitsBLay%dPosy",il+1), Form("HostvsDevice RecHits y-pos in Barrel Layer%d;Host pos y;Device pos y",il+1), 200, -5, 5, 200,-5,5); - } - //Endcaps - //Endcaps Disk - for(int is=0;is<2;is++){ - int sign=is==0? -1:1; - for(unsigned int id=0;idnumberOfLayers(PixelSubdetector::PixelEndcap);id++){ - hFchargeD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dCharge",id*sign+sign), Form("HostvsDevice RecHits Charge Endcaps Disk%+d;Host Charge;Device Charge",id*sign+sign), 250, 0, 100000, 250, 0, 100000); - hFsizexD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dSizex",id*sign+sign), Form("HostvsDevice RecHits SizeX Endcaps Disk%+d;Host SizeX;Device SizeX",id*sign+sign), 30, 0, 30, 30, 0, 30); - hFsizeyD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dSizey",id*sign+sign), Form("HostvsDevice RecHits SizeY Endcaps Disk%+d;Host SizeY;Device SizeY",id*sign+sign), 30, 0, 30, 30, 0, 30); - hFposxD_[is][id] = iBook.book2D(Form("recHitsFDisk%+dPosx",id*sign+sign), Form("HostvsDevice RecHits x-pos Endcaps Disk%+d;Host pos x;Device pos x",id*sign+sign), 200, -5, 5, 200, -5, 5); - hFposyD_[is][id] = iBook.book2D(Form("recHitsFDisk%+dPosy",id*sign+sign), Form("HostvsDevice RecHits y-pos Endcaps Disk%+d;Host pos y;Device pos y",id*sign+sign), 200, -5, 5, 200, -5, 5); - } - } - //1D differences - hBchargeDiff_ = iBook.book1D("rechitChargeDiffBpix","Charge differnce of rechits in BPix; rechit charge difference (Host - Device)", 101, -50.5, 50.5); - hFchargeDiff_ = iBook.book1D("rechitChargeDiffFpix","Charge differnce of rechits in FPix; rechit charge difference (Host - Device)", 101, -50.5, 50.5); - hBsizeXDiff_ = iBook.book1D("rechitsizeXDiffBpix","SizeX difference of rechits in BPix; rechit sizex difference (Host - Device)", 21, -10.5, 10.5); - hFsizeXDiff_ = iBook.book1D("rechitsizeXDiffFpix","SizeX difference of rechits in FPix; rechit sizex difference (Host - Device)", 21, -10.5, 10.5); - hBsizeYDiff_ = iBook.book1D("rechitsizeYDiffBpix","SizeY difference of rechits in BPix; rechit sizey difference (Host - Device)", 21, -10.5, 10.5); - hFsizeYDiff_ = iBook.book1D("rechitsizeYDiffFpix","SizeY difference of rechits in FPix; rechit sizey difference (Host - Device)", 21, -10.5, 10.5); - hBposXDiff_ = iBook.book1D("rechitsposXDiffBpix","x-position difference of rechits in BPix; rechit x-pos difference (Host - Device)", 1000, -10, 10); - hFposXDiff_ = iBook.book1D("rechitsposXDiffFpix","x-position difference of rechits in FPix; rechit x-pos difference (Host - Device)", 1000, -10, 10); - hBposYDiff_ = iBook.book1D("rechitsposYDiffBpix","y-position difference of rechits in BPix; rechit y-pos difference (Host - Device)", 1000, -10, 10); - hFposYDiff_ = iBook.book1D("rechitsposYDiffFpix","y-position difference of rechits in FPix; rechit y-pos difference (Host - Device)", 1000, -10, 10); -} - -template -void SiPixelCompareRecHitsSoAAlpaka::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - // monitorpixelRecHitsSoAAlpaka - edm::ParameterSetDescription desc; - desc.add("pixelHitsSrcHost", edm::InputTag("siPixelRecHitsPreSplittingAlpakaSerial")); - desc.add("pixelHitsSrcDevice", edm::InputTag("siPixelRecHitsPreSplittingAlpaka")); - desc.add("topFolderName", "SiPixelHeterogeneous/PixelRecHitsCompareDeviceVSHost"); - desc.add("minD2cut", 0.0001); - descriptions.addWithDefaultLabel(desc); -} - -using SiPixelPhase1CompareRecHitsSoAAlpaka = SiPixelCompareRecHitsSoAAlpaka; -using SiPixelPhase2CompareRecHitsSoAAlpaka = SiPixelCompareRecHitsSoAAlpaka; -using SiPixelHIonPhase1CompareRecHitsSoAAlpaka = SiPixelCompareRecHitsSoAAlpaka; - -#include "FWCore/Framework/interface/MakerMacros.h" -DEFINE_FWK_MODULE(SiPixelPhase1CompareRecHitsSoAAlpaka); -DEFINE_FWK_MODULE(SiPixelPhase2CompareRecHitsSoAAlpaka); -DEFINE_FWK_MODULE(SiPixelHIonPhase1CompareRecHitsSoAAlpaka); diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTrackSoA.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTrackSoA.cc index 03d023cf17a71..f3635d6df45da 100644 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTrackSoA.cc +++ b/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTrackSoA.cc @@ -84,6 +84,9 @@ class SiPixelCompareTrackSoA : public DQMEDAnalyzer { MonitorElement* hnTracks_; MonitorElement* hnLooseAndAboveTracks_; MonitorElement* hnLooseAndAboveTracks_matched_; + MonitorElement* hDeltaNTracks_; + MonitorElement* hDeltaNLooseAndAboveTracks_; + MonitorElement* hDeltaNLooseAndAboveTracks_matched_; MonitorElement* hnHits_; MonitorElement* hnHitsVsPhi_; MonitorElement* hnHitsVsEta_; @@ -95,6 +98,7 @@ class SiPixelCompareTrackSoA : public DQMEDAnalyzer { MonitorElement* hChi2VsPhi_; MonitorElement* hChi2VsEta_; MonitorElement* hpt_; + MonitorElement* hCurvature_; MonitorElement* hptLogLog_; MonitorElement* heta_; MonitorElement* hphi_; @@ -110,10 +114,10 @@ class SiPixelCompareTrackSoA : public DQMEDAnalyzer { MonitorElement* htipdiffMatched_; //for matching eff vs region: derive the ratio at harvesting - MonitorElement* hpt_eta_tkAllCPU_; - MonitorElement* hpt_eta_tkAllCPUMatched_; - MonitorElement* hphi_z_tkAllCPU_; - MonitorElement* hphi_z_tkAllCPUMatched_; + MonitorElement* hpt_eta_tkAllRef_; + MonitorElement* hpt_eta_tkAllRefMatched_; + MonitorElement* hphi_z_tkAllRef_; + MonitorElement* hphi_z_tkAllRefMatched_; }; // @@ -187,6 +191,7 @@ void SiPixelCompareTrackSoA::analyze(const edm::Event& iEvent, const edm::Eve float phiCPU = helper::phi(tsoaCPU.view(), it); float zipCPU = helper::zip(tsoaCPU.view(), it); float tipCPU = helper::tip(tsoaCPU.view(), it); + auto qCPU = helper::charge(tsoaCPU.view(), it); if (!(ptCPU > 0.)) continue; @@ -211,17 +216,18 @@ void SiPixelCompareTrackSoA::analyze(const edm::Event& iEvent, const edm::Eve } } - hpt_eta_tkAllCPU_->Fill(etaCPU, ptCPU); //all CPU tk - hphi_z_tkAllCPU_->Fill(phiCPU, zipCPU); + hpt_eta_tkAllRef_->Fill(etaCPU, ptCPU); //all CPU tk + hphi_z_tkAllRef_->Fill(phiCPU, zipCPU); if (closestTkidx == notFound) continue; nLooseAndAboveTracksCPU_matchedGPU++; hchi2_->Fill(tsoaCPU.view()[it].chi2(), tsoaGPU.view()[closestTkidx].chi2()); - hCharge_->Fill(helper::charge(tsoaCPU.view(), it), helper::charge(tsoaGPU.view(), closestTkidx)); + hCharge_->Fill(qCPU, helper::charge(tsoaGPU.view(), closestTkidx)); hnHits_->Fill(helper::nHits(tsoaCPU.view(), it), helper::nHits(tsoaGPU.view(), closestTkidx)); hnLayers_->Fill(tsoaCPU.view()[it].nLayers(), tsoaGPU.view()[closestTkidx].nLayers()); hpt_->Fill(ptCPU, tsoaGPU.view()[closestTkidx].pt()); + hCurvature_->Fill(qCPU / ptCPU, helper::charge(tsoaGPU.view(), closestTkidx) / tsoaGPU.view()[closestTkidx].pt()); hptLogLog_->Fill(ptCPU, tsoaGPU.view()[closestTkidx].pt()); heta_->Fill(etaCPU, tsoaGPU.view()[closestTkidx].eta()); hphi_->Fill(phiCPU, helper::phi(tsoaGPU.view(), closestTkidx)); @@ -234,12 +240,26 @@ void SiPixelCompareTrackSoA::analyze(const edm::Event& iEvent, const edm::Eve hphidiffMatched_->Fill(reco::deltaPhi(phiCPU, helper::phi(tsoaGPU.view(), closestTkidx))); hzdiffMatched_->Fill(zipCPU - helper::zip(tsoaGPU.view(), closestTkidx)); htipdiffMatched_->Fill(tipCPU - helper::tip(tsoaGPU.view(), closestTkidx)); - hpt_eta_tkAllCPUMatched_->Fill(etaCPU, tsoaCPU.view()[it].pt()); //matched to gpu - hphi_z_tkAllCPUMatched_->Fill(etaCPU, zipCPU); + hpt_eta_tkAllRefMatched_->Fill(etaCPU, tsoaCPU.view()[it].pt()); //matched to gpu + hphi_z_tkAllRefMatched_->Fill(etaCPU, zipCPU); } - hnTracks_->Fill(nTracksCPU, nTracksGPU); - hnLooseAndAboveTracks_->Fill(nLooseAndAboveTracksCPU, nLooseAndAboveTracksGPU); - hnLooseAndAboveTracks_matched_->Fill(nLooseAndAboveTracksCPU, nLooseAndAboveTracksCPU_matchedGPU); + + // Define a lambda function for filling the histograms + auto fillHistogram = [](auto& histogram, auto xValue, auto yValue) { histogram->Fill(xValue, yValue); }; + + // Define a lambda for filling delta histograms + auto fillDeltaHistogram = [](auto& histogram, int cpuValue, int gpuValue) { + histogram->Fill(std::min(cpuValue, 1000), std::clamp(gpuValue - cpuValue, -100, 100)); + }; + + // Fill the histograms + fillHistogram(hnTracks_, nTracksCPU, nTracksGPU); + fillHistogram(hnLooseAndAboveTracks_, nLooseAndAboveTracksCPU, nLooseAndAboveTracksGPU); + fillHistogram(hnLooseAndAboveTracks_matched_, nLooseAndAboveTracksCPU, nLooseAndAboveTracksCPU_matchedGPU); + + fillDeltaHistogram(hDeltaNTracks_, nTracksCPU, nTracksGPU); + fillDeltaHistogram(hDeltaNLooseAndAboveTracks_, nLooseAndAboveTracksCPU, nLooseAndAboveTracksGPU); + fillDeltaHistogram(hDeltaNLooseAndAboveTracks_matched_, nLooseAndAboveTracksCPU, nLooseAndAboveTracksCPU_matchedGPU); } // @@ -252,13 +272,44 @@ void SiPixelCompareTrackSoA::bookHistograms(DQMStore::IBooker& iBook, iBook.cd(); iBook.setCurrentFolder(topFolderName_); - // clang-format off + // Define a helper function for booking histograms std::string toRep = "Number of tracks"; + auto bookTracksTH2I = [&](const std::string& name, + const std::string& title, + int xBins, + double xMin, + double xMax, + int yBins, + double yMin, + double yMax) { + return iBook.book2I(name, fmt::sprintf(title, toRep), xBins, xMin, xMax, yBins, yMin, yMax); + }; + + // Define common parameters for different histogram types + constexpr int xBins = 501; + constexpr double xMin = -0.5; + constexpr double xMax = 1001.5; + + constexpr int dXBins = 1001; + constexpr double dXMin = -0.5; + constexpr double dXMax = 1000.5; + + constexpr int dYBins = 201; + constexpr double dYMin = -100.5; + constexpr double dYMax = 100.5; + // FIXME: all the 2D correlation plots are quite heavy in terms of memory consumption, so a as soon as DQM supports THnSparse // these should be moved to a less resource consuming format - hnTracks_ = iBook.book2I("nTracks", fmt::sprintf("%s per event; CPU; GPU",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); - hnLooseAndAboveTracks_ = iBook.book2I("nLooseAndAboveTracks", fmt::sprintf("%s (quality #geq loose) per event; CPU; GPU",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); - hnLooseAndAboveTracks_matched_ = iBook.book2I("nLooseAndAboveTracks_matched", fmt::sprintf("%s (quality #geq loose) per event; CPU; GPU",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); + + // Book histograms using the helper function + // clang-format off + hnTracks_ = bookTracksTH2I("nTracks", "%s per event; Reference; Target", xBins, xMin, xMax, xBins, xMin, xMax); + hnLooseAndAboveTracks_ = bookTracksTH2I("nLooseAndAboveTracks", "%s (quality #geq loose) per event; Reference; Target", xBins, xMin, xMax, xBins, xMin, xMax); + hnLooseAndAboveTracks_matched_ = bookTracksTH2I("nLooseAndAboveTracks_matched", "%s (quality #geq loose) per event; Reference; Target", xBins, xMin, xMax, xBins, xMin, xMax); + + hDeltaNTracks_ = bookTracksTH2I("deltaNTracks", "%s per event; Reference; Target - Reference", dXBins, dXMin, dXMax, dYBins, dYMin, dYMax); + hDeltaNLooseAndAboveTracks_ = bookTracksTH2I("deltaNLooseAndAboveTracks", "%s (quality #geq loose) per event; Reference; Target - Reference", dXBins, dXMin, dXMax, dYBins, dYMin, dYMax); + hDeltaNLooseAndAboveTracks_matched_ = bookTracksTH2I("deltaNLooseAndAboveTracks_matched", "%s (quality #geq loose) per event; Reference; Target - Reference", dXBins, dXMin, dXMax, dYBins, dYMin, dYMax); toRep = "Number of all RecHits per track (quality #geq loose)"; hnHits_ = iBook.book2I("nRecHits", fmt::sprintf("%s;CPU;GPU",toRep), 15, -0.5, 14.5, 15, -0.5, 14.5); @@ -273,24 +324,25 @@ void SiPixelCompareTrackSoA::bookHistograms(DQMStore::IBooker& iBook, hCharge_ = iBook.book2I("charge",fmt::sprintf("%s;CPU;GPU",toRep),3, -1.5, 1.5, 3, -1.5, 1.5); hpt_ = iBook.book2I("pt", "Track (quality #geq loose) p_{T} [GeV];CPU;GPU", 200, 0., 200., 200, 0., 200.); + hCurvature_ = iBook.book2I("curvature", "Track (quality #geq loose) q/p_{T} [GeV^{-1}];CPU;GPU", 60,- 3., 3., 60, -3., 3. ); hptLogLog_ = make2DIfLog(iBook, true, true, "ptLogLog", "Track (quality #geq loose) p_{T} [GeV];CPU;GPU", 200, log10(0.5), log10(200.), 200, log10(0.5), log10(200.)); heta_ = iBook.book2I("eta", "Track (quality #geq loose) #eta;CPU;GPU", 30, -3., 3., 30, -3., 3.); hphi_ = iBook.book2I("phi", "Track (quality #geq loose) #phi;CPU;GPU", 30, -M_PI, M_PI, 30, -M_PI, M_PI); hz_ = iBook.book2I("z", "Track (quality #geq loose) z [cm];CPU;GPU", 30, -30., 30., 30, -30., 30.); htip_ = iBook.book2I("tip", "Track (quality #geq loose) TIP [cm];CPU;GPU", 100, -0.5, 0.5, 100, -0.5, 0.5); //1D difference plots - hptdiffMatched_ = iBook.book1D("ptdiffmatched", " p_{T} diff [GeV] between matched tracks; #Delta p_{T} [GeV]", 60, -30., 30.); - hCurvdiffMatched_ = iBook.book1D("curvdiffmatched", "q/p_{T} diff [GeV] between matched tracks; #Delta q/p_{T} [GeV]", 60, -30., 30.); - hetadiffMatched_ = iBook.book1D("etadiffmatched", " #eta diff between matched tracks; #Delta #eta", 160, -0.04 ,0.04); - hphidiffMatched_ = iBook.book1D("phidiffmatched", " #phi diff between matched tracks; #Delta #phi", 160, -0.04 ,0.04); - hzdiffMatched_ = iBook.book1D("zdiffmatched", " z diff between matched tracks; #Delta z [cm]", 300, -1.5, 1.5); - htipdiffMatched_ = iBook.book1D("tipdiffmatched", " TIP diff between matched tracks; #Delta TIP [cm]", 300, -1.5, 1.5); + hptdiffMatched_ = iBook.book1D("ptdiffmatched", " p_{T} diff [GeV] between matched tracks; #Delta p_{T} [GeV]", 61, -30.5, 30.5); + hCurvdiffMatched_ = iBook.book1D("curvdiffmatched", "q/p_{T} diff [GeV^{-1}] between matched tracks; #Delta q/p_{T} [GeV^{-1}]", 61, -3.05, 3.05); + hetadiffMatched_ = iBook.book1D("etadiffmatched", " #eta diff between matched tracks; #Delta #eta", 161, -0.045 ,0.045); + hphidiffMatched_ = iBook.book1D("phidiffmatched", " #phi diff between matched tracks; #Delta #phi", 161, -0.045 ,0.045); + hzdiffMatched_ = iBook.book1D("zdiffmatched", " z diff between matched tracks; #Delta z [cm]", 301, -1.55, 1.55); + htipdiffMatched_ = iBook.book1D("tipdiffmatched", " TIP diff between matched tracks; #Delta TIP [cm]", 301, -1.55, 1.55); //2D plots for eff - hpt_eta_tkAllCPU_ = iBook.book2I("ptetatrkAllCPU", "Track (quality #geq loose) on CPU; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); - hpt_eta_tkAllCPUMatched_ = iBook.book2I("ptetatrkAllCPUmatched", "Track (quality #geq loose) on CPU matched to GPU track; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); + hpt_eta_tkAllRef_ = iBook.book2I("ptetatrkAllReference", "Track (quality #geq loose) on CPU; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); + hpt_eta_tkAllRefMatched_ = iBook.book2I("ptetatrkAllReferencematched", "Track (quality #geq loose) on CPU matched to GPU track; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); - hphi_z_tkAllCPU_ = iBook.book2I("phiztrkAllCPU", "Track (quality #geq loose) on CPU; #phi; z [cm];", 30, -M_PI, M_PI, 30, -30., 30.); - hphi_z_tkAllCPUMatched_ = iBook.book2I("phiztrkAllCPUmatched", "Track (quality #geq loose) on CPU; #phi; z [cm];", 30, -M_PI, M_PI, 30, -30., 30.); + hphi_z_tkAllRef_ = iBook.book2I("phiztrkAllReference", "Track (quality #geq loose) on CPU; #phi; z [cm];", 30, -M_PI, M_PI, 30, -30., 30.); + hphi_z_tkAllRefMatched_ = iBook.book2I("phiztrkAllReferencematched", "Track (quality #geq loose) on CPU; #phi; z [cm];", 30, -M_PI, M_PI, 30, -30., 30.); } @@ -303,7 +355,7 @@ void SiPixelCompareTrackSoA::fillDescriptions(edm::ConfigurationDescriptions& desc.add("topFolderName", "SiPixelHeterogeneous/PixelTrackCompareGPUvsCPU"); desc.add("useQualityCut", true); desc.add("minQuality", "loose"); - desc.add("deltaR2cut", 0.04); + desc.add("deltaR2cut", 0.02 * 0.02)->setComment("deltaR2 cut between track on CPU and GPU"); descriptions.addWithDefaultLabel(desc); } diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTrackSoAAlpaka.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTrackSoAAlpaka.cc deleted file mode 100644 index 025bdfd988ea6..0000000000000 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTrackSoAAlpaka.cc +++ /dev/null @@ -1,308 +0,0 @@ -// for string manipulations -#include -#include "DataFormats/Common/interface/Handle.h" -#include "DataFormats/Math/interface/deltaR.h" -#include "DataFormats/Math/interface/deltaPhi.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/InputTag.h" -// DQM Histograming -#include "DQMServices/Core/interface/MonitorElement.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" -#include "DQMServices/Core/interface/DQMStore.h" -// DataFormats -#include "DataFormats/TrackSoA/interface/TracksHost.h" -#include "DataFormats/TrackSoA/interface/alpaka/TrackUtilities.h" - -namespace { - // same logic used for the MTV: - // cf https://github.com/cms-sw/cmssw/blob/master/Validation/RecoTrack/src/MTVHistoProducerAlgoForTracker.cc - typedef dqm::reco::DQMStore DQMStore; - - void setBinLog(TAxis* axis) { - int bins = axis->GetNbins(); - float from = axis->GetXmin(); - float to = axis->GetXmax(); - float width = (to - from) / bins; - std::vector new_bins(bins + 1, 0); - for (int i = 0; i <= bins; i++) { - new_bins[i] = TMath::Power(10, from + i * width); - } - axis->Set(bins, new_bins.data()); - } - - void setBinLogX(TH1* h) { - TAxis* axis = h->GetXaxis(); - setBinLog(axis); - } - void setBinLogY(TH1* h) { - TAxis* axis = h->GetYaxis(); - setBinLog(axis); - } - - template - dqm::reco::MonitorElement* make2DIfLog(DQMStore::IBooker& ibook, bool logx, bool logy, Args&&... args) { - auto h = std::make_unique(std::forward(args)...); - if (logx) - setBinLogX(h.get()); - if (logy) - setBinLogY(h.get()); - const auto& name = h->GetName(); - return ibook.book2I(name, h.release()); - } -} // namespace - -template -class SiPixelCompareTrackSoAAlpaka : public DQMEDAnalyzer { -public: - using PixelTrackSoA = TracksHost; - - explicit SiPixelCompareTrackSoAAlpaka(const edm::ParameterSet&); - ~SiPixelCompareTrackSoAAlpaka() override = default; - void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) override; - void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - -private: - const edm::EDGetTokenT tokenSoATrackHost_; - const edm::EDGetTokenT tokenSoATrackDevice_; - const std::string topFolderName_; - const bool useQualityCut_; - const pixelTrack::Quality minQuality_; - const float dr2cut_; - MonitorElement* hnTracks_; - MonitorElement* hnLooseAndAboveTracks_; - MonitorElement* hnLooseAndAboveTracks_matched_; - MonitorElement* hnHits_; - MonitorElement* hnHitsVsPhi_; - MonitorElement* hnHitsVsEta_; - MonitorElement* hnLayers_; - MonitorElement* hnLayersVsPhi_; - MonitorElement* hnLayersVsEta_; - MonitorElement* hCharge_; - MonitorElement* hchi2_; - MonitorElement* hChi2VsPhi_; - MonitorElement* hChi2VsEta_; - MonitorElement* hpt_; - MonitorElement* hptLogLog_; - MonitorElement* heta_; - MonitorElement* hphi_; - MonitorElement* hz_; - MonitorElement* htip_; - MonitorElement* hquality_; - //1D differences - MonitorElement* hptdiffMatched_; - MonitorElement* hCurvdiffMatched_; - MonitorElement* hetadiffMatched_; - MonitorElement* hphidiffMatched_; - MonitorElement* hzdiffMatched_; - MonitorElement* htipdiffMatched_; - - //for matching eff vs region: derive the ratio at harvesting - MonitorElement* hpt_eta_tkAllHost_; - MonitorElement* hpt_eta_tkAllHostMatched_; - MonitorElement* hphi_z_tkAllHost_; - MonitorElement* hphi_z_tkAllHostMatched_; -}; - -// -// constructors -// - -template -SiPixelCompareTrackSoAAlpaka::SiPixelCompareTrackSoAAlpaka(const edm::ParameterSet& iConfig) - : tokenSoATrackHost_(consumes(iConfig.getParameter("pixelTrackSrcHost"))), - tokenSoATrackDevice_(consumes(iConfig.getParameter("pixelTrackSrcDevice"))), - topFolderName_(iConfig.getParameter("topFolderName")), - useQualityCut_(iConfig.getParameter("useQualityCut")), - minQuality_(pixelTrack::qualityByName(iConfig.getParameter("minQuality"))), - dr2cut_(iConfig.getParameter("deltaR2cut")) {} - -// -// -- Analyze -// -template -void SiPixelCompareTrackSoAAlpaka::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - using helper = TracksUtilities; - const auto& tsoaHandleHost = iEvent.getHandle(tokenSoATrackHost_); - const auto& tsoaHandleDevice = iEvent.getHandle(tokenSoATrackDevice_); - if (not tsoaHandleHost or not tsoaHandleDevice) { - edm::LogWarning out("SiPixelCompareTrackSoAAlpaka"); - if (not tsoaHandleHost) { - out << "reference (cpu) tracks not found; "; - } - if (not tsoaHandleDevice) { - out << "target (gpu) tracks not found; "; - } - out << "the comparison will not run."; - return; - } - - auto const& tsoaHost = *tsoaHandleHost; - auto const& tsoaDevice = *tsoaHandleDevice; - auto maxTracksHost = tsoaHost.view().metadata().size(); //this should be same for both? - auto maxTracksDevice = tsoaDevice.view().metadata().size(); //this should be same for both? - auto const* qualityHost = tsoaHost.view().quality(); - auto const* qualityDevice = tsoaDevice.view().quality(); - int32_t nTracksHost = 0; - int32_t nTracksDevice = 0; - int32_t nLooseAndAboveTracksHost = 0; - int32_t nLooseAndAboveTracksHost_matchedDevice = 0; - int32_t nLooseAndAboveTracksDevice = 0; - - //Loop over Device tracks and store the indices of the loose tracks. Whats happens if useQualityCut_ is false? - std::vector looseTrkidxDevice; - for (int32_t jt = 0; jt < maxTracksDevice; ++jt) { - if (helper::nHits(tsoaDevice.view(), jt) == 0) - break; // this is a guard - if (!(tsoaDevice.view()[jt].pt() > 0.)) - continue; - nTracksDevice++; - if (useQualityCut_ && qualityDevice[jt] < minQuality_) - continue; - nLooseAndAboveTracksDevice++; - looseTrkidxDevice.emplace_back(jt); - } - - //Now loop over Host tracks//nested loop for loose gPU tracks - for (int32_t it = 0; it < maxTracksHost; ++it) { - int nHitsHost = helper::nHits(tsoaHost.view(), it); - - if (nHitsHost == 0) - break; // this is a guard - - float ptHost = tsoaHost.view()[it].pt(); - float etaHost = tsoaHost.view()[it].eta(); - float phiHost = reco::phi(tsoaHost.view(), it); - float zipHost = reco::zip(tsoaHost.view(), it); - float tipHost = reco::tip(tsoaHost.view(), it); - - if (!(ptHost > 0.)) - continue; - nTracksHost++; - if (useQualityCut_ && qualityHost[it] < minQuality_) - continue; - nLooseAndAboveTracksHost++; - //Now loop over loose Device trk and find the closest in DeltaR//do we need pt cut? - const int32_t notFound = -1; - int32_t closestTkidx = notFound; - float mindr2 = dr2cut_; - - for (auto gid : looseTrkidxDevice) { - float etaDevice = tsoaDevice.view()[gid].eta(); - float phiDevice = reco::phi(tsoaDevice.view(), gid); - float dr2 = reco::deltaR2(etaHost, phiHost, etaDevice, phiDevice); - if (dr2 > dr2cut_) - continue; // this is arbitrary - if (mindr2 > dr2) { - mindr2 = dr2; - closestTkidx = gid; - } - } - - hpt_eta_tkAllHost_->Fill(etaHost, ptHost); //all Host tk - hphi_z_tkAllHost_->Fill(phiHost, zipHost); - if (closestTkidx == notFound) - continue; - nLooseAndAboveTracksHost_matchedDevice++; - - hchi2_->Fill(tsoaHost.view()[it].chi2(), tsoaDevice.view()[closestTkidx].chi2()); - hCharge_->Fill(reco::charge(tsoaHost.view(), it), reco::charge(tsoaDevice.view(), closestTkidx)); - hnHits_->Fill(helper::nHits(tsoaHost.view(), it), helper::nHits(tsoaDevice.view(), closestTkidx)); - hnLayers_->Fill(tsoaHost.view()[it].nLayers(), tsoaDevice.view()[closestTkidx].nLayers()); - hpt_->Fill(tsoaHost.view()[it].pt(), tsoaDevice.view()[closestTkidx].pt()); - hptLogLog_->Fill(tsoaHost.view()[it].pt(), tsoaDevice.view()[closestTkidx].pt()); - heta_->Fill(etaHost, tsoaDevice.view()[closestTkidx].eta()); - hphi_->Fill(phiHost, reco::phi(tsoaDevice.view(), closestTkidx)); - hz_->Fill(zipHost, reco::zip(tsoaDevice.view(), closestTkidx)); - htip_->Fill(tipHost, reco::tip(tsoaDevice.view(), closestTkidx)); - hptdiffMatched_->Fill(ptHost - tsoaDevice.view()[closestTkidx].pt()); - hCurvdiffMatched_->Fill((reco::charge(tsoaHost.view(), it) / tsoaHost.view()[it].pt()) - - (reco::charge(tsoaDevice.view(), closestTkidx) / tsoaDevice.view()[closestTkidx].pt())); - hetadiffMatched_->Fill(etaHost - tsoaDevice.view()[closestTkidx].eta()); - hphidiffMatched_->Fill(reco::deltaPhi(phiHost, reco::phi(tsoaDevice.view(), closestTkidx))); - hzdiffMatched_->Fill(zipHost - reco::zip(tsoaDevice.view(), closestTkidx)); - htipdiffMatched_->Fill(tipHost - reco::tip(tsoaDevice.view(), closestTkidx)); - hpt_eta_tkAllHostMatched_->Fill(etaHost, tsoaHost.view()[it].pt()); //matched to gpu - hphi_z_tkAllHostMatched_->Fill(etaHost, zipHost); - } - hnTracks_->Fill(nTracksHost, nTracksDevice); - hnLooseAndAboveTracks_->Fill(nLooseAndAboveTracksHost, nLooseAndAboveTracksDevice); - hnLooseAndAboveTracks_matched_->Fill(nLooseAndAboveTracksHost, nLooseAndAboveTracksHost_matchedDevice); -} - -// -// -- Book Histograms -// -template -void SiPixelCompareTrackSoAAlpaka::bookHistograms(DQMStore::IBooker& iBook, - edm::Run const& iRun, - edm::EventSetup const& iSetup) { - iBook.cd(); - iBook.setCurrentFolder(topFolderName_); - - // clang-format off - std::string toRep = "Number of tracks"; - // FIXME: all the 2D correlation plots are quite heavy in terms of memory consumption, so a as soon as DQM supports THnSparse - // these should be moved to a less resource consuming format - hnTracks_ = iBook.book2I("nTracks", fmt::format("{} per event; Host; Device",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); - hnLooseAndAboveTracks_ = iBook.book2I("nLooseAndAboveTracks", fmt::format("{} (quality #geq loose) per event; Host; Device",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); - hnLooseAndAboveTracks_matched_ = iBook.book2I("nLooseAndAboveTracks_matched", fmt::format("{} (quality #geq loose) per event; Host; Device",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); - - toRep = "Number of all RecHits per track (quality #geq loose)"; - hnHits_ = iBook.book2I("nRecHits", fmt::format("{};Host;Device",toRep), 15, -0.5, 14.5, 15, -0.5, 14.5); - - toRep = "Number of all layers per track (quality #geq loose)"; - hnLayers_ = iBook.book2I("nLayers", fmt::format("{};Host;Device",toRep), 15, -0.5, 14.5, 15, -0.5, 14.5); - - toRep = "Track (quality #geq loose) #chi^{2}/ndof"; - hchi2_ = iBook.book2I("nChi2ndof", fmt::format("{};Host;Device",toRep), 40, 0., 20., 40, 0., 20.); - - toRep = "Track (quality #geq loose) charge"; - hCharge_ = iBook.book2I("charge",fmt::format("{};Host;Device",toRep),3, -1.5, 1.5, 3, -1.5, 1.5); - - hpt_ = iBook.book2I("pt", "Track (quality #geq loose) p_{T} [GeV];Host;Device", 200, 0., 200., 200, 0., 200.); - hptLogLog_ = make2DIfLog(iBook, true, true, "ptLogLog", "Track (quality #geq loose) p_{T} [GeV];Host;Device", 200, log10(0.5), log10(200.), 200, log10(0.5), log10(200.)); - heta_ = iBook.book2I("eta", "Track (quality #geq loose) #eta;Host;Device", 30, -3., 3., 30, -3., 3.); - hphi_ = iBook.book2I("phi", "Track (quality #geq loose) #phi;Host;Device", 30, -M_PI, M_PI, 30, -M_PI, M_PI); - hz_ = iBook.book2I("z", "Track (quality #geq loose) z [cm];Host;Device", 30, -30., 30., 30, -30., 30.); - htip_ = iBook.book2I("tip", "Track (quality #geq loose) TIP [cm];Host;Device", 100, -0.5, 0.5, 100, -0.5, 0.5); - //1D difference plots - hptdiffMatched_ = iBook.book1D("ptdiffmatched", " p_{T} diff [GeV] between matched tracks; #Delta p_{T} [GeV]", 60, -30., 30.); - hCurvdiffMatched_ = iBook.book1D("curvdiffmatched", "q/p_{T} diff [GeV] between matched tracks; #Delta q/p_{T} [GeV]", 60, -30., 30.); - hetadiffMatched_ = iBook.book1D("etadiffmatched", " #eta diff between matched tracks; #Delta #eta", 160, -0.04 ,0.04); - hphidiffMatched_ = iBook.book1D("phidiffmatched", " #phi diff between matched tracks; #Delta #phi", 160, -0.04 ,0.04); - hzdiffMatched_ = iBook.book1D("zdiffmatched", " z diff between matched tracks; #Delta z [cm]", 300, -1.5, 1.5); - htipdiffMatched_ = iBook.book1D("tipdiffmatched", " TIP diff between matched tracks; #Delta TIP [cm]", 300, -1.5, 1.5); - //2D plots for eff - hpt_eta_tkAllHost_ = iBook.book2I("ptetatrkAllHost", "Track (quality #geq loose) on Host; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); - hpt_eta_tkAllHostMatched_ = iBook.book2I("ptetatrkAllHostmatched", "Track (quality #geq loose) on Host matched to Device track; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); - - hphi_z_tkAllHost_ = iBook.book2I("phiztrkAllHost", "Track (quality #geq loose) on Host; #phi; z [cm];", 30, -M_PI, M_PI, 30, -30., 30.); - hphi_z_tkAllHostMatched_ = iBook.book2I("phiztrkAllHostmatched", "Track (quality #geq loose) on Host; #phi; z [cm];", 30, -M_PI, M_PI, 30, -30., 30.); - -} - -template -void SiPixelCompareTrackSoAAlpaka::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - // monitorpixelTrackSoA - edm::ParameterSetDescription desc; - desc.add("pixelTrackSrcHost", edm::InputTag("pixelTracksAlpakaSerial")); - desc.add("pixelTrackSrcDevice", edm::InputTag("pixelTracksAlpaka")); - desc.add("topFolderName", "SiPixelHeterogeneous/PixelTrackCompareDeviceVSHost"); - desc.add("useQualityCut", true); - desc.add("minQuality", "loose"); - desc.add("deltaR2cut", 0.04); - descriptions.addWithDefaultLabel(desc); -} - -using SiPixelPhase1CompareTrackSoAAlpaka = SiPixelCompareTrackSoAAlpaka; -using SiPixelPhase2CompareTrackSoAAlpaka = SiPixelCompareTrackSoAAlpaka; -using SiPixelHIonPhase1CompareTrackSoAAlpaka = SiPixelCompareTrackSoAAlpaka; - -DEFINE_FWK_MODULE(SiPixelPhase1CompareTrackSoAAlpaka); -DEFINE_FWK_MODULE(SiPixelPhase2CompareTrackSoAAlpaka); -DEFINE_FWK_MODULE(SiPixelHIonPhase1CompareTrackSoAAlpaka); diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTracks.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTracks.cc index 064831cab6d13..4394b5d59f34b 100644 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTracks.cc +++ b/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareTracks.cc @@ -11,6 +11,7 @@ // // for string manipulations +#include #include #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Math/interface/deltaR.h" @@ -94,6 +95,9 @@ class SiPixelCompareTracks : public DQMEDAnalyzer { MonitorElement* hnTracks_; MonitorElement* hnLooseAndAboveTracks_; MonitorElement* hnLooseAndAboveTracks_matched_; + MonitorElement* hDeltaNTracks_; + MonitorElement* hDeltaNLooseAndAboveTracks_; + MonitorElement* hDeltaNLooseAndAboveTracks_matched_; MonitorElement* hnHits_; MonitorElement* hnHitsVsPhi_; MonitorElement* hnHitsVsEta_; @@ -105,6 +109,7 @@ class SiPixelCompareTracks : public DQMEDAnalyzer { MonitorElement* hChi2VsPhi_; MonitorElement* hChi2VsEta_; MonitorElement* hpt_; + MonitorElement* hCurvature_; MonitorElement* hptLogLog_; MonitorElement* heta_; MonitorElement* hphi_; @@ -200,6 +205,7 @@ void SiPixelCompareTracks::analyzeSeparate(U tokenRef, V tokenTar, const edm: float phiRef = reco::phi(tsoaRef.view(), it); float zipRef = reco::zip(tsoaRef.view(), it); float tipRef = reco::tip(tsoaRef.view(), it); + auto qRef = reco::charge(tsoaRef.view(), it); if (!(ptRef > 0.)) continue; @@ -231,17 +237,18 @@ void SiPixelCompareTracks::analyzeSeparate(U tokenRef, V tokenTar, const edm: nLooseAndAboveTracksRef_matchedTar++; hchi2_->Fill(tsoaRef.view()[it].chi2(), tsoaTar.view()[closestTkidx].chi2()); - hCharge_->Fill(reco::charge(tsoaRef.view(), it), reco::charge(tsoaTar.view(), closestTkidx)); + hCharge_->Fill(qRef, reco::charge(tsoaTar.view(), closestTkidx)); hnHits_->Fill(helper::nHits(tsoaRef.view(), it), helper::nHits(tsoaTar.view(), closestTkidx)); hnLayers_->Fill(tsoaRef.view()[it].nLayers(), tsoaTar.view()[closestTkidx].nLayers()); hpt_->Fill(ptRef, tsoaTar.view()[closestTkidx].pt()); + hCurvature_->Fill(qRef / ptRef, reco::charge(tsoaTar.view(), closestTkidx) / tsoaTar.view()[closestTkidx].pt()); hptLogLog_->Fill(ptRef, tsoaTar.view()[closestTkidx].pt()); heta_->Fill(etaRef, tsoaTar.view()[closestTkidx].eta()); hphi_->Fill(phiRef, reco::phi(tsoaTar.view(), closestTkidx)); hz_->Fill(zipRef, reco::zip(tsoaTar.view(), closestTkidx)); htip_->Fill(tipRef, reco::tip(tsoaTar.view(), closestTkidx)); hptdiffMatched_->Fill(ptRef - tsoaTar.view()[closestTkidx].pt()); - hCurvdiffMatched_->Fill((reco::charge(tsoaRef.view(), it) / tsoaRef.view()[it].pt()) - + hCurvdiffMatched_->Fill(qRef / ptRef - (reco::charge(tsoaTar.view(), closestTkidx) / tsoaTar.view()[closestTkidx].pt())); hetadiffMatched_->Fill(etaRef - tsoaTar.view()[closestTkidx].eta()); hphidiffMatched_->Fill(reco::deltaPhi(phiRef, reco::phi(tsoaTar.view(), closestTkidx))); @@ -250,9 +257,23 @@ void SiPixelCompareTracks::analyzeSeparate(U tokenRef, V tokenTar, const edm: hpt_eta_tkAllRefMatched_->Fill(etaRef, tsoaRef.view()[it].pt()); //matched to gpu hphi_z_tkAllRefMatched_->Fill(etaRef, zipRef); } - hnTracks_->Fill(nTracksRef, nTracksTar); - hnLooseAndAboveTracks_->Fill(nLooseAndAboveTracksRef, nLooseAndAboveTracksTar); - hnLooseAndAboveTracks_matched_->Fill(nLooseAndAboveTracksRef, nLooseAndAboveTracksRef_matchedTar); + + // Define a lambda function for filling the histograms + auto fillHistogram = [](auto& histogram, auto xValue, auto yValue) { histogram->Fill(xValue, yValue); }; + + // Define a lambda for filling delta histograms + auto fillDeltaHistogram = [](auto& histogram, int cpuValue, int gpuValue) { + histogram->Fill(std::min(cpuValue, 1000), std::clamp(gpuValue - cpuValue, -100, 100)); + }; + + // Fill the histograms + fillHistogram(hnTracks_, nTracksRef, nTracksTar); + fillHistogram(hnLooseAndAboveTracks_, nLooseAndAboveTracksRef, nLooseAndAboveTracksTar); + fillHistogram(hnLooseAndAboveTracks_matched_, nLooseAndAboveTracksRef, nLooseAndAboveTracksRef_matchedTar); + + fillDeltaHistogram(hDeltaNTracks_, nTracksRef, nTracksTar); + fillDeltaHistogram(hDeltaNLooseAndAboveTracks_, nLooseAndAboveTracksRef, nLooseAndAboveTracksTar); + fillDeltaHistogram(hDeltaNLooseAndAboveTracks_matched_, nLooseAndAboveTracksRef, nLooseAndAboveTracksRef_matchedTar); } // @@ -275,13 +296,44 @@ void SiPixelCompareTracks::bookHistograms(DQMStore::IBooker& iBook, iBook.cd(); iBook.setCurrentFolder(topFolderName_); - // clang-format off + // Define a helper function for booking histograms std::string toRep = "Number of tracks"; + auto bookTracksTH2I = [&](const std::string& name, + const std::string& title, + int xBins, + double xMin, + double xMax, + int yBins, + double yMin, + double yMax) { + return iBook.book2I(name, fmt::sprintf(title, toRep), xBins, xMin, xMax, yBins, yMin, yMax); + }; + + // Define common parameters for different histogram types + constexpr int xBins = 501; + constexpr double xMin = -0.5; + constexpr double xMax = 1001.5; + + constexpr int dXBins = 1001; + constexpr double dXMin = -0.5; + constexpr double dXMax = 1000.5; + + constexpr int dYBins = 201; + constexpr double dYMin = -100.5; + constexpr double dYMax = 100.5; + // FIXME: all the 2D correlation plots are quite heavy in terms of memory consumption, so a as soon as DQM supports THnSparse // these should be moved to a less resource consuming format - hnTracks_ = iBook.book2I("nTracks", fmt::sprintf("%s per event; Reference; Target",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); - hnLooseAndAboveTracks_ = iBook.book2I("nLooseAndAboveTracks", fmt::sprintf("%s (quality #geq loose) per event; Reference; Target",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); - hnLooseAndAboveTracks_matched_ = iBook.book2I("nLooseAndAboveTracks_matched", fmt::sprintf("%s (quality #geq loose) per event; Reference; Target",toRep), 501, -0.5, 500.5, 501, -0.5, 500.5); + + // Book histograms using the helper function + // clang-format off + hnTracks_ = bookTracksTH2I("nTracks", "%s per event; Reference; Target", xBins, xMin, xMax, xBins, xMin, xMax); + hnLooseAndAboveTracks_ = bookTracksTH2I("nLooseAndAboveTracks", "%s (quality #geq loose) per event; Reference; Target", xBins, xMin, xMax, xBins, xMin, xMax); + hnLooseAndAboveTracks_matched_ = bookTracksTH2I("nLooseAndAboveTracks_matched", "%s (quality #geq loose) per event; Reference; Target", xBins, xMin, xMax, xBins, xMin, xMax); + + hDeltaNTracks_ = bookTracksTH2I("deltaNTracks", "%s per event; Reference; Target - Reference", dXBins, dXMin, dXMax, dYBins, dYMin, dYMax); + hDeltaNLooseAndAboveTracks_ = bookTracksTH2I("deltaNLooseAndAboveTracks", "%s (quality #geq loose) per event; Reference; Target - Reference", dXBins, dXMin, dXMax, dYBins, dYMin, dYMax); + hDeltaNLooseAndAboveTracks_matched_ = bookTracksTH2I("deltaNLooseAndAboveTracks_matched", "%s (quality #geq loose) per event; Reference; Target - Reference", dXBins, dXMin, dXMax, dYBins, dYMin, dYMax); toRep = "Number of all RecHits per track (quality #geq loose)"; hnHits_ = iBook.book2I("nRecHits", fmt::sprintf("%s;Reference;Target",toRep), 15, -0.5, 14.5, 15, -0.5, 14.5); @@ -296,18 +348,20 @@ void SiPixelCompareTracks::bookHistograms(DQMStore::IBooker& iBook, hCharge_ = iBook.book2I("charge",fmt::sprintf("%s;Reference;Target",toRep),3, -1.5, 1.5, 3, -1.5, 1.5); hpt_ = iBook.book2I("pt", "Track (quality #geq loose) p_{T} [GeV];Reference;Target", 200, 0., 200., 200, 0., 200.); + hCurvature_ = iBook.book2I("curvature", "Track (quality #geq loose) q/p_{T} [GeV^{-1}];Reference;Target", 60,- 3., 3., 60, -3., 3. ); hptLogLog_ = make2DIfLog(iBook, true, true, "ptLogLog", "Track (quality #geq loose) p_{T} [GeV];Reference;Target", 200, log10(0.5), log10(200.), 200, log10(0.5), log10(200.)); heta_ = iBook.book2I("eta", "Track (quality #geq loose) #eta;Reference;Target", 30, -3., 3., 30, -3., 3.); hphi_ = iBook.book2I("phi", "Track (quality #geq loose) #phi;Reference;Target", 30, -M_PI, M_PI, 30, -M_PI, M_PI); hz_ = iBook.book2I("z", "Track (quality #geq loose) z [cm];Reference;Target", 30, -30., 30., 30, -30., 30.); htip_ = iBook.book2I("tip", "Track (quality #geq loose) TIP [cm];Reference;Target", 100, -0.5, 0.5, 100, -0.5, 0.5); + //1D difference plots - hptdiffMatched_ = iBook.book1D("ptdiffmatched", " p_{T} diff [GeV] between matched tracks; #Delta p_{T} [GeV]", 60, -30., 30.); - hCurvdiffMatched_ = iBook.book1D("curvdiffmatched", "q/p_{T} diff [GeV] between matched tracks; #Delta q/p_{T} [GeV]", 60, -30., 30.); - hetadiffMatched_ = iBook.book1D("etadiffmatched", " #eta diff between matched tracks; #Delta #eta", 160, -0.04 ,0.04); - hphidiffMatched_ = iBook.book1D("phidiffmatched", " #phi diff between matched tracks; #Delta #phi", 160, -0.04 ,0.04); - hzdiffMatched_ = iBook.book1D("zdiffmatched", " z diff between matched tracks; #Delta z [cm]", 300, -1.5, 1.5); - htipdiffMatched_ = iBook.book1D("tipdiffmatched", " TIP diff between matched tracks; #Delta TIP [cm]", 300, -1.5, 1.5); + hptdiffMatched_ = iBook.book1D("ptdiffmatched", " p_{T} diff [GeV] between matched tracks; #Delta p_{T} [GeV]", 61, -30.5, 30.5); + hCurvdiffMatched_ = iBook.book1D("curvdiffmatched", "q/p_{T} diff [GeV^{-1}] between matched tracks; #Delta q/p_{T} [GeV^{-1}]", 61, -3.05, 3.05); + hetadiffMatched_ = iBook.book1D("etadiffmatched", " #eta diff between matched tracks; #Delta #eta", 161, -0.045 ,0.045); + hphidiffMatched_ = iBook.book1D("phidiffmatched", " #phi diff between matched tracks; #Delta #phi", 161, -0.045 ,0.045); + hzdiffMatched_ = iBook.book1D("zdiffmatched", " z diff between matched tracks; #Delta z [cm]", 301, -1.55, 1.55); + htipdiffMatched_ = iBook.book1D("tipdiffmatched", " TIP diff between matched tracks; #Delta TIP [cm]", 301, -1.55, 1.55); //2D plots for eff hpt_eta_tkAllRef_ = iBook.book2I("ptetatrkAllReference", "Track (quality #geq loose) on Reference; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); hpt_eta_tkAllRefMatched_ = iBook.book2I("ptetatrkAllReferencematched", "Track (quality #geq loose) on Reference matched to Target track; #eta; p_{T} [GeV];", 30, -M_PI, M_PI, 200, 0., 200.); @@ -326,7 +380,7 @@ void SiPixelCompareTracks::fillDescriptions(edm::ConfigurationDescriptions& d desc.add("topFolderName", "SiPixelHeterogeneous/PixelTrackCompareDeviceVSHost"); desc.add("useQualityCut", true); desc.add("minQuality", "loose"); - desc.add("deltaR2cut", 0.04); + desc.add("deltaR2cut", 0.02 * 0.02)->setComment("deltaR2 cut between track on device and host"); descriptions.addWithDefaultLabel(desc); } diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareVertexSoAAlpaka.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareVertexSoAAlpaka.cc deleted file mode 100644 index 2eea6a980d9c5..0000000000000 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelCompareVertexSoAAlpaka.cc +++ /dev/null @@ -1,186 +0,0 @@ -// -*- C++ -*- -// Package: SiPixelCompareVertexSoAAlpaka -// Class: SiPixelCompareVertexSoAAlpaka -// -/**\class SiPixelCompareVertexSoAAlpaka SiPixelCompareVertexSoAAlpaka.cc -*/ -// -// Author: Suvankar Roy Chowdhury -// -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/InputTag.h" -#include "DataFormats/Common/interface/Handle.h" -// DQM Histograming -#include "DQMServices/Core/interface/MonitorElement.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" -#include "DQMServices/Core/interface/DQMStore.h" -#include "DataFormats/VertexSoA/interface/ZVertexHost.h" -#include "DataFormats/BeamSpot/interface/BeamSpot.h" - -class SiPixelCompareVertexSoAAlpaka : public DQMEDAnalyzer { -public: - using IndToEdm = std::vector; - explicit SiPixelCompareVertexSoAAlpaka(const edm::ParameterSet&); - ~SiPixelCompareVertexSoAAlpaka() override = default; - void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) override; - void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - -private: - const edm::EDGetTokenT tokenSoAVertexHost_; - const edm::EDGetTokenT tokenSoAVertexDevice_; - const edm::EDGetTokenT tokenBeamSpot_; - const std::string topFolderName_; - const float dzCut_; - MonitorElement* hnVertex_; - MonitorElement* hx_; - MonitorElement* hy_; - MonitorElement* hz_; - MonitorElement* hchi2_; - MonitorElement* hchi2oNdof_; - MonitorElement* hptv2_; - MonitorElement* hntrks_; - MonitorElement* hxdiff_; - MonitorElement* hydiff_; - MonitorElement* hzdiff_; -}; - -// -// constructors -// - -// Note tokenSoAVertexDevice_ contains data copied from device to host, hence is a HostCollection -SiPixelCompareVertexSoAAlpaka::SiPixelCompareVertexSoAAlpaka(const edm::ParameterSet& iConfig) - : tokenSoAVertexHost_(consumes(iConfig.getParameter("pixelVertexSrcHost"))), - tokenSoAVertexDevice_(consumes(iConfig.getParameter("pixelVertexSrcDevice"))), - tokenBeamSpot_(consumes(iConfig.getParameter("beamSpotSrc"))), - topFolderName_(iConfig.getParameter("topFolderName")), - dzCut_(iConfig.getParameter("dzCut")) {} - -// -// -- Analyze -// -void SiPixelCompareVertexSoAAlpaka::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - const auto& vsoaHandleHost = iEvent.getHandle(tokenSoAVertexHost_); - const auto& vsoaHandleDevice = iEvent.getHandle(tokenSoAVertexDevice_); - if (not vsoaHandleHost or not vsoaHandleDevice) { - edm::LogWarning out("SiPixelCompareVertexSoAAlpaka"); - if (not vsoaHandleHost) { - out << "reference (cpu) tracks not found; "; - } - if (not vsoaHandleDevice) { - out << "target (gpu) tracks not found; "; - } - out << "the comparison will not run."; - return; - } - - auto const& vsoaHost = *vsoaHandleHost; - int nVerticesHost = vsoaHost.view().nvFinal(); - auto const& vsoaDevice = *vsoaHandleDevice; - int nVerticesDevice = vsoaDevice.view().nvFinal(); - - auto bsHandle = iEvent.getHandle(tokenBeamSpot_); - float x0 = 0., y0 = 0., z0 = 0., dxdz = 0., dydz = 0.; - if (!bsHandle.isValid()) { - edm::LogWarning("SiPixelCompareVertexSoAAlpaka") << "No beamspot found. returning vertexes with (0,0,Z) "; - } else { - const reco::BeamSpot& bs = *bsHandle; - x0 = bs.x0(); - y0 = bs.y0(); - z0 = bs.z0(); - dxdz = bs.dxdz(); - dydz = bs.dydz(); - } - - for (int ivc = 0; ivc < nVerticesHost; ivc++) { - auto sic = vsoaHost.view()[ivc].sortInd(); - auto zc = vsoaHost.view()[sic].zv(); - auto xc = x0 + dxdz * zc; - auto yc = y0 + dydz * zc; - zc += z0; - - auto ndofHost = vsoaHost.view()[sic].ndof(); - auto chi2Host = vsoaHost.view()[sic].chi2(); - - const int32_t notFound = -1; - int32_t closestVtxidx = notFound; - float mindz = dzCut_; - - for (int ivg = 0; ivg < nVerticesDevice; ivg++) { - auto sig = vsoaDevice.view()[ivg].sortInd(); - auto zgc = vsoaDevice.view()[sig].zv() + z0; - auto zDist = std::abs(zc - zgc); - //insert some matching condition - if (zDist > dzCut_) - continue; - if (mindz > zDist) { - mindz = zDist; - closestVtxidx = sig; - } - } - if (closestVtxidx == notFound) - continue; - - auto zg = vsoaDevice.view()[closestVtxidx].zv(); - auto xg = x0 + dxdz * zg; - auto yg = y0 + dydz * zg; - zg += z0; - auto ndofDevice = vsoaDevice.view()[closestVtxidx].ndof(); - auto chi2Device = vsoaDevice.view()[closestVtxidx].chi2(); - - hx_->Fill(xc - x0, xg - x0); - hy_->Fill(yc - y0, yg - y0); - hz_->Fill(zc, zg); - hxdiff_->Fill(xc - xg); - hydiff_->Fill(yc - yg); - hzdiff_->Fill(zc - zg); - hchi2_->Fill(chi2Host, chi2Device); - hchi2oNdof_->Fill(chi2Host / ndofHost, chi2Device / ndofDevice); - hptv2_->Fill(vsoaHost.view()[sic].ptv2(), vsoaDevice.view()[closestVtxidx].ptv2()); - hntrks_->Fill(ndofHost + 1, ndofDevice + 1); - } - hnVertex_->Fill(nVerticesHost, nVerticesDevice); -} - -// -// -- Book Histograms -// -void SiPixelCompareVertexSoAAlpaka::bookHistograms(DQMStore::IBooker& ibooker, - edm::Run const& iRun, - edm::EventSetup const& iSetup) { - ibooker.cd(); - ibooker.setCurrentFolder(topFolderName_); - - // FIXME: all the 2D correlation plots are quite heavy in terms of memory consumption, so a as soon as DQM supports either TH2I or THnSparse - // these should be moved to a less resource consuming format - hnVertex_ = ibooker.book2I("nVertex", "# of Vertices;Host;Device", 101, -0.5, 100.5, 101, -0.5, 100.5); - hx_ = ibooker.book2I("vx", "Vertez x - Beamspot x;Host;Device", 50, -0.1, 0.1, 50, -0.1, 0.1); - hy_ = ibooker.book2I("vy", "Vertez y - Beamspot y;Host;Device", 50, -0.1, 0.1, 50, -0.1, 0.1); - hz_ = ibooker.book2I("vz", "Vertez z;Host;Device", 30, -30., 30., 30, -30., 30.); - hchi2_ = ibooker.book2I("chi2", "Vertex chi-squared;Host;Device", 40, 0., 20., 40, 0., 20.); - hchi2oNdof_ = ibooker.book2I("chi2oNdof", "Vertex chi-squared/Ndof;Host;Device", 40, 0., 20., 40, 0., 20.); - hptv2_ = ibooker.book2I("ptsq", "Vertex #sum (p_{T})^{2};Host;Device", 200, 0., 200., 200, 0., 200.); - hntrks_ = ibooker.book2I("ntrk", "#tracks associated;Host;Device", 100, -0.5, 99.5, 100, -0.5, 99.5); - hntrks_ = ibooker.book2I("ntrk", "#tracks associated;Host;Device", 100, -0.5, 99.5, 100, -0.5, 99.5); - hxdiff_ = ibooker.book1D("vxdiff", ";Vertex x difference (Host - Device);#entries", 100, -0.001, 0.001); - hydiff_ = ibooker.book1D("vydiff", ";Vertex y difference (Host - Device);#entries", 100, -0.001, 0.001); - hzdiff_ = ibooker.book1D("vzdiff", ";Vertex z difference (Host - Device);#entries", 100, -2.5, 2.5); -} - -void SiPixelCompareVertexSoAAlpaka::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - // monitorpixelVertexSoA - edm::ParameterSetDescription desc; - desc.add("pixelVertexSrcHost", edm::InputTag("pixelVerticesAlpakaSerial")); - desc.add("pixelVertexSrcDevice", edm::InputTag("pixelVerticesAlpaka")); - desc.add("beamSpotSrc", edm::InputTag("offlineBeamSpot")); - desc.add("topFolderName", "SiPixelHeterogeneous/PixelVertexCompareSoADeviceVSHost"); - desc.add("dzCut", 1.); - descriptions.addWithDefaultLabel(desc); -} - -DEFINE_FWK_MODULE(SiPixelCompareVertexSoAAlpaka); diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoA.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoA.cc index e971ff184b052..f3ccb74bc3fea 100644 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoA.cc +++ b/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoA.cc @@ -52,6 +52,7 @@ class SiPixelMonitorTrackSoA : public DQMEDAnalyzer { MonitorElement* hChi2VsPhi; MonitorElement* hChi2VsEta; MonitorElement* hpt; + MonitorElement* hCurvature; MonitorElement* heta; MonitorElement* hphi; MonitorElement* hz; @@ -112,6 +113,7 @@ void SiPixelMonitorTrackSoA::analyze(const edm::Event& iEvent, const edm::Eve float zip = helper::zip(tsoa.const_view(), it); float eta = tsoa.view()[it].eta(); float tip = helper::tip(tsoa.const_view(), it); + auto charge = helper::charge(tsoa.const_view(), it); hchi2->Fill(chi2); hChi2VsPhi->Fill(phi, chi2); @@ -123,6 +125,7 @@ void SiPixelMonitorTrackSoA::analyze(const edm::Event& iEvent, const edm::Eve hnLayersVsPhi->Fill(phi, nLayers); hnLayersVsEta->Fill(eta, nLayers); hpt->Fill(pt); + hCurvature->Fill(charge / pt); heta->Fill(eta); hphi->Fill(phi); hz->Fill(zip); @@ -145,8 +148,8 @@ void SiPixelMonitorTrackSoA::bookHistograms(DQMStore::IBooker& iBook, // clang-format off std::string toRep = "Number of tracks"; - hnTracks = iBook.book1D("nTracks", fmt::sprintf(";%s per event;#events",toRep), 1001, -0.5, 1000.5); - hnLooseAndAboveTracks = iBook.book1D("nLooseAndAboveTracks", fmt::sprintf(";%s (quality #geq loose) per event;#events",toRep), 1001, -0.5, 1000.5); + hnTracks = iBook.book1D("nTracks", fmt::sprintf(";%s per event;#events",toRep), 1001, -0.5, 2001.5); + hnLooseAndAboveTracks = iBook.book1D("nLooseAndAboveTracks", fmt::sprintf(";%s (quality #geq loose) per event;#events",toRep), 1001, -0.5, 2001.5); toRep = "Number of all RecHits per track (quality #geq loose)"; hnHits = iBook.book1D("nRecHits", fmt::sprintf(";%s;#tracks",toRep), 15, -0.5, 14.5); @@ -165,6 +168,7 @@ void SiPixelMonitorTrackSoA::bookHistograms(DQMStore::IBooker& iBook, // clang-format on hpt = iBook.book1D("pt", ";Track (quality #geq loose) p_{T} [GeV];#tracks", 200, 0., 200.); + hCurvature = iBook.book1D("curvature", ";Track (quality #geq loose) q/p_{T} [GeV^{-1}];#tracks", 100, -3., 3.); heta = iBook.book1D("eta", ";Track (quality #geq loose) #eta;#tracks", 30, -3., 3.); hphi = iBook.book1D("phi", ";Track (quality #geq loose) #phi;#tracks", 30, -M_PI, M_PI); hz = iBook.book1D("z", ";Track (quality #geq loose) z [cm];#tracks", 30, -30., 30.); diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoAAlpaka.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoAAlpaka.cc index fd98957ee8492..8bd1cdfa2e429 100644 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoAAlpaka.cc +++ b/DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorTrackSoAAlpaka.cc @@ -52,6 +52,7 @@ class SiPixelMonitorTrackSoAAlpaka : public DQMEDAnalyzer { MonitorElement* hChi2VsPhi; MonitorElement* hChi2VsEta; MonitorElement* hpt; + MonitorElement* hCurvature; MonitorElement* heta; MonitorElement* hphi; MonitorElement* hz; @@ -112,6 +113,7 @@ void SiPixelMonitorTrackSoAAlpaka::analyze(const edm::Event& iEvent, const ed float zip = tsoa.view()[it].state()(4); float eta = tsoa.view()[it].eta(); float tip = tsoa.view()[it].state()(1); + auto charge = reco::charge(tsoa.view(), it); hchi2->Fill(chi2); hChi2VsPhi->Fill(phi, chi2); @@ -123,6 +125,7 @@ void SiPixelMonitorTrackSoAAlpaka::analyze(const edm::Event& iEvent, const ed hnLayersVsPhi->Fill(phi, nLayers); hnLayersVsEta->Fill(eta, nLayers); hpt->Fill(pt); + hCurvature->Fill(charge / pt); heta->Fill(eta); hphi->Fill(phi); hz->Fill(zip); @@ -145,8 +148,8 @@ void SiPixelMonitorTrackSoAAlpaka::bookHistograms(DQMStore::IBooker& iBook, // clang-format off std::string toRep = "Number of tracks"; -hnTracks = iBook.book1D("nTracks", fmt::format(";{} per event;#events",toRep), 1001, -0.5, 1000.5); -hnLooseAndAboveTracks = iBook.book1D("nLooseAndAboveTracks", fmt::format(";{} (quality #geq loose) per event;#events",toRep), 1001, -0.5, 1000.5); +hnTracks = iBook.book1D("nTracks", fmt::format(";{} per event;#events",toRep), 1001, -0.5, 2001.5); +hnLooseAndAboveTracks = iBook.book1D("nLooseAndAboveTracks", fmt::format(";{} (quality #geq loose) per event;#events",toRep), 1001, -0.5, 2001.5); toRep = "Number of all RecHits per track (quality #geq loose)"; hnHits = iBook.book1D("nRecHits", fmt::format(";{};#tracks",toRep), 15, -0.5, 14.5); @@ -165,6 +168,7 @@ hChi2VsEta = iBook.bookProfile("nChi2ndofVsEta", fmt::format("{} vs track #eta;T // clang-format on hpt = iBook.book1D("pt", ";Track (quality #geq loose) p_{T} [GeV];#tracks", 200, 0., 200.); + hCurvature = iBook.book1D("curvature", ";Track (quality #geq loose) q/p_{T} [GeV^{-1}];#tracks", 100, -3., 3.); heta = iBook.book1D("eta", ";Track (quality #geq loose) #eta;#tracks", 30, -3., 3.); hphi = iBook.book1D("phi", ";Track (quality #geq loose) #phi;#tracks", 30, -M_PI, M_PI); hz = iBook.book1D("z", ";Track (quality #geq loose) z [cm];#tracks", 30, -30., 30.); diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelTrackComparisonHarvester.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelTrackComparisonHarvester.cc index 1d72a7bec4105..12be60250a65a 100644 --- a/DQM/SiPixelHeterogeneous/plugins/SiPixelTrackComparisonHarvester.cc +++ b/DQM/SiPixelHeterogeneous/plugins/SiPixelTrackComparisonHarvester.cc @@ -28,15 +28,31 @@ SiPixelTrackComparisonHarvester::SiPixelTrackComparisonHarvester(const edm::Para : topFolder_(iConfig.getParameter("topFolderName")) {} void SiPixelTrackComparisonHarvester::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) { - MonitorElement* hpt_eta_tkAllCPU = igetter.get(topFolder_ + "/ptetatrkAllCPU"); - MonitorElement* hpt_eta_tkAllCPUmatched = igetter.get(topFolder_ + "/ptetatrkAllCPUmatched"); - MonitorElement* hphi_z_tkAllCPU = igetter.get(topFolder_ + "/phiztrkAllCPU"); - MonitorElement* hphi_z_tkAllCPUmatched = igetter.get(topFolder_ + "/phiztrkAllCPUmatched"); + MonitorElement* hpt_eta_tkAllReference = igetter.get(topFolder_ + "/ptetatrkAllReference"); + if (hpt_eta_tkAllReference == nullptr) { + edm::LogError("SiPixelTrackComparisonHarvester") + << "MonitorElement not found: " << topFolder_ << "/ptetatrkAllReference. Skipping."; + return; + } + + MonitorElement* hpt_eta_tkAllReferencematched = igetter.get(topFolder_ + "/ptetatrkAllReferencematched"); + if (hpt_eta_tkAllReferencematched == nullptr) { + edm::LogError("SiPixelTrackComparisonHarvester") + << "MonitorElement not found: " << topFolder_ << "/ptetatrkAllReferencematched. Skipping."; + return; + } + + MonitorElement* hphi_z_tkAllReference = igetter.get(topFolder_ + "/phiztrkAllReference"); + if (hphi_z_tkAllReference == nullptr) { + edm::LogError("SiPixelTrackComparisonHarvester") + << "MonitorElement not found: " << topFolder_ << "/phiztrkAllReference. Skipping."; + return; + } - if (hpt_eta_tkAllCPU == nullptr or hpt_eta_tkAllCPUmatched == nullptr or hphi_z_tkAllCPU == nullptr or - hphi_z_tkAllCPUmatched == nullptr) { + MonitorElement* hphi_z_tkAllReferencematched = igetter.get(topFolder_ + "/phiztrkAllReferencematched"); + if (hphi_z_tkAllReferencematched == nullptr) { edm::LogError("SiPixelTrackComparisonHarvester") - << "MEs needed for this module are not found in the input file. Skipping."; + << "MonitorElement not found: " << topFolder_ << "/phiztrkAllReferencematched. Skipping."; return; } @@ -47,8 +63,8 @@ void SiPixelTrackComparisonHarvester::dqmEndJob(DQMStore::IBooker& ibooker, DQMS MonitorElement* hphi_z_matchRatio = ibooker.book2D( "matchingeff_phi_z", "Efficiency of track matching; #phi; z [cm];", 30, -M_PI, M_PI, 30, -30., 30.); - hpt_eta_matchRatio->divide(hpt_eta_tkAllCPUmatched, hpt_eta_tkAllCPU, 1., 1., "B"); - hphi_z_matchRatio->divide(hphi_z_tkAllCPUmatched, hphi_z_tkAllCPU, 1., 1., "B"); + hpt_eta_matchRatio->divide(hpt_eta_tkAllReferencematched, hpt_eta_tkAllReference, 1., 1., "B"); + hphi_z_matchRatio->divide(hphi_z_tkAllReferencematched, hphi_z_tkAllReference, 1., 1., "B"); // now create the 1D projection from the 2D histograms std::vector listOfMEsToProject = {"nTracks", @@ -59,12 +75,14 @@ void SiPixelTrackComparisonHarvester::dqmEndJob(DQMStore::IBooker& ibooker, DQMS "nChi2ndof", "charge", "pt", + "curvature", "eta", "phi", "z", "tip"}; for (const auto& me : listOfMEsToProject) { MonitorElement* input2D = igetter.get(topFolder_ + "/" + me); + edm::LogPrint("SiPixelTrackComparisonHarvester") << "processing " << topFolder_ + "/" + me; this->project2DalongDiagonal(input2D, ibooker); } } @@ -72,7 +90,7 @@ void SiPixelTrackComparisonHarvester::dqmEndJob(DQMStore::IBooker& ibooker, DQMS void SiPixelTrackComparisonHarvester::project2DalongDiagonal(MonitorElement* input2D, DQMStore::IBooker& ibooker) { if (input2D == nullptr) { edm::LogError("SiPixelTrackComparisonHarvester") - << "MEs needed for diagonal projection are not found in the input file. Skipping."; + << "ME needed for diagonal projection is not found in the input file at" << topFolder_ << ". Skipping."; return; } diff --git a/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQMHarvesting_cff.py b/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQMHarvesting_cff.py index d39b9e277bec7..c717a98168a75 100644 --- a/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQMHarvesting_cff.py +++ b/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQMHarvesting_cff.py @@ -2,19 +2,36 @@ siPixelHeterogeneousDQMHarvesting = cms.Sequence() # empty sequence if not both CPU and GPU recos are run from DQM.SiPixelPhase1Common.SiPixelPhase1RawData_cfi import * -from DQM.SiPixelHeterogeneous.SiPixelHeterogenousDQM_FirstStep_cff import SiPixelPhase1RawDataConfForCPU,SiPixelPhase1RawDataConfForGPU +from DQM.SiPixelHeterogeneous.SiPixelHeterogenousDQM_FirstStep_cff import SiPixelPhase1RawDataConfForCPU,SiPixelPhase1RawDataConfForGPU,SiPixelPhase1RawDataConfForSerial,SiPixelPhase1RawDataConfForDevice +# CUDA code siPixelPhase1RawDataHarvesterCPU = SiPixelPhase1RawDataHarvester.clone(histograms = SiPixelPhase1RawDataConfForCPU) siPixelPhase1RawDataHarvesterGPU = SiPixelPhase1RawDataHarvester.clone(histograms = SiPixelPhase1RawDataConfForGPU) +# alpaka code +siPixelPhase1RawDataHarvesterSerial = SiPixelPhase1RawDataHarvester.clone(histograms = SiPixelPhase1RawDataConfForSerial) +siPixelPhase1RawDataHarvesterDevice = SiPixelPhase1RawDataHarvester.clone(histograms = SiPixelPhase1RawDataConfForDevice) + from DQM.SiPixelHeterogeneous.siPixelTrackComparisonHarvester_cfi import * +siPixelTrackComparisonHarvesterAlpaka = siPixelTrackComparisonHarvester.clone(topFolderName = cms.string('SiPixelHeterogeneous/PixelTrackCompareDeviceVSHost')) siPixelHeterogeneousDQMComparisonHarvesting = cms.Sequence(siPixelPhase1RawDataHarvesterCPU * siPixelPhase1RawDataHarvesterGPU * siPixelTrackComparisonHarvester ) +siPixelHeterogeneousDQMComparisonHarvestingAlpaka = cms.Sequence(siPixelPhase1RawDataHarvesterSerial * + siPixelPhase1RawDataHarvesterDevice * + siPixelTrackComparisonHarvesterAlpaka ) + +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +_siPixelHeterogeneousDQMComparisonHarvestingAlpakaPhase2 = cms.Sequence(siPixelTrackComparisonHarvesterAlpaka ) + +phase2_tracker.toReplaceWith(siPixelHeterogeneousDQMComparisonHarvestingAlpaka,_siPixelHeterogeneousDQMComparisonHarvestingAlpakaPhase2) + + # add the harvester in case of the validation modifier is active from Configuration.ProcessModifiers.gpuValidationPixel_cff import gpuValidationPixel gpuValidationPixel.toReplaceWith(siPixelHeterogeneousDQMHarvesting,siPixelHeterogeneousDQMComparisonHarvesting) - +from Configuration.ProcessModifiers.alpakaValidationPixel_cff import alpakaValidationPixel +(alpakaValidationPixel & ~gpuValidationPixel).toReplaceWith(siPixelHeterogeneousDQMHarvesting,siPixelHeterogeneousDQMComparisonHarvestingAlpaka) diff --git a/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQM_FirstStep_cff.py b/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQM_FirstStep_cff.py index 9c69ceef29a6d..a08b3df2eea33 100644 --- a/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQM_FirstStep_cff.py +++ b/DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQM_FirstStep_cff.py @@ -239,7 +239,7 @@ siPixelVertexSoAMonitorDevice * siPixelCompareVertices ) -# Phase-2 sequence +# Phase-2 sequence ... _monitorpixelSoACompareSource = cms.Sequence(siPixelPhase2MonitorRecHitsSoACPU * siPixelPhase2MonitorRecHitsSoAGPU * siPixelPhase2CompareRecHitsSoA * @@ -250,6 +250,18 @@ siPixelMonitorVertexSoAGPU * siPixelCompareVertexSoA) +# ...and the Alpaka version +_monitorpixelSoACompareSourceAlpakaPhase2 = cms.Sequence( + siPixelRecHitsSoAMonitorSerial * + siPixelRecHitsSoAMonitorDevice * + siPixelPhase1CompareRecHits * + siPixelTrackSoAMonitorSerial * + siPixelTrackSoAMonitorDevice * + siPixelPhase1CompareTracks * + siPixelVertexSoAMonitorSerial * + siPixelVertexSoAMonitorDevice * + siPixelCompareVertices ) + # HIon sequence _monitorpixelSoACompareSourceHIonPhase1 = cms.Sequence(siPixelHIonPhase1MonitorRecHitsSoACPU * siPixelHIonPhase1MonitorRecHitsSoAGPU * @@ -262,9 +274,12 @@ siPixelCompareVertexSoA) phase2_tracker.toReplaceWith(monitorpixelSoACompareSource,_monitorpixelSoACompareSource) +phase2_tracker.toReplaceWith(monitorpixelSoACompareSourceAlpaka,_monitorpixelSoACompareSourceAlpakaPhase2) from Configuration.ProcessModifiers.gpuValidationPixel_cff import gpuValidationPixel gpuValidationPixel.toReplaceWith(monitorpixelSoASource, monitorpixelSoACompareSource) from Configuration.ProcessModifiers.alpakaValidationPixel_cff import alpakaValidationPixel -(alpakaValidationPixel & ~gpuValidationPixel).toReplaceWith(monitorpixelSoASource, monitorpixelSoACompareSourceAlpaka) +(alpakaValidationPixel & ~gpuValidationPixel ).toReplaceWith(monitorpixelSoASource, monitorpixelSoACompareSourceAlpaka) + + diff --git a/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc b/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc index 3abfa10dcd180..3100a16fa3524 100644 --- a/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc +++ b/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc @@ -771,7 +771,7 @@ void SiPixelActionExecutor::fillFEDErrorSummary(DQMStore::IBooker &iBooker, temp = iGetter.get(fullpathname); temp->Reset(); } // If I don't reset this one, then I instead start adding error - // codes.. + // codes.. } sum_mes.push_back(temp); } @@ -1245,14 +1245,14 @@ void SiPixelActionExecutor::fillGrandBarrelSummaryHistos(DQMStore::IBooker &iBoo (*igm)->setBinContent(k + nbin_i, me->getBinContent(k)); } } // end var in igm (gsum_mes) - } // end igm loop - } // end var in im (contents) - } // end of iv loop - } // end of im loop + } // end igm loop + } // end var in im (contents) + } // end of iv loop + } // end of im loop iDir++; first_subdir = false; // We are done processing the first directory, we // don't add any new MEs in the future passes. - } // end of it loop (subdirs) + } // end of it loop (subdirs) // cout<<"...leaving // SiPixelActionExecutor::fillGrandBarrelSummaryHistos!"< subDirVec = iGetter.getSubdirs(); for (vector::const_iterator ic = subDirVec.begin(); ic != subDirVec.end(); ic++) { iBooker.cd(*ic); @@ -978,10 +978,10 @@ void SiPixelDataQuality::fillGlobalQualityPlot(DQMStore::IBooker &iBooker, } SummaryReportMap->setBinContent(lumisec + 1, i, contents); } // end for loop over summaryReportMap bins - } // end if reportSummaryMap ME exists - } // end if in summary directory - } // end if modCounter_ - } else { // Offline + } // end if reportSummaryMap ME exists + } // end if in summary directory + } // end if modCounter_ + } else { // Offline float barrel_errors_temp[1] = {-1.}; int barrel_cuts_temp[6] = {6 * -1}; float endcap_errors_temp[1] = {-1.}; diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc index 84f087b3c4940..07c00c3efcd6f 100644 --- a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc +++ b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc @@ -490,8 +490,8 @@ void SiPixelClusterSource::getrococcupancy(DetId detId, float modsign = (float)DBmodule / (abs((float)DBmodule)); float ladsign = (float)DBladder / (abs((float)DBladder)); - float rocx = ((float)col / (52. * 8.)) * modsign + ((float)DBmodule - (modsign)*0.5); - float rocy = ((float)row / (80. * 2.)) * ladsign + ((float)DBladder - (ladsign)*0.5); + float rocx = ((float)col / (52. * 8.)) * modsign + ((float)DBmodule - (modsign) * 0.5); + float rocy = ((float)row / (80. * 2.)) * ladsign + ((float)DBladder - (ladsign) * 0.5); // do the flip where need bool flip = false; @@ -499,9 +499,9 @@ void SiPixelClusterSource::getrococcupancy(DetId detId, flip = true; } if ((flip) && (DBladder > 0)) { - if ((((float)DBladder - (ladsign)*0.5) <= rocy) && (rocy < (float)DBladder)) { + if ((((float)DBladder - (ladsign) * 0.5) <= rocy) && (rocy < (float)DBladder)) { rocy = rocy + ladsign * 0.5; - } else if ((((float)DBladder) <= rocy) && (rocy < ((float)DBladder + (ladsign)*0.5))) { + } else if ((((float)DBladder) <= rocy) && (rocy < ((float)DBladder + (ladsign) * 0.5))) { rocy = rocy - ladsign * 0.5; } } diff --git a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc index cff88ed7e3327..de8f6394f9d0d 100644 --- a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc +++ b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc @@ -819,8 +819,8 @@ void SiPixelDigiSource::analyze(const edm::Event& iEvent, const edm::EventSetup& } } } //endif(Endcap && isUpgrade) - } // endif any digis in this module - } // endfor loop over all modules + } // endif any digis in this module + } // endfor loop over all modules if (lumiSection % 10 == 0 && ROCMapToReset) { for (int i = 0; i < 2; ++i) diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc index d721ff6444106..a901dfa52afc5 100644 --- a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc +++ b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc @@ -130,10 +130,10 @@ void SiPixelHLTSource::analyze(const edm::Event &iEvent, const edm::EventSetup & default: break; }; // end switch - } // end for(di - } // end if( isearch - } // end if( ((*it)->subDetector() - } // for(TrackerGeometry + } // end for(di + } // end if( isearch + } // end if( ((*it)->subDetector() + } // for(TrackerGeometry edm::DetSetVector::const_iterator isearch = errorinput->find(0xffffffff); @@ -160,8 +160,8 @@ void SiPixelHLTSource::analyze(const edm::Event &iEvent, const edm::EventSetup & default: break; }; // end switch - } // end for(di - } // end if( isearch + } // end for(di + } // end if( isearch // slow down... if (slowDown) usleep(100000); diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc index 4ea7fdad176d2..df939f2d3d630 100644 --- a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc +++ b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc @@ -265,7 +265,7 @@ int SiPixelRawDataErrorModule::fill(const edm::DetSetVector break; }; } // end if not double precision - } // end if modon + } // end if modon if (ladon && barrel) { if (errorType == 32 || errorType == 33 || errorType == 34) { @@ -869,8 +869,8 @@ int SiPixelRawDataErrorModule::fillFED(const edm::DetSetVectorFill(messageType); } } // end if not 30 || notReset - } // end if - } // end for + } // end if + } // end for if (numberOfSeriousErrors > 0) ((*meMapFEDs)["meNErrors_"][id_])->Fill((float)numberOfSeriousErrors); } // end if not an empty iterator diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc index b2064dd62bb6a..ab76826a26df7 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc @@ -760,7 +760,7 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event &iEvent, const edm::Ev dy_cl[1] = lp.y(); } } // loop on clusterSets - } // loop on clusterCollection + } // loop on clusterCollection for (size_t i = 0; i < 2; i++) { if (minD[i] < 9999.) { dx_cl[i] = fabs(dx_cl[i] - lx); @@ -768,8 +768,8 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event &iEvent, const edm::Ev } } } // valid clusterCollectionHandle - } // valid tracker - } // valid cpEstimator + } // valid tracker + } // valid cpEstimator // distance of hit from closest cluster! float d_cl[2]; d_cl[0] = d_cl[1] = -9999.; @@ -807,7 +807,7 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event &iEvent, const edm::Ev } // end of else } // end for (all traj measurements of pixeltrack) - } // end if (is pixeltrack) + } // end if (is pixeltrack) else if (debug_) std::cout << "no pixeltrack:\n"; diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc index c8f7ad06dd8c3..885907a7a0406 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc @@ -998,7 +998,7 @@ void SiPixelTrackResidualSource::analyze(const edm::Event &iEvent, const edm::Ev } // PXB } // valid - } // loop rechits + } // loop rechits // CS extra plots @@ -1052,9 +1052,9 @@ void SiPixelTrackResidualSource::analyze(const edm::Event &iEvent, const edm::Ev } } // three hits - } // is valid - } // rechits loop - } // pt 4 + } // is valid + } // rechits loop + } // pt 4 } } //-----Tracks @@ -1353,7 +1353,7 @@ void SiPixelTrackResidualSource::analyze(const edm::Event &iEvent, const edm::Ev } // end of else } // end for (all traj measurements of pixeltrack) - } // end if (is pixeltrack) + } // end if (is pixeltrack) else { if (debug_) std::cout << "no pixeltrack:\n"; @@ -1569,7 +1569,7 @@ void SiPixelTrackResidualSource::analyze(const edm::Event &iEvent, const edm::Ev } } // end if it's a Pixel module - } // end for loop over tracker detector geometry modules + } // end for loop over tracker detector geometry modules if (trackclusters > 0) (meNofClustersOnTrack_)->Fill(0, trackclusters); @@ -1621,8 +1621,8 @@ void SiPixelTrackResidualSource::getrococcupancy(DetId detId, float modsign = (float)DBmodule / (abs((float)DBmodule)); float ladsign = (float)DBladder / (abs((float)DBladder)); - float rocx = ((float)col / (52. * 8.)) * modsign + ((float)DBmodule - (modsign)*0.5); - float rocy = ((float)row / (80. * 2.)) * ladsign + ((float)DBladder - (ladsign)*0.5); + float rocx = ((float)col / (52. * 8.)) * modsign + ((float)DBmodule - (modsign) * 0.5); + float rocy = ((float)row / (80. * 2.)) * ladsign + ((float)DBladder - (ladsign) * 0.5); // do the flip where need bool flip = false; @@ -1630,9 +1630,9 @@ void SiPixelTrackResidualSource::getrococcupancy(DetId detId, flip = true; } if ((flip) && (DBladder > 0)) { - if ((((float)DBladder - (ladsign)*0.5) <= rocy) && (rocy < (float)DBladder)) { + if ((((float)DBladder - (ladsign) * 0.5) <= rocy) && (rocy < (float)DBladder)) { rocy = rocy + ladsign * 0.5; - } else if ((((float)DBladder) <= rocy) && (rocy < ((float)DBladder + (ladsign)*0.5))) { + } else if ((((float)DBladder) <= rocy) && (rocy < ((float)DBladder + (ladsign) * 0.5))) { rocy = rocy - ladsign * 0.5; } } diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py index 506c4ea36de7e..a8bd3f6fca8a5 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py @@ -40,7 +40,7 @@ process.load("RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi") process.load("RecoVertex.BeamSpotProducer.BeamSpot_cff") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") process.load("DQM.SiPixelMonitorRawData.SiPixelMonitorRawData_cfi") diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py index aae969159fbcf..05606d081afcb 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py @@ -38,7 +38,7 @@ process.load("RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi") process.load("RecoVertex.BeamSpotProducer.BeamSpot_cff") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") process.load("DQM.SiPixelMonitorRawData.SiPixelMonitorRawData_cfi") diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py index 2e35f59babf76..2087283dbb793 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py @@ -32,7 +32,7 @@ process.load("RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi") process.load("RecoVertex.BeamSpotProducer.BeamSpot_cff") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") process.load("DQM.SiPixelMonitorRawData.SiPixelMonitorRawData_cfi") diff --git a/DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h b/DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h index 085d3dcd40235..a0b109b588ade 100644 --- a/DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h +++ b/DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h @@ -54,7 +54,7 @@ class SiPixelPhase1Base : public DQMEDAnalyzer, public HistogramManagerHolder { // Also used to store the required triggers void bookHistograms(DQMStore::IBooker& iBooker, edm::Run const& run, edm::EventSetup const&) override; - ~SiPixelPhase1Base() override{}; + ~SiPixelPhase1Base() override {} protected: // Returns a value of whether the trigger stored at position "trgidx" is properly fired. @@ -76,7 +76,7 @@ class SiPixelPhase1Base : public DQMEDAnalyzer, public HistogramManagerHolder { class SiPixelPhase1Harvester : public DQMEDHarvester, public HistogramManagerHolder { public: SiPixelPhase1Harvester(const edm::ParameterSet& iConfig) - : DQMEDHarvester(), HistogramManagerHolder(iConfig, consumesCollector(), edm::Transition::EndLuminosityBlock){}; + : DQMEDHarvester(), HistogramManagerHolder(iConfig, consumesCollector(), edm::Transition::EndLuminosityBlock) {} void dqmEndLuminosityBlock(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter, diff --git a/DQM/SiPixelPhase1Common/interface/SummationSpecification.h b/DQM/SiPixelPhase1Common/interface/SummationSpecification.h index 48d78343fff9c..deb8910621613 100644 --- a/DQM/SiPixelPhase1Common/interface/SummationSpecification.h +++ b/DQM/SiPixelPhase1Common/interface/SummationSpecification.h @@ -55,7 +55,7 @@ struct SummationStep { struct SummationSpecification { std::vector steps; - SummationSpecification(){}; + SummationSpecification() {} SummationSpecification(edm::ParameterSet const&, GeometryInterface&); template diff --git a/DQM/SiPixelPhase1Config/test/qTests/mean_charge_qualitytest_config.xml b/DQM/SiPixelPhase1Config/test/qTests/mean_charge_qualitytest_config.xml index 0152b5deaa7c0..8caff0998b1a8 100644 --- a/DQM/SiPixelPhase1Config/test/qTests/mean_charge_qualitytest_config.xml +++ b/DQM/SiPixelPhase1Config/test/qTests/mean_charge_qualitytest_config.xml @@ -8,7 +8,7 @@ 0 0.65 0.80 - 27500. + 15000. 75000. @@ -17,7 +17,7 @@ 0 0.65 0.80 - 27500. + 15000. 75000. @@ -26,7 +26,7 @@ 0 0.65 0.80 - 35000. + 15000. 75000. @@ -35,7 +35,7 @@ 0 0.65 0.80 - 30000. + 15000. 75000. @@ -45,7 +45,7 @@ 0 0.75 0.90 - 35000. + 15000. 75000. @@ -54,7 +54,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -63,7 +63,7 @@ 0 0.75 0.90 - 35000. + 15000. 75000. @@ -72,7 +72,7 @@ 0 0.75 0.90 - 25000. + 15000. 75000. @@ -82,7 +82,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -91,7 +91,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -100,7 +100,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -109,7 +109,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -119,7 +119,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -128,7 +128,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -137,7 +137,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -146,7 +146,7 @@ 0 0.85 0.95 - 35000. + 15000. 75000. @@ -158,7 +158,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -167,7 +167,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -176,7 +176,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -186,7 +186,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -195,7 +195,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -204,7 +204,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -216,7 +216,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -225,7 +225,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -234,7 +234,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -244,7 +244,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -253,7 +253,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -262,7 +262,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -274,7 +274,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -283,7 +283,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -292,7 +292,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -302,7 +302,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -311,7 +311,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -320,7 +320,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -332,7 +332,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -341,7 +341,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -350,7 +350,7 @@ 0 0.85 0.95 - 20000. + 15000. 50000. @@ -360,7 +360,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -369,7 +369,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. @@ -378,7 +378,7 @@ 0 0.85 0.95 - 25000. + 15000. 50000. diff --git a/DQM/SiPixelPhase1Config/test/qTests/mean_size_qualitytest_config.xml b/DQM/SiPixelPhase1Config/test/qTests/mean_size_qualitytest_config.xml index a399b87d88a94..9b89bc34c379e 100644 --- a/DQM/SiPixelPhase1Config/test/qTests/mean_size_qualitytest_config.xml +++ b/DQM/SiPixelPhase1Config/test/qTests/mean_size_qualitytest_config.xml @@ -9,7 +9,7 @@ 0.65 0.80 1.5 - 6. + 7. @@ -18,7 +18,7 @@ 0.65 0.80 1.5 - 6. + 7. @@ -27,7 +27,7 @@ 0.65 0.80 1.5 - 6. + 7. @@ -36,7 +36,7 @@ 0.65 0.80 1.5 - 6. + 7. diff --git a/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc b/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc index 22259f69eea25..d09a6abf82d74 100644 --- a/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc +++ b/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc @@ -455,20 +455,34 @@ void SiPixelPhase1Summary::fillTrendPlots(DQMStore::IBooker& iBooker, DQMStore:: if (!runOnEndLumi_) return; // The following only occurs in the online //Reset some MEs every 10LS here - for (auto it : {1, 2, 3, 4}) { //PXBarrel + for (auto it : {1, 2, 3, 4}) { //PXBarrel (Cluster position and Dead channels) histName = "PixelPhase1/Phase1_MechanicalView/PXBarrel/clusterposition_zphi_PXLayer_" + std::to_string(it); MonitorElement* toReset = iGetter.get(histName); if (toReset != nullptr) { toReset->Reset(); } + histName = "PixelPhase1/FED/Dead Channels per ROC_per_SignedModuleCoord_per_SignedLadderCoord_PXLayer_" + + std::to_string(it); + MonitorElement* twoReset = iGetter.get(histName); + if (twoReset != nullptr) { + twoReset->Reset(); + } } - for (auto it : {"-3", "-2", "-1", "+1", "+2", "+3"}) { //PXForward + for (auto it : {"-3", "-2", "-1", "+1", "+2", "+3"}) { //PXForward (Cluster position) histName = "PixelPhase1/Phase1_MechanicalView/PXForward/clusterposition_xy_PXDisk_" + std::string(it); MonitorElement* toReset = iGetter.get(histName); if (toReset != nullptr) { toReset->Reset(); } } + for (auto it : {1, 2}) { //PXForward (Dead channels) + histName = "PixelPhase1/FED/Dead Channels per ROC_per_SignedDiskCoord_per_SignedBladePanelCoord_PXRing_" + + std::to_string(it); + MonitorElement* twoReset = iGetter.get(histName); + if (twoReset != nullptr) { + twoReset->Reset(); + } + } } //define this as a plug-in diff --git a/DQM/SiPixelPhase1Track/interface/SiPixelPhase1ResidualsExtra.h b/DQM/SiPixelPhase1Track/interface/SiPixelPhase1ResidualsExtra.h deleted file mode 100644 index 38137a1b5f5da..0000000000000 --- a/DQM/SiPixelPhase1Track/interface/SiPixelPhase1ResidualsExtra.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef SiPixelPhase1ResidualsExtra_SiPixelPhase1ResidualsExtra_h -#define SiPixelPhase1ResidualsExtra_SiPixelPhase1ResidualsExtra_h -// -*- C++ -*- -// -// Package: SiPixelPhase1ResidualsExtra -// Class : SiPixelPhase1ResidualsExtra -// -/* - - Description: Introduce some computation over the PixelPhase1 residuals distributions - - Usage: - - -*/ -// -// Original Author: Alessandro Rossi -// Created: 21st May 2021 -// - -//#include - -// user include files -#include "DQMServices/Core/interface/DQMEDHarvester.h" -#include "DQMServices/Core/interface/DQMStore.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -class SiPixelPhase1ResidualsExtra : public DQMEDHarvester { -public: - explicit SiPixelPhase1ResidualsExtra(const edm::ParameterSet& conf); - ~SiPixelPhase1ResidualsExtra() override; - -protected: - // BeginRun - void beginRun(edm::Run const& run, edm::EventSetup const& eSetup) override; - - // EndJob - void dqmEndJob(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter) override; - -private: - std::string topFolderName_; - int minHits_; - edm::ParameterSet conf_; - - std::map residuals_; - std::map DRnR_; - - //Book Monitoring Elements - void bookMEs(DQMStore::IBooker& iBooker); - - //Fill Monitoring Elements - void fillMEs(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter); -}; - -#endif diff --git a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1ResidualsExtra.cc b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1ResidualsExtra.cc index cb15ea5fdc213..7d7f51caaf6c5 100644 --- a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1ResidualsExtra.cc +++ b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1ResidualsExtra.cc @@ -7,55 +7,87 @@ Description: Create the Phsae 1 pixel DRnR plots - Implementation: - + Implementation: Introduce some computation over the PixelPhase1 residuals distributions */ // // Original Author: Alessandro Rossi // Created: 25th May 2021 // // -#include "DQM/SiPixelPhase1Track/interface/SiPixelPhase1ResidualsExtra.h" -// Framework -#include "FWCore/ServiceRegistry/interface/Service.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -// DQM Framework + +// system includes +#include +#include +#include +#include +#include + +// user includes #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h" +#include "DQMServices/Core/interface/DQMEDHarvester.h" #include "DQMServices/Core/interface/DQMStore.h" -// Geometry -#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" -#include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/Records/interface/TrackerTopologyRcd.h" -// DataFormats #include "DataFormats/DetId/interface/DetId.h" +#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h" +#include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/PixelBarrelName.h" -#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h" #include "DataFormats/TrackerCommon/interface/PixelEndcapName.h" -#include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h" -// -#include -#include -#include -#include -#include +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" +#include "FWCore/ServiceRegistry/interface/Service.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonTopologies/interface/PixelTopology.h" +#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" using namespace std; using namespace edm; +class SiPixelPhase1ResidualsExtra : public DQMEDHarvester { +public: + explicit SiPixelPhase1ResidualsExtra(const edm::ParameterSet& conf); + ~SiPixelPhase1ResidualsExtra() override; + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + +protected: + // BeginRun + void beginRun(edm::Run const& run, edm::EventSetup const& eSetup) override; + + // EndJob + void dqmEndJob(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter) override; + +private: + const std::string topFolderName_; + const std::string inputFolderName_; + const int minHits_; + + std::map residuals_; + std::map DRnR_; + + //Book Monitoring Elements + void bookMEs(DQMStore::IBooker& iBooker); + + //Fill Monitoring Elements + void fillMEs(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter); +}; + SiPixelPhase1ResidualsExtra::SiPixelPhase1ResidualsExtra(const edm::ParameterSet& iConfig) - : DQMEDHarvester(iConfig), conf_(iConfig) { + : DQMEDHarvester(iConfig), + topFolderName_(iConfig.getParameter("TopFolderName")), + inputFolderName_(iConfig.getParameter("InputFolderName")), + minHits_(iConfig.getParameter("MinHits")) { LogInfo("PixelDQM") << "SiPixelPhase1ResidualsExtra::SiPixelPhase1ResidualsExtra: Got DQM BackEnd interface" << endl; - topFolderName_ = conf_.getParameter("TopFolderName"); - minHits_ = conf_.getParameter("MinHits"); } SiPixelPhase1ResidualsExtra::~SiPixelPhase1ResidualsExtra() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) LogInfo("PixelDQM") << "SiPixelPhase1ResidualsExtra::~SiPixelPhase1ResidualsExtra: Destructor" << endl; } @@ -292,13 +324,13 @@ void SiPixelPhase1ResidualsExtra::fillMEs(DQMStore::IBooker& iBooker, DQMStore:: for (std::string layer : {"1", "2", "3", "4"}) { MonitorElement* me_x = - iGetter.get("PixelPhase1/Tracks/PXBarrel/residual_x_per_SignedModule_per_SignedLadder_PXLayer_" + layer); + iGetter.get(inputFolderName_ + "/PXBarrel/residual_x_per_SignedModule_per_SignedLadder_PXLayer_" + layer); MonitorElement* me_y = - iGetter.get("PixelPhase1/Tracks/PXBarrel/residual_y_per_SignedModule_per_SignedLadder_PXLayer_" + layer); + iGetter.get(inputFolderName_ + "/PXBarrel/residual_y_per_SignedModule_per_SignedLadder_PXLayer_" + layer); MonitorElement* me2_x = iGetter.get( - "PixelPhase1/Tracks/ResidualsExtra/PXBarrel/DRnR_x_per_SignedModule_per_SignedLadder_PXLayer_" + layer); + inputFolderName_ + "/ResidualsExtra/PXBarrel/DRnR_x_per_SignedModule_per_SignedLadder_PXLayer_" + layer); MonitorElement* me2_y = iGetter.get( - "PixelPhase1/Tracks/ResidualsExtra/PXBarrel/DRnR_y_per_SignedModule_per_SignedLadder_PXLayer_" + layer); + inputFolderName_ + "/ResidualsExtra/PXBarrel/DRnR_y_per_SignedModule_per_SignedLadder_PXLayer_" + layer); if (me_x == nullptr || me_y == nullptr || me2_x == nullptr || me2_y == nullptr) { edm::LogWarning("SiPixelPhase1ResidualsExtra") @@ -388,13 +420,13 @@ void SiPixelPhase1ResidualsExtra::fillMEs(DQMStore::IBooker& iBooker, DQMStore:: //PXForward separating outer and inner modules as well as positive and negative side for (std::string ring : {"1", "2"}) { MonitorElement* me_x = - iGetter.get("PixelPhase1/Tracks/PXForward/residual_x_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); + iGetter.get(inputFolderName_ + "/PXForward/residual_x_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); MonitorElement* me_y = - iGetter.get("PixelPhase1/Tracks/PXForward/residual_y_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); + iGetter.get(inputFolderName_ + "/PXForward/residual_y_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); MonitorElement* me2_x = iGetter.get( - "PixelPhase1/Tracks/ResidualsExtra/PXForward/DRnR_x_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); + inputFolderName_ + "/ResidualsExtra/PXForward/DRnR_x_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); MonitorElement* me2_y = iGetter.get( - "PixelPhase1/Tracks/ResidualsExtra/PXForward/DRnR_y_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); + inputFolderName_ + "/ResidualsExtra/PXForward/DRnR_y_per_PXDisk_per_SignedBladePanel_PXRing_" + ring); if (me_x == nullptr || me_y == nullptr || me2_x == nullptr || me2_y == nullptr) { edm::LogWarning("SiPixelPhase1ResidualsExtra") @@ -472,5 +504,14 @@ void SiPixelPhase1ResidualsExtra::fillMEs(DQMStore::IBooker& iBooker, DQMStore:: } } +void SiPixelPhase1ResidualsExtra::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("TopFolderName", "PixelPhase1/Tracks/ResidualsExtra") + ->setComment("Folder in which to write output histograms"); + desc.add("InputFolderName", "")->setComment("Folder from which to fetch in the input MEs"); + desc.add("MinHits", 30)->setComment("minimum number of hits per module to fill the DRnR plots"); + descriptions.addWithDefaultLabel(desc); +} + //define this as a plug-in DEFINE_FWK_MODULE(SiPixelPhase1ResidualsExtra); diff --git a/DQM/SiPixelPhase1Track/python/SiPixelPhase1ResidualsExtra_cfi.py b/DQM/SiPixelPhase1Track/python/SiPixelPhase1ResidualsExtra_cfi.py index 0cd2c9efe6dcf..786314623c71b 100644 --- a/DQM/SiPixelPhase1Track/python/SiPixelPhase1ResidualsExtra_cfi.py +++ b/DQM/SiPixelPhase1Track/python/SiPixelPhase1ResidualsExtra_cfi.py @@ -3,5 +3,6 @@ SiPixelPhase1ResidualsExtra = DQMEDHarvester("SiPixelPhase1ResidualsExtra", TopFolderName = cms.string('PixelPhase1/Tracks/ResidualsExtra'), + InputFolderName = cms.string('PixelPhase1/Tracks'), MinHits = cms.int32(30) ) diff --git a/DQM/SiStripCommissioningDbClients/src/DaqScopeModeHistosUsingDb.cc b/DQM/SiStripCommissioningDbClients/src/DaqScopeModeHistosUsingDb.cc index b4fa60351d5f0..d1f9fc89314ed 100644 --- a/DQM/SiStripCommissioningDbClients/src/DaqScopeModeHistosUsingDb.cc +++ b/DQM/SiStripCommissioningDbClients/src/DaqScopeModeHistosUsingDb.cc @@ -206,7 +206,7 @@ void DaqScopeModeHistosUsingDb::update(SiStripConfigDb::FedDescriptionsRange fed LogTrace(mlDqmClient_) << ss.str(); } } // end loop on strips - } // end loop on apvs + } // end loop on apvs updated_peds++; } diff --git a/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc b/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc index ddbb41580a8b3..0a8078b9cdad8 100644 --- a/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc +++ b/DQM/SiStripCommissioningDbClients/src/PedestalsHistosUsingDb.cc @@ -176,7 +176,7 @@ void PedestalsHistosUsingDb::update(SiStripConfigDb::FedDescriptionsRange feds) } } // end loop on strips - } // end loop on apvs + } // end loop on apvs updated++; } else { diff --git a/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc b/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc index 504b0e600bc44..035b6c9416657 100644 --- a/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc +++ b/DQM/SiStripCommissioningDbClients/src/PedsFullNoiseHistosUsingDb.cc @@ -228,7 +228,7 @@ void PedsFullNoiseHistosUsingDb::update(SiStripConfigDb::FedDescriptionsRange fe LogTrace(mlDqmClient_) << ss.str(); } } // end loop on strips - } // end loop on apvs + } // end loop on apvs updated++; } else { // device not found in the analysis if (deviceIsPresent(fec_key)) { diff --git a/DQM/SiStripCommissioningSources/plugins/BuildFile.xml b/DQM/SiStripCommissioningSources/plugins/BuildFile.xml index 85922b1686717..874bfd94d8e7d 100644 --- a/DQM/SiStripCommissioningSources/plugins/BuildFile.xml +++ b/DQM/SiStripCommissioningSources/plugins/BuildFile.xml @@ -1,4 +1,5 @@ + diff --git a/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.h b/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.h index 0ff75238084f7..e6aef99cb23e8 100644 --- a/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.h +++ b/DQM/SiStripCommissioningSources/plugins/tracking/SiStripFineDelayHit.h @@ -46,7 +46,7 @@ class SiStripFineDelayHit : public edm::one::EDProducer { private: void beginRun(const edm::Run&, const edm::EventSetup&) override; void produce(edm::Event&, const edm::EventSetup&) override; - void endRun(const edm::Run&, const edm::EventSetup&) override{}; + void endRun(const edm::Run&, const edm::EventSetup&) override {} virtual void produceNoTracking(edm::Event&, const edm::EventSetup&); using DeviceMask = std::pair; DeviceMask deviceMask(const StripSubdetector::SubDetector subdet, diff --git a/DQM/SiStripCommissioningSources/src/FineDelayTask.cc b/DQM/SiStripCommissioningSources/src/FineDelayTask.cc index 6b6c0e0cad8d3..fb25d00c64df3 100644 --- a/DQM/SiStripCommissioningSources/src/FineDelayTask.cc +++ b/DQM/SiStripCommissioningSources/src/FineDelayTask.cc @@ -87,20 +87,20 @@ void FineDelayTask::fill(const SiStripEventSummary& summary, const edm::DetSet> 6) == 2) latencyShift -= 3; // layer in deconv, rest in peak - if ((latencyCode >> 6) == 1) + else if ((latencyCode >> 6) == 1) latencyShift += 3; // layer in peak, rest in deconv - float correctedDelay = + float correctedDelayBase = delay - (latencyShift * 25.); // shifts the delay so that 0 corresponds to the current settings. LogDebug("Commissioning") << "[FineDelayTask::fill]; the delay is " << delay; // loop on the strips to find the (maybe) non-zero digi for (unsigned int strip = 0; strip < digis.data.size(); strip++) { if (digis.data[strip].adc() != 0) { - // apply the TOF correction - float tof = (digis.data[strip].adc() >> 8) / 10.; - correctedDelay = delay - (latencyShift * 25.) - tof; if ((digis.data[strip].adc() >> 8) == 255) continue; // skip hit if TOF is in overflow + // apply the TOF correction + float tof = (digis.data[strip].adc() >> 8) / 10.; + float correctedDelay = correctedDelayBase - tof; // compute the bin float nbins = NBINS; float lowbin = LOWBIN; diff --git a/DQM/SiStripCommissioningSources/src/NoiseTask.cc b/DQM/SiStripCommissioningSources/src/NoiseTask.cc index 0765d7327328a..b2060eba526fa 100644 --- a/DQM/SiStripCommissioningSources/src/NoiseTask.cc +++ b/DQM/SiStripCommissioningSources/src/NoiseTask.cc @@ -203,7 +203,7 @@ void NoiseTask::book() { << "Could not set Pedestals/Noises for DetId|Apv# -> " << connection().detId() << '|' << (nAPV_PAIR * 2 + nLclApv) << ". !!! POSSIBLE BUG !!!"; } // End Try block - } // End Local Apvs loop + } // End Local Apvs loop } // ----------------------------------------------------------------------------- diff --git a/DQM/SiStripCommissioningSources/src/OptoScanTask.cc b/DQM/SiStripCommissioningSources/src/OptoScanTask.cc index df9878b5821a5..bd12ebe73ef18 100644 --- a/DQM/SiStripCommissioningSources/src/OptoScanTask.cc +++ b/DQM/SiStripCommissioningSources/src/OptoScanTask.cc @@ -68,7 +68,7 @@ void OptoScanTask::book() { opto_[igain][ihisto].vSumOfSquares_.resize(nbins, 0); } // end loop on histos - } // end loop on gains + } // end loop on gains } // ----------------------------------------------------------------------------- diff --git a/DQM/SiStripCommissioningSources/src/PedsOnlyTask.cc b/DQM/SiStripCommissioningSources/src/PedsOnlyTask.cc index 0bdbbf64a04a6..6ecac6140a90a 100644 --- a/DQM/SiStripCommissioningSources/src/PedsOnlyTask.cc +++ b/DQM/SiStripCommissioningSources/src/PedsOnlyTask.cc @@ -119,6 +119,6 @@ void PedsOnlyTask::update() { updateTProfile.setBinContent(pedsProf, nAbsBin, 5, lclPedestals[nBin], lclNoises[nBin]); updateTProfile.setBinContent(noiseProf, nAbsBin, 5, lclNoises[nBin], 0); } // End loop over BINs - } // End loop over Local Apvs + } // End loop over Local Apvs } // ----------------------------------------------------------------------------- diff --git a/DQM/SiStripCommissioningSources/src/SiStripCommissioningSource.cc b/DQM/SiStripCommissioningSources/src/SiStripCommissioningSource.cc index dab30429c9619..8cc7006bbc7ef 100644 --- a/DQM/SiStripCommissioningSources/src/SiStripCommissioningSource.cc +++ b/DQM/SiStripCommissioningSources/src/SiStripCommissioningSource.cc @@ -672,7 +672,7 @@ void SiStripCommissioningSource::fillHistos(const SiStripEventSummary* const sum } } } // fed channel loop - } // fed id loop + } // fed id loop } // ----------------------------------------------------------------------------- @@ -890,11 +890,11 @@ void SiStripCommissioningSource::createCablingTasks() { } } // loop through apv pairs - } // loop through modules - } // loop through ccus - } // loop through rings - } // loop through fecs - } // loop through crates + } // loop through modules + } // loop through ccus + } // loop through rings + } // loop through fecs + } // loop through crates edm::LogVerbatim(mlDqmSource_) << "[SiStripCommissioningSource::" << __func__ << "]" << " Created " << booked << " CommissioningTask objects and booked histograms"; @@ -1039,8 +1039,8 @@ void SiStripCommissioningSource::createTasks(sistrip::RunType run_type, const ed edm::LogWarning(mlDqmSource_) << ss.str(); } } // loop over fed channels - } // loop over feds - } // end other tasks + } // loop over feds + } // end other tasks edm::LogVerbatim(mlDqmSource_) << "[SiStripCommissioningSource::" << __func__ << "]" << " Created " << booked << " CommissioningTask objects and booked histograms"; } diff --git a/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc b/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc index 1281027ec8a46..0beeac075c4ad 100644 --- a/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc +++ b/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc @@ -301,7 +301,7 @@ void SiStripMonitorApproximateCluster::analyze(const edm::Event& iEvent, const e } // if we're doing the comparison cluster by cluster } // loop on clusters in a detset - } // loop on the detset vector + } // loop on the detset vector h_nclusters_->Fill(nApproxClusters); h_numberFEDErrors_->Fill((*sistripFEDErrorsVector).size()); diff --git a/DQM/SiStripMonitorClient/plugins/SiStripCertificationInfo.cc b/DQM/SiStripMonitorClient/plugins/SiStripCertificationInfo.cc index fed8211c7a94e..7446948ec7a77 100644 --- a/DQM/SiStripMonitorClient/plugins/SiStripCertificationInfo.cc +++ b/DQM/SiStripMonitorClient/plugins/SiStripCertificationInfo.cc @@ -35,7 +35,7 @@ class SiStripCertificationInfo private: void beginRun(edm::Run const& run, edm::EventSetup const& eSetup) override; - void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) override{}; + void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) override {} void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& iSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; void analyze(edm::Event const&, edm::EventSetup const&) override; diff --git a/DQM/SiStripMonitorClient/plugins/SiStripDaqInfo.cc b/DQM/SiStripMonitorClient/plugins/SiStripDaqInfo.cc index de6fabe598083..1dad6323926c0 100644 --- a/DQM/SiStripMonitorClient/plugins/SiStripDaqInfo.cc +++ b/DQM/SiStripMonitorClient/plugins/SiStripDaqInfo.cc @@ -40,7 +40,7 @@ class SiStripDaqInfo : public edm::one::EDAnalyzer const& fed_ids, edm::EventSetup const& iSetup); diff --git a/DQM/SiStripMonitorClient/plugins/SiStripOfflineDQM.h b/DQM/SiStripMonitorClient/plugins/SiStripOfflineDQM.h index d8eabb0f7b168..3ef88e185c2a4 100644 --- a/DQM/SiStripMonitorClient/plugins/SiStripOfflineDQM.h +++ b/DQM/SiStripMonitorClient/plugins/SiStripOfflineDQM.h @@ -60,12 +60,12 @@ class SiStripOfflineDQM : public edm::one::EDProducer 1) { diff --git a/DQM/SiStripMonitorHardware/src/SiStripShotFilter.cc b/DQM/SiStripMonitorHardware/src/SiStripShotFilter.cc index 2cfeac6b6b8de..473ec309fc986 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripShotFilter.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripShotFilter.cc @@ -137,8 +137,8 @@ bool SiStripShotFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup break; } } //loop on shots - } //loop on channels - } //loop on FEDs. + } //loop on channels + } //loop on FEDs. if (lShots > 0) fOut_ << "### " << iEvent.id().event() << " " << lShots << std::endl; diff --git a/DQM/SiStripMonitorHardware/src/SiStripSpyDigiConverter.cc b/DQM/SiStripMonitorHardware/src/SiStripSpyDigiConverter.cc index 9f99f8060f63a..2ad66098d860f 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripSpyDigiConverter.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripSpyDigiConverter.cc @@ -240,8 +240,8 @@ namespace sistrip { for (; iDigi != endDetSetDigis; ++iDigi) { dsvFiller.addItem(*iDigi); } // end of loop over the digis. - } // end of loop over channels. - } // end of loop over FEDs + } // end of loop over channels. + } // end of loop over FEDs return dsvFiller.createDetSetVector(); } // end of SpyDigiConverter::mergeModuleChannels method. diff --git a/DQM/SiStripMonitorHardware/src/SiStripSpyDisplayModule.cc b/DQM/SiStripMonitorHardware/src/SiStripSpyDisplayModule.cc index 9b71b2343361e..320709d515e24 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripSpyDisplayModule.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripSpyDisplayModule.cc @@ -507,7 +507,7 @@ Bool_t SiStripSpyDisplayModule::MakeRawDigiHist_(const edm::Handledata.end(); ++idigi) { count++; hist->SetBinContent(count, static_cast((*idigi).adc())); - } // end of loop over the digis + } // end of loop over the digis return true; // Success! (Probably.) } @@ -542,7 +542,7 @@ Bool_t SiStripSpyDisplayModule::MakeProcessedRawDigiHist_( for (; idigi != digis_it->data.end(); ++idigi) { count++; hist->SetBinContent(count, static_cast((*idigi).adc())); - } // end of loop over the digis + } // end of loop over the digis return true; // Success! (Probably.) } diff --git a/DQM/SiStripMonitorPedestals/BuildFile.xml b/DQM/SiStripMonitorPedestals/BuildFile.xml index 6c5f1c1240a78..c4528904f14c0 100644 --- a/DQM/SiStripMonitorPedestals/BuildFile.xml +++ b/DQM/SiStripMonitorPedestals/BuildFile.xml @@ -3,6 +3,7 @@ + diff --git a/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h index 7288677216cfe..917cd16fe72b2 100644 --- a/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h +++ b/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h @@ -20,8 +20,8 @@ class SiStripBackPlaneCorrectionDQM void getActiveDetIds(const edm::EventSetup &eSetup) override; - void fillModMEs(const std::vector &selectedDetIds) override{}; - void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_) override{}; + void fillModMEs(const std::vector &selectedDetIds) override {} + void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_) override {} void fillSummaryMEs(const std::vector &selectedDetIds) override; void fillMEsForLayer( diff --git a/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h index 1efee4a734901..a19ed761b54cd 100644 --- a/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h +++ b/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h @@ -39,7 +39,7 @@ class SiStripBaseCondObjDQM { edm::ParameterSet const &fPSet, const TrackerTopology *tTopo); - virtual ~SiStripBaseCondObjDQM(){}; + virtual ~SiStripBaseCondObjDQM() {} virtual void getActiveDetIds(const edm::EventSetup &eSetup) = 0; diff --git a/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h index 204c0a5ea7a25..543ef4134812a 100644 --- a/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h +++ b/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h @@ -19,8 +19,8 @@ class SiStripLorentzAngleDQM : public SiStripBaseCondObjDQMGet &selectedDetIds) override{}; - void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_) override{}; + void fillModMEs(const std::vector &selectedDetIds) override {} + void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_) override {} void fillSummaryMEs(const std::vector &selectedDetIds) override; void fillMEsForLayer( diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h index cb17da1d0daf4..29c3b16356c5e 100644 --- a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h +++ b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h @@ -50,8 +50,8 @@ class SiStripCorrelateBadStripAndNoise : public edm::one::EDAnalyzer { private: void beginRun(const edm::Run &run, const edm::EventSetup &es) override; - void analyze(const edm::Event &, const edm::EventSetup &) override{}; - void endRun(const edm::Run &run, const edm::EventSetup &es) override{}; + void analyze(const edm::Event &, const edm::EventSetup &) override {} + void endRun(const edm::Run &run, const edm::EventSetup &es) override {} void endJob() override; void DoPlots(); diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h index 3b8126afe4893..0430f174a61c4 100644 --- a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h +++ b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h @@ -51,8 +51,8 @@ class SiStripPlotGain : public edm::one::EDAnalyzer { private: void beginRun(const edm::Run &run, const edm::EventSetup &es) override; - void analyze(const edm::Event &, const edm::EventSetup &) override{}; - void endRun(const edm::Run &run, const edm::EventSetup &es) override{}; + void analyze(const edm::Event &, const edm::EventSetup &) override {} + void endRun(const edm::Run &run, const edm::EventSetup &es) override {} void endJob() override; void DoAnalysis(const TrackerTopology &tTopo, const SiStripApvGain &); diff --git a/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc index 5b6c17ac201b1..802e697600267 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc @@ -262,6 +262,6 @@ void SiStripBackPlaneCorrectionDQM::fillMEsForLayer( selME_.SummaryOfCumulDistr->Fill(condObj_->getBackPlaneCorrection(sameLayerDetIds_[i])); } } // if Fill ... - } // FILLING FOR LAYER LEVEL + } // FILLING FOR LAYER LEVEL } // ----- diff --git a/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc index c2e5edbac03de..dba2770045fb5 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc @@ -252,5 +252,5 @@ void SiStripLorentzAngleDQM::fillMEsForLayer( selME_.SummaryOfCumulDistr->Fill(condObj_->getLorentzAngle(sameLayerDetIds_[i])); } } // if Fill ... - } // FILLING FOR LAYER LEVEL + } // FILLING FOR LAYER LEVEL } diff --git a/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc index 5c7428ba711da..50b92649ad6e5 100644 --- a/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc +++ b/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc @@ -121,7 +121,7 @@ void SiStripPedestalsDQM::fillMEsForLayer( } } // istrip - } // if Fill ... + } // if Fill ... if (hPSet_.getParameter("FillSummaryAtLayerLevel")) { // --> summary diff --git a/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc b/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc index 83047f400f6c7..38396d1032ee5 100644 --- a/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc +++ b/DQM/SiStripMonitorTrack/src/SiStripMonitorTrack.cc @@ -1470,8 +1470,8 @@ bool SiStripMonitorTrack::fillControlViewHistos(const edm::Event& ev) { } } // end of looping over the fed chan connections - } // end of looping over the rechits of the track - } // end of looping over the tracks + } // end of looping over the rechits of the track + } // end of looping over the tracks return true; } diff --git a/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorRecHit.cc b/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorRecHit.cc index 70a96af49a17f..4934f7b8a11cb 100644 --- a/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorRecHit.cc +++ b/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorRecHit.cc @@ -161,7 +161,7 @@ void Phase2ITMonitorRecHit::fillITHistos(const edm::Event& iEvent) { if (layerMEs_[key].poserrY) layerMEs_[key].poserrY->Fill(eta, million * rechit.localPositionError().yy()); } //end loop over rechits of a detId - } //End loop over DetSetVector + } //End loop over DetSetVector //fill nRecHits per event numberRecHits_->Fill(nTotrechitsinevt); diff --git a/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorRecHit.cc b/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorRecHit.cc index 62601a9485f0a..0f89a27ddb720 100644 --- a/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorRecHit.cc +++ b/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorRecHit.cc @@ -183,7 +183,7 @@ void Phase2OTMonitorRecHit::analyze(const edm::Event& iEvent, const edm::EventSe layerMEs_[key].localPosXY_S->Fill(lp.x(), lp.y()); } } //end loop over rechits of a detId - } //End loop over DetSetVector + } //End loop over DetSetVector //fill nRecHits per event numberRecHits_->Fill(nTotrechitsinevt); diff --git a/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorTTCluster.cc b/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorTTCluster.cc index 1c65b9c2d95c7..d07370211400e 100644 --- a/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorTTCluster.cc +++ b/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorTTCluster.cc @@ -157,7 +157,7 @@ void Phase2OTMonitorTTCluster::analyze(const edm::Event &iEvent, const edm::Even Cluster_Barrel_XY->Fill(posClu.x(), posClu.y()); - } // end if isBarrel + } // end if isBarrel else if (detIdClu.subdetId() == static_cast(StripSubdetector::TID)) // Phase 2 Outer Tracker Endcap { if (memberClu == 0) { @@ -183,8 +183,8 @@ void Phase2OTMonitorTTCluster::analyze(const edm::Event &iEvent, const edm::Even } } // end if isEndcap - } // end loop contentIter - } // end loop inputIter + } // end loop contentIter + } // end loop inputIter } // end of method // ------------ method called once each job just before starting event loop diff --git a/DQM/TrackerRemapper/bin/BuildFile.xml b/DQM/TrackerRemapper/bin/BuildFile.xml new file mode 100644 index 0000000000000..5576210c21960 --- /dev/null +++ b/DQM/TrackerRemapper/bin/BuildFile.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/DQM/TrackerRemapper/bin/printPixelLayersDisksMap.cc b/DQM/TrackerRemapper/bin/printPixelLayersDisksMap.cc new file mode 100644 index 0000000000000..2614c022c8346 --- /dev/null +++ b/DQM/TrackerRemapper/bin/printPixelLayersDisksMap.cc @@ -0,0 +1,69 @@ +#include "DQM/TrackerRemapper/interface/Phase1PixelMaps.h" +#include +#include +#include +#include // std::accumulate +#include +#include +#include + +#include "TCanvas.h" +#include "TStyle.h" + +int main(int argc, char* argv[]) { + std::string inputFile; + std::vector> detidValues; + + // Parse command line arguments + for (int i = 1; i < argc; ++i) { + if (std::string(argv[i]) == "--input-file" && i + 1 < argc) { + gStyle->SetPalette(kRainbow); + gStyle->SetNumberContours(256); + inputFile = argv[++i]; + } else { + gStyle->SetPalette(1); + // Treat as DetId list if no --input-file is provided + uint32_t detid = std::stoul(argv[i]); + detidValues.emplace_back(detid, 1.0); // Default value is 1.0 + } + } + + // If --input-file is provided, read from file + if (!inputFile.empty()) { + std::ifstream file(inputFile); + if (!file) { + std::cerr << "Error: Unable to open input file " << inputFile << std::endl; + return 1; + } + + std::string line; + while (std::getline(file, line)) { + std::istringstream iss(line); + uint32_t detid; + float value = 1.0; // Default value + + iss >> detid; + if (iss >> value) { // If a second column exists, read it as value + detidValues.emplace_back(detid, value); + } else { + detidValues.emplace_back(detid, 1.0); + } + } + } + + // Create the map and fill it + Phase1PixelMaps theMap("COLZ0A L"); // needed to not show the axis + TCanvas c = TCanvas("c", "c", 1200, 800); + theMap.book("mytest", "Marked modules", "input values"); + for (const auto& [detid, value] : detidValues) { + theMap.fill("mytest", detid, value); + } + + theMap.beautifyAllHistograms(); + theMap.drawSummaryMaps("mytest", c); + c.SaveAs("Phase1PixelMaps_Summary.png"); + + std::cout << "Filled tracker map with " << detidValues.size() << " detids." << std::endl; + + return 0; +} diff --git a/DQM/TrackerRemapper/bin/printPixelROCsMap.cc b/DQM/TrackerRemapper/bin/printPixelROCsMap.cc new file mode 100644 index 0000000000000..2b22a17b5ee0d --- /dev/null +++ b/DQM/TrackerRemapper/bin/printPixelROCsMap.cc @@ -0,0 +1,107 @@ +#include "DQM/TrackerRemapper/interface/Phase1PixelROCMaps.h" +#include +#include +#include +#include +#include // std::accumulate +#include +#include +#include + +#include "TCanvas.h" +#include "TStyle.h" + +int main(int argc, char* argv[]) { + std::string inputFile; + std::string inputROCsFile; + std::vector> detidValues; + std::vector>> detidRocs; + + // Parse command line arguments + for (int i = 1; i < argc; ++i) { + if (std::string(argv[i]) == "--input-file" && i + 1 < argc) { + gStyle->SetPalette(kRainbow); + gStyle->SetNumberContours(256); + inputFile = argv[++i]; + } else if (std::string(argv[i]) == "--input-ROCs" && i + 1 < argc) { + gStyle->SetPalette(kRainBow); + gStyle->SetNumberContours(256); + inputROCsFile = argv[++i]; + } else { + gStyle->SetPalette(1); + // Treat as DetId list if no --input-file is provided + uint32_t detid = std::stoul(argv[i]); + detidValues.emplace_back(detid, 1.0); // Default value is 1.0 + } + } + + // If --input-file is provided, read from file + if (!inputFile.empty()) { + std::ifstream file(inputFile); + if (!file) { + std::cerr << "Error: Unable to open input file " << inputFile << std::endl; + return 1; + } + + std::string line; + while (std::getline(file, line)) { + std::istringstream iss(line); + uint32_t detid; + float value = 1.0; // Default value + + iss >> detid; + if (iss >> value) { // If a second column exists, read it as value + detidValues.emplace_back(detid, value); + } else { + detidValues.emplace_back(detid, 1.0); + } + } + } + + // If --input-ROCs is provided, read from file + if (!inputROCsFile.empty()) { + std::ifstream file(inputROCsFile); + if (!file) { + std::cerr << "Error: Unable to open input ROCs file " << inputROCsFile << std::endl; + return 1; + } + + std::string line; + while (std::getline(file, line)) { + std::istringstream iss(line); + uint32_t detid; + std::string rocBits; + iss >> detid >> rocBits; + + if (rocBits.length() == 16) { + std::bitset<16> rocs(rocBits); + detidRocs.emplace_back(detid, rocs); + } else { + std::cerr << "Error: Invalid ROC bits string for detid " << detid << std::endl; + return 1; + } + } + } + + // Create the map and fill it + Phase1PixelROCMaps theMap(""); + + // Fill with detidValues if --input-file or command line DetIds are used + for (const auto& [detid, value] : detidValues) { + theMap.fillWholeModule(detid, value); + } + + // Fill with detidRocs if --input-ROCs is used + for (const auto& [detid, rocs] : detidRocs) { + theMap.fillSelectedRocs(detid, rocs, 1.0); // Default value 1.0 + } + + // Draw and save the map + TCanvas canvas("Summary", "Summary", 1200, 1600); + theMap.drawMaps(canvas, "Marked Pixel ROCs"); + canvas.SaveAs("Phase1PixelROCMap.png"); + + std::cout << "Filled Phase1 Pixel ROC map with " << detidValues.size() + detidRocs.size() << " detids." << std::endl; + + return 0; +} diff --git a/DQM/TrackerRemapper/bin/printPixelTrackerMap.cc b/DQM/TrackerRemapper/bin/printPixelTrackerMap.cc new file mode 100644 index 0000000000000..449705c675e77 --- /dev/null +++ b/DQM/TrackerRemapper/bin/printPixelTrackerMap.cc @@ -0,0 +1,69 @@ +#include "DQM/TrackerRemapper/interface/Phase1PixelSummaryMap.h" +#include +#include +#include +#include // std::accumulate +#include +#include +#include + +#include "TCanvas.h" +#include "TStyle.h" + +int main(int argc, char* argv[]) { + std::string inputFile; + std::vector> detidValues; + + // Parse command line arguments + for (int i = 1; i < argc; ++i) { + if (std::string(argv[i]) == "--input-file" && i + 1 < argc) { + gStyle->SetPalette(kRainbow); + gStyle->SetNumberContours(256); + inputFile = argv[++i]; + } else { + gStyle->SetPalette(1); + // Treat as DetId list if no --input-file is provided + uint32_t detid = std::stoul(argv[i]); + detidValues.emplace_back(detid, 1.0); // Default value is 1.0 + } + } + + // If --input-file is provided, read from file + if (!inputFile.empty()) { + std::ifstream file(inputFile); + if (!file) { + std::cerr << "Error: Unable to open input file " << inputFile << std::endl; + return 1; + } + + std::string line; + while (std::getline(file, line)) { + std::istringstream iss(line); + uint32_t detid; + float value = 1.0; // Default value + + iss >> detid; + if (iss >> value) { // If a second column exists, read it as value + detidValues.emplace_back(detid, value); + } else { + detidValues.emplace_back(detid, 1.0); + } + } + } + + // Create the map and fill it + Phase1PixelSummaryMap theMap("colz", "Marked Pixel Modules", "input values"); + theMap.createTrackerBaseMap(); + + for (const auto& [detid, value] : detidValues) { + theMap.fillTrackerMap(detid, value); + } + + TCanvas c = TCanvas("c", "c", 3000, 2000); + theMap.printTrackerMap(c); + c.SaveAs("Phase1PixelSummaryMap.png"); + + std::cout << "Filled tracker map with " << detidValues.size() << " detids." << std::endl; + + return 0; +} diff --git a/DQM/TrackerRemapper/bin/printStripTrackerMap.cc b/DQM/TrackerRemapper/bin/printStripTrackerMap.cc new file mode 100644 index 0000000000000..de3fd4d89b2fe --- /dev/null +++ b/DQM/TrackerRemapper/bin/printStripTrackerMap.cc @@ -0,0 +1,79 @@ +#include "DQM/TrackerRemapper/interface/SiStripTkMaps.h" +#include +#include +#include +#include // std::accumulate +#include +#include +#include + +#include "TCanvas.h" +#include "TStyle.h" + +int main(int argc, char* argv[]) { + std::string inputFile; + std::vector> detidValues; + + // Parse command line arguments + for (int i = 1; i < argc; ++i) { + if (std::string(argv[i]) == "--input-file" && i + 1 < argc) { + gStyle->SetPalette(kRainbow); + gStyle->SetNumberContours(256); + inputFile = argv[++i]; + } else { + gStyle->SetPalette(1); + // Treat as DetId list if no --input-file is provided + uint32_t detid = std::stoul(argv[i]); + detidValues.emplace_back(detid, 1.0); // Default value is 1.0 + } + } + + // If --input-file is provided, read from file + if (!inputFile.empty()) { + std::ifstream file(inputFile); + if (!file) { + std::cerr << "Error: Unable to open input file " << inputFile << std::endl; + return 1; + } + + std::string line; + while (std::getline(file, line)) { + std::istringstream iss(line); + uint32_t detid; + float value = 1.0; // Default value + + iss >> detid; + if (iss >> value) { // If a second column exists, read it as value + detidValues.emplace_back(detid, value); + } else { + detidValues.emplace_back(detid, 1.0); + } + } + } + + // Create the map and fill it + SiStripTkMaps theMap("COLZ0 AL"); + theMap.bookMap("Strip Tracker Map of Marked modules", "input values"); + + for (const auto& [detid, value] : detidValues) { + theMap.fill(detid, value); + } + + // Check if all values are the same using a lambda function + bool allSame = std::all_of(detidValues.begin(), detidValues.end(), [&](const std::pair& p) { + return p.second == detidValues[0].second; + }); + + TCanvas c = TCanvas("c", "c"); + theMap.drawMap(c, ""); + + // adjust the z-axis scale + if (allSame) + theMap.setZAxisRange(0., detidValues[0].second); + + c.SaveAs("SiStripsTkMaps.png"); + + std::cout << "Filled tracker map with " << detidValues.size() << " detids." << std::endl; + + return 0; +} diff --git a/DQM/TrackerRemapper/src/Phase1PixelMaps.cc b/DQM/TrackerRemapper/src/Phase1PixelMaps.cc index db06e79a252f9..55d6b2da2bf16 100644 --- a/DQM/TrackerRemapper/src/Phase1PixelMaps.cc +++ b/DQM/TrackerRemapper/src/Phase1PixelMaps.cc @@ -495,8 +495,8 @@ const indexedCorners Phase1PixelMaps::retrieveCorners(const std::vectorGetZaxis()->SetTitle(m_zAxisTitle.c_str()); m_trackerMap->GetZaxis()->CenterTitle(); + // Add all bins for (const auto& pair : m_bins) { m_trackerMap->AddBin(pair.second->Clone()); } + + // Initialize all bins with zero values + for (const auto& pair : m_bins) { + m_trackerMap->Fill(pair.first, 0.0); + } } //============================================================================ @@ -79,6 +85,24 @@ void SiStripTkMaps::drawMap(TCanvas& canvas, std::string option) { static constexpr int wH_ = 3000; static constexpr int hH_ = 700; + // Define a special value for "empty" bins + static constexpr double emptyBinValue = -9999; + + // Ensure all bins are drawn, including empty ones + for (int i = 1; i <= m_trackerMap->GetNumberOfBins(); ++i) { + if (m_trackerMap->GetBinContent(i) == 0) { + m_trackerMap->SetBinContent(i, emptyBinValue); + } + } + + // Adjust the color palette + double minValue = *std::min_element(m_values.begin(), m_values.end()); + double maxValue = *std::max_element(m_values.begin(), m_values.end()); + + // Setting a palette that skips the color for the emptyBinValue + m_trackerMap->SetMinimum(minValue); // Set min to the smallest valid value + m_trackerMap->SetMaximum(maxValue); // Set max to the largest valid value + canvas.cd(); adjustCanvasMargins(canvas.cd(), tmargin_, bmargin_, lmargin_, rmargin_); canvas.Update(); @@ -90,6 +114,14 @@ void SiStripTkMaps::drawMap(TCanvas& canvas, std::string option) { m_trackerMap->Draw(); } + // Set the "empty" bins color to white + for (int i = 1; i <= m_trackerMap->GetNumberOfBins(); ++i) { + if (m_trackerMap->GetBinContent(i) == emptyBinValue) { + m_trackerMap->SetBinContent(i, emptyBinValue); + m_trackerMap->SetMarkerColor(kWhite); + } + } + canvas.SetFrameLineColor(0); gPad->Update(); TPaletteAxis* palette = (TPaletteAxis*)m_trackerMap->GetListOfFunctions()->FindObject("palette"); diff --git a/DQM/TrackerRemapper/test/BuildFile.xml b/DQM/TrackerRemapper/test/BuildFile.xml index 20d95c95f88d5..7d81b630f5650 100644 --- a/DQM/TrackerRemapper/test/BuildFile.xml +++ b/DQM/TrackerRemapper/test/BuildFile.xml @@ -2,6 +2,7 @@ + diff --git a/DQM/TrackingMonitor/interface/TrackAnalyzer.h b/DQM/TrackingMonitor/interface/TrackAnalyzer.h index 42c0a4d8a144f..13d8e61184808 100644 --- a/DQM/TrackingMonitor/interface/TrackAnalyzer.h +++ b/DQM/TrackingMonitor/interface/TrackAnalyzer.h @@ -474,7 +474,7 @@ namespace tadqm { int det; int subdet; int monitoring; - explicit Key(int det, int subdet, int monitoring) : det(det), subdet(subdet), monitoring(monitoring){}; + explicit Key(int det, int subdet, int monitoring) : det(det), subdet(subdet), monitoring(monitoring) {} bool operator==(const Key& other) const { return (det == other.det && subdet == other.subdet && monitoring == other.monitoring); } diff --git a/DQM/TrackingMonitorClient/plugins/TrackingDQMClientHeavyIons.h b/DQM/TrackingMonitorClient/plugins/TrackingDQMClientHeavyIons.h index c8e8a4a9d56c8..d65ab8627fbab 100644 --- a/DQM/TrackingMonitorClient/plugins/TrackingDQMClientHeavyIons.h +++ b/DQM/TrackingMonitorClient/plugins/TrackingDQMClientHeavyIons.h @@ -13,7 +13,7 @@ class TrackingDQMClientHeavyIons : public DQMEDHarvester { public: TrackingDQMClientHeavyIons(const edm::ParameterSet& pset); - ~TrackingDQMClientHeavyIons() override{}; + ~TrackingDQMClientHeavyIons() override {} void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override; diff --git a/DQM/TrigXMonitor/interface/L1Scalers.h b/DQM/TrigXMonitor/interface/L1Scalers.h index afb78327951a2..bb1b7c0c0a143 100644 --- a/DQM/TrigXMonitor/interface/L1Scalers.h +++ b/DQM/TrigXMonitor/interface/L1Scalers.h @@ -19,7 +19,7 @@ namespace l1s { class L1Scalers : public DQMOneEDAnalyzer> { public: L1Scalers(const edm::ParameterSet &ps); - ~L1Scalers() override{}; + ~L1Scalers() override {} void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(const edm::Event &e, const edm::EventSetup &c) override; /// DQM Client Diagnostic should be performed here: diff --git a/DQM/TrigXMonitor/src/L1Scalers.cc b/DQM/TrigXMonitor/src/L1Scalers.cc index 3bb6f112c3906..ff64a5c352220 100644 --- a/DQM/TrigXMonitor/src/L1Scalers.cc +++ b/DQM/TrigXMonitor/src/L1Scalers.cc @@ -340,7 +340,7 @@ void L1Scalers::analyze(const edm::Event& e, const edm::EventSetup& iSetup) { } } } // denomBitGood - } // bx + } // bx // get earliest single muon trigger system bx's if (gmtCollection.isValid()) { diff --git a/DQM/TrigXMonitor/src/L1TScalersSCAL.cc b/DQM/TrigXMonitor/src/L1TScalersSCAL.cc index 2115e02daabc0..51b39b0112ab9 100644 --- a/DQM/TrigXMonitor/src/L1TScalersSCAL.cc +++ b/DQM/TrigXMonitor/src/L1TScalersSCAL.cc @@ -386,9 +386,9 @@ void L1TScalersSCAL::analyze(const edm::Event& iEvent, const edm::EventSetup& iS lostPhysRateBeamActive->setBinContent(lumisection + 1, triggerRates->triggersPhysicsLostBeamActiveRate()); deadTimePercent->setBinContent(lumisection + 1, triggerRates->deadtimePercent()); } // bufferLumi test - } // triggerRates - } // lumisection - } // triggerScalers->size() + } // triggerRates + } // lumisection + } // triggerScalers->size() LumiScalersCollection::const_iterator it3 = lumiScalers->begin(); if (!lumiScalers->empty()) { diff --git a/DQM/TrigXMonitorClient/interface/HLTScalersClient.h b/DQM/TrigXMonitorClient/interface/HLTScalersClient.h index 2a1b4cfa1ec0c..1733576531497 100644 --- a/DQM/TrigXMonitorClient/interface/HLTScalersClient.h +++ b/DQM/TrigXMonitorClient/interface/HLTScalersClient.h @@ -68,7 +68,7 @@ class HLTScalersClient // helper data structures - slightly modified stl objects class CountLS_t : public std::pair { public: - CountLS_t(int ls, double cnt) : std::pair(ls, cnt){}; + CountLS_t(int ls, double cnt) : std::pair(ls, cnt) {} bool operator==(int ls) const { return ls == this->first; } bool operator<(CountLS_t &rhs) { return this->first < rhs.first; }; }; diff --git a/DQM/TrigXMonitorClient/src/HLTScalersClient.cc b/DQM/TrigXMonitorClient/src/HLTScalersClient.cc index 2ab89f325291f..0937b63109f23 100644 --- a/DQM/TrigXMonitorClient/src/HLTScalersClient.cc +++ b/DQM/TrigXMonitorClient/src/HLTScalersClient.cc @@ -284,8 +284,8 @@ void HLTScalersClient::endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, c if (ipath > npaths) break; } // - } // loop lines - } // open ok + } // loop lines + } // open ok } // END SETUP @@ -399,9 +399,9 @@ void HLTScalersClient::endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, c if (!edm::isNotFinite(slope_err) && (slope_err >= 0)) hltRate_->setBinError(nL, slope_err); } - } // found histo + } // found histo updates_->Fill(0); // good - } // check on number of FU's - good data + } // check on number of FU's - good data else { updates_->Fill(1); // missing updates } diff --git a/DQMOffline/CalibCalo/plugins/DQMHOAlCaRecoStream.cc b/DQMOffline/CalibCalo/plugins/DQMHOAlCaRecoStream.cc index fe7cde9188ab1..7f05dfcb2208d 100644 --- a/DQMOffline/CalibCalo/plugins/DQMHOAlCaRecoStream.cc +++ b/DQMOffline/CalibCalo/plugins/DQMHOAlCaRecoStream.cc @@ -171,8 +171,8 @@ void DQMHOAlCaRecoStream::analyze(const edm::Event &iEvent, const edm::EventSetu hSignal3x3[k]->Fill((*hoC).hosig[k]); } } // for (HOCalibVariableCollection::const_iterator hoC=(*HOCalib).begin() - } // if ((*HOCalib).size() >0 ) { - } // if (isCosMu) { + } // if ((*HOCalib).size() >0 ) { + } // if (isCosMu) { } // ------------ method called once each job just before starting event loop diff --git a/DQMOffline/CalibCalo/plugins/DQMHcalIsoTrackPostProcessor.cc b/DQMOffline/CalibCalo/plugins/DQMHcalIsoTrackPostProcessor.cc index 9b6eb38829ba1..1acc79f7519dc 100644 --- a/DQMOffline/CalibCalo/plugins/DQMHcalIsoTrackPostProcessor.cc +++ b/DQMOffline/CalibCalo/plugins/DQMHcalIsoTrackPostProcessor.cc @@ -10,7 +10,7 @@ class DQMHcalIsoTrackPostProcessor : public DQMEDHarvester { public: DQMHcalIsoTrackPostProcessor(const edm::ParameterSet &pset); - ~DQMHcalIsoTrackPostProcessor() override{}; + ~DQMHcalIsoTrackPostProcessor() override {} // void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) // override {}; diff --git a/DQMOffline/CalibCalo/plugins/DQMSourceEleCalib.cc b/DQMOffline/CalibCalo/plugins/DQMSourceEleCalib.cc index 03792b60ce8a7..c6f03c4e65214 100644 --- a/DQMOffline/CalibCalo/plugins/DQMSourceEleCalib.cc +++ b/DQMOffline/CalibCalo/plugins/DQMSourceEleCalib.cc @@ -176,7 +176,7 @@ void DQMSourceEleCalib::analyze(const edm::Event &iEvent, const edm::EventSetup EBDetId id(itb->id()); OccupancyEB_->Fill(id.iphi(), id.ieta()); } // Eb rechits - } // is Valid + } // is Valid if (rhEE.isValid()) { numberOfHits += rhEE->size(); for (itb = rhEE->begin(); itb != rhEE->end(); ++itb) { @@ -189,7 +189,7 @@ void DQMSourceEleCalib::analyze(const edm::Event &iEvent, const edm::EventSetup } // zside<0 } // EE reChit - } // is Valid + } // is Valid if (numberOfElectrons) recHitsPerElectron_->Fill((double)numberOfHits / ((double)numberOfElectrons)); if (numberOfHits) diff --git a/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc b/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc index 1a3e5986713f0..5c9b3cecdb586 100644 --- a/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc +++ b/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc @@ -923,7 +923,7 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } } // End of the "j" loop over Simple Clusters - } // End of the "i" loop over Simple Clusters + } // End of the "i" loop over Simple Clusters } // rhEBpi0.valid() ends @@ -1227,7 +1227,7 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } } // End of the "j" loop over Simple Clusters - } // End of the "i" loop over Simple Clusters + } // End of the "i" loop over Simple Clusters } // rhEBeta.valid() ends @@ -1476,10 +1476,10 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } } // End of the "j" loop over Simple Clusters - } // End of the "i" loop over Simple Clusters + } // End of the "i" loop over Simple Clusters } // rhEEpi0 - } // isMonEEpi0 + } // isMonEEpi0 //================End of Pi0 endcap=======================// @@ -1722,10 +1722,10 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } } // End of the "j" loop over Simple Clusters - } // End of the "i" loop over Simple Clusters + } // End of the "i" loop over Simple Clusters } // rhEEeta - } // isMonEEeta + } // isMonEEeta //================End of Pi0 endcap=======================// diff --git a/DQMOffline/CalibTracker/plugins/SiStripPopConFEDErrorsDQM.cc b/DQMOffline/CalibTracker/plugins/SiStripPopConFEDErrorsDQM.cc index 9e4986e9f5f9a..833eae2055196 100644 --- a/DQMOffline/CalibTracker/plugins/SiStripPopConFEDErrorsDQM.cc +++ b/DQMOffline/CalibTracker/plugins/SiStripPopConFEDErrorsDQM.cc @@ -313,9 +313,9 @@ void SiStripPopConFEDErrorsHandlerFromDQM::readHistogram(MonitorElement* aMe, addBadAPV(lConnection, 0, lFlag, aCounter); } } //if not FE hist - } //if not FED hist - } //if entries in histo - } //loop on bins + } //if not FED hist + } //if entries in histo + } //loop on bins } //method readHistogram void SiStripPopConFEDErrorsHandlerFromDQM::addBadAPV(const FedChannelConnection& aConnection, diff --git a/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.h b/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.h index a68fa934d6003..db8e81bccdeef 100644 --- a/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.h +++ b/DQMOffline/CalibTracker/plugins/SiStripQualityHotStripIdentifierRoot.h @@ -49,7 +49,7 @@ class SiStripQualityHotStripIdentifierRoot : public ConditionDBWriter getNewObject() override; diff --git a/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h b/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h index 3d8546dfa3193..28e95396d7fde 100644 --- a/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h +++ b/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h @@ -26,8 +26,8 @@ class ElectronDqmHarvesterBase : public DQMEDHarvester { void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob // interface to implement in derived classes - virtual void finalize(DQMStore::IBooker &iBooker, - DQMStore::IGetter &iGetter){}; // override ;, const edm::Event& e, const edm::EventSetup & c + virtual void finalize(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) { + } // override ;, const edm::Event& e, const edm::EventSetup & c // utility methods bool finalStepDone() { return finalDone_; } diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc b/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc index 16c291459806a..2a9a91c25eeef 100644 --- a/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc +++ b/DQMOffline/EGamma/plugins/PhotonAnalyzer.cc @@ -1956,8 +1956,8 @@ void PhotonAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& esup) { fill3DHistoVector(h_pOverETracks_, 1. / aConv->EoverPrefittedTracks(), cut, type, part); fill3DHistoVector(h_dCotTracks_, aConv->pairCotThetaSeparation(), cut, type, part); } //end loop over conversions - } //end loop over photons passing cuts - } //end loop over transverse energy cuts + } //end loop over photons passing cuts + } //end loop over transverse energy cuts //make invariant mass plots diff --git a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc index a3369c2545189..470a76877e62a 100644 --- a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc +++ b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.cc @@ -1447,7 +1447,7 @@ void ZToMuMuGammaAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& e h_dRPhoPFcand_Pho_Cleaned_[iDet]->Fill(dR); } } // dr=0.4 - } // loop over all PF Candidates + } // loop over all PF Candidates h_SumPtOverPhoPt_ChHad_Cleaned_[0]->Fill(SumPtIsoValCleanCh / aPho->pt()); h_SumPtOverPhoPt_NeuHad_Cleaned_[0]->Fill(SumPtIsoValCleanNh / aPho->pt()); @@ -1529,7 +1529,7 @@ void ZToMuMuGammaAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& e h_nPho_[1]->Fill(float(nPhoBarrel)); h_nPho_[2]->Fill(float(nPhoEndcap)); } //end inner muon loop - } //end outer muon loop + } //end outer muon loop } //End of Analyze method bool ZToMuMuGammaAnalyzer::basicMuonSelection(const reco::Muon& mu) { diff --git a/DQMOffline/Ecal/plugins/ESRecoSummary.cc b/DQMOffline/Ecal/plugins/ESRecoSummary.cc index c1aeb301ece3d..0503a2bc4622b 100644 --- a/DQMOffline/Ecal/plugins/ESRecoSummary.cc +++ b/DQMOffline/Ecal/plugins/ESRecoSummary.cc @@ -145,7 +145,7 @@ void ESRecoSummary::analyze(const edm::Event &ev, const edm::EventSetup &) { ESenergyPlane2 += esCluster->energy(); } } // end of y loop - } // end loop over all basic clusters in the supercluster + } // end loop over all basic clusters in the supercluster // cout<<"DQM : "<Fill(ESenergyPlane1); diff --git a/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc b/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc index 8b3818863373b..e0bbcc7c45b91 100644 --- a/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc +++ b/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc @@ -315,7 +315,7 @@ int HcalRecHitsDQMClient::HcalRecHitsEndjob(const std::vector occupancy_vs_ieta[vsIetaIdx]->setBinError(ietabin, enorm); } // Fill occupancy_vs_ieta - } // if omatched + } // if omatched } // Status Word diff --git a/DQMOffline/JetMET/src/CaloTowerAnalyzer.cc b/DQMOffline/JetMET/src/CaloTowerAnalyzer.cc index f555629fbaaa1..8ea2261d801ed 100644 --- a/DQMOffline/JetMET/src/CaloTowerAnalyzer.cc +++ b/DQMOffline/JetMET/src/CaloTowerAnalyzer.cc @@ -327,7 +327,7 @@ void CaloTowerAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& if (Tower_iphi > CTmax_iphi) CTmax_iphi = Tower_iphi; } //end if (calotower) .. - } // end if(candidate) ... + } // end if(candidate) ... } // end loop over towers @@ -348,7 +348,7 @@ void CaloTowerAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& hCT_Occvsieta->Fill(iEtaRing - 41, NActiveTowers[iEtaRing]); } } // ietaring - } // allhist_ + } // allhist_ edm::LogInfo("OutputInfo") << "CT ieta range: " << CTmin_ieta << " " << CTmax_ieta; edm::LogInfo("OutputInfo") << "CT iphi range: " << CTmin_iphi << " " << CTmax_iphi; diff --git a/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc b/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc index 4f32f15104b4a..dea2599fdb9fa 100644 --- a/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc +++ b/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc @@ -554,7 +554,7 @@ void HCALRecHitAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup hHCAL_D3_Minenergy_ieta_iphi->setBinContent(EtaRing + 1, iphi, Energy); break; } // end switch - } // end loop over HBHERecHit's + } // end loop over HBHERecHit's // Fill eta-ring MET quantities for (int iEtaRing = 0; iEtaRing < 83; iEtaRing++) { @@ -601,9 +601,9 @@ void HCALRecHitAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup hHCAL_D3_Occvsieta->Fill(iEtaRing - 41, HBHENActiveCells[iEtaRing][jDepth]); break; } //switch - } //activering - } //depth - } //etaring + } //activering + } //depth + } //etaring //-------------------------------------------------HO TLorentzVector vHOMET_EtaRing[83]; diff --git a/DQMOffline/JetMET/src/JetAnalyzer.cc b/DQMOffline/JetMET/src/JetAnalyzer.cc index 1c831e9a92536..70e75c016e312 100644 --- a/DQMOffline/JetMET/src/JetAnalyzer.cc +++ b/DQMOffline/JetMET/src/JetAnalyzer.cc @@ -3716,7 +3716,7 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu if (mMuonMultiplicity_profile && mMuonMultiplicity_profile->getRootObject()) mMuonMultiplicity_profile->Fill(numPV, (*pfJets)[ijet].muonMultiplicity()); } //cleaned PFJets - } //PFJet specific loop + } //PFJet specific loop //IDs have been defined by now //check here already for ordering of jets -> if we choose later to soften pt-thresholds for physics selections //compared to the default jet histograms @@ -3956,7 +3956,7 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu } } } //substructure filling for boosted - } //substructure filling + } //substructure filling } // --- Event passed the low pt jet trigger if (jetLoPass_ == 1) { @@ -4067,7 +4067,7 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu //} } } // pass ID for corrected jets --> inclusive selection - } //loop over uncorrected jets + } //loop over uncorrected jets mNJets = map_of_MEs[DirName + "/" + "NJets"]; if (mNJets && mNJets->getRootObject()) @@ -4632,8 +4632,8 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu mqgLikelihood_highPt_Forward->Fill(QGLikelihood); } } //deal with second jet - } //fill quark gluon tagged variables - } //pfjet + } //fill quark gluon tagged variables + } //pfjet if (isMiniAODJet_) { mJetEnergyCorr = map_of_MEs[DirName + "/" + "JetEnergyCorr"]; if (mJetEnergyCorr && mJetEnergyCorr->getRootObject()) @@ -4910,9 +4910,9 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu } // end restriction on third jet pt ratio in balance calculation } // dPhi > 2.7 for dijetbalance and asymmetrie - } //leading jet in barrel - } //DPhi cut of 2.1 - } //dijet selection, check if both leading jets are IDed + } //leading jet in barrel + } //DPhi cut of 2.1 + } //dijet selection, check if both leading jets are IDed //now do the ZJets selection -> pass_Z_selection cuts already on the Z-pt>30 GeV if (pass_Z_selection && ind1_mu_vetoed >= 0 && pt1_mu_vetoed > 12 && cleaned_first_jet_mu_vetoed && isPFJet_) { bool pass_second_jet_mu_vetoed = false; @@ -5382,7 +5382,7 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu } } } //fill quark gluon tagged variables - } //jet back to back to Z - } //2nd jet veto - } //Z selection + hard leading jet + } //jet back to back to Z + } //2nd jet veto + } //Z selection + hard leading jet } diff --git a/DQMOffline/JetMET/src/JetMETDQMDCSFilter.cc b/DQMOffline/JetMET/src/JetMETDQMDCSFilter.cc index 2270a057a01ca..7f9e2198f2a95 100644 --- a/DQMOffline/JetMET/src/JetMETDQMDCSFilter.cc +++ b/DQMOffline/JetMET/src/JetMETDQMDCSFilter.cc @@ -107,7 +107,7 @@ void JetMETDQMDCSFilter::checkDCSInfoPerPartition(const T& DCS) { detectorOn_ = false; } } // if it matches the requested detname - } // loop on partitions + } // loop on partitions } bool JetMETDQMDCSFilter::filter(const edm::Event& evt, const edm::EventSetup& es) { diff --git a/DQMOffline/L1Trigger/BuildFile.xml b/DQMOffline/L1Trigger/BuildFile.xml index 16834ea82dd7d..9d3a477eeb9e4 100644 --- a/DQMOffline/L1Trigger/BuildFile.xml +++ b/DQMOffline/L1Trigger/BuildFile.xml @@ -16,5 +16,6 @@ + diff --git a/DQMOffline/L1Trigger/interface/L1TEfficiencyHarvesting.h b/DQMOffline/L1Trigger/interface/L1TEfficiencyHarvesting.h index e9fe65b629384..aac939168a7a2 100644 --- a/DQMOffline/L1Trigger/interface/L1TEfficiencyHarvesting.h +++ b/DQMOffline/L1Trigger/interface/L1TEfficiencyHarvesting.h @@ -41,7 +41,7 @@ namespace dqmoffline { L1TEfficiencyPlotHandler(const L1TEfficiencyPlotHandler &handler); - ~L1TEfficiencyPlotHandler(){}; + ~L1TEfficiencyPlotHandler() {} // book efficiency histo void book(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter); diff --git a/DQMOffline/L1Trigger/interface/L1TMuonDQMOffline.h b/DQMOffline/L1Trigger/interface/L1TMuonDQMOffline.h index 0b18a3674b07a..5af0d7257a042 100644 --- a/DQMOffline/L1Trigger/interface/L1TMuonDQMOffline.h +++ b/DQMOffline/L1Trigger/interface/L1TMuonDQMOffline.h @@ -189,7 +189,7 @@ class MuonGmtPair { MuonGmtPair(const reco::Muon* muon, const l1t::Muon* regMu, const PropagateToMuon& propagator, bool useAtVtxCoord); MuonGmtPair(const MuonGmtPair& muonGmtPair); MuonGmtPair& operator=(const MuonGmtPair& muonGmtPair) = default; - ~MuonGmtPair(){}; + ~MuonGmtPair() {} double dR(); double pt() const { return m_muon->pt(); }; diff --git a/DQMOffline/L1Trigger/interface/L1TPhase2MuonOffline.h b/DQMOffline/L1Trigger/interface/L1TPhase2MuonOffline.h index 9a14124585f84..3d3cdb63457c9 100644 --- a/DQMOffline/L1Trigger/interface/L1TPhase2MuonOffline.h +++ b/DQMOffline/L1Trigger/interface/L1TPhase2MuonOffline.h @@ -138,7 +138,7 @@ class GenMuonGMTPair { GenMuonGMTPair(const reco::GenParticle* mu, const l1t::L1Candidate* gmtmu); GenMuonGMTPair(const GenMuonGMTPair& muongmtPair); GenMuonGMTPair& operator=(const GenMuonGMTPair& muongmtPair) = default; - ~GenMuonGMTPair(){}; + ~GenMuonGMTPair() {} float dR2(); float pt() const { return mu_->pt(); }; diff --git a/DQMOffline/L1Trigger/interface/L1TTauOffline.h b/DQMOffline/L1Trigger/interface/L1TTauOffline.h index 177456708c6d0..ec51def139efc 100644 --- a/DQMOffline/L1Trigger/interface/L1TTauOffline.h +++ b/DQMOffline/L1Trigger/interface/L1TTauOffline.h @@ -53,11 +53,11 @@ class TauL1TPair { public: TauL1TPair(const reco::PFTau* tau, const l1t::Tau* regTau) - : m_tau(tau), m_regTau(regTau), m_eta(999.), m_phi_bar(999.), m_phi_end(999.){}; + : m_tau(tau), m_regTau(regTau), m_eta(999.), m_phi_bar(999.), m_phi_end(999.) {} TauL1TPair(const TauL1TPair& tauL1tPair); TauL1TPair& operator=(const TauL1TPair& tauL1tPair) = default; - ~TauL1TPair(){}; + ~TauL1TPair() {} double dR(); double eta() const { return m_tau->eta(); }; diff --git a/DQMOffline/L1Trigger/src/L1TPhase2OuterTrackerTkMET.cc b/DQMOffline/L1Trigger/src/L1TPhase2OuterTrackerTkMET.cc index 5c803042ffcfc..5903f05cdb899 100644 --- a/DQMOffline/L1Trigger/src/L1TPhase2OuterTrackerTkMET.cc +++ b/DQMOffline/L1Trigger/src/L1TPhase2OuterTrackerTkMET.cc @@ -28,9 +28,9 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h" -#include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h" -#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h" -#include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h" +#include "SimDataFormats/Associations/interface/TTStubAssociationMap.h" +#include "SimDataFormats/Associations/interface/TTTrackAssociationMap.h" +#include "SimDataFormats/Associations/interface/TTClusterAssociationMap.h" #include "DQMOffline/L1Trigger/interface/L1TPhase2OuterTrackerTkMET.h" diff --git a/DQMOffline/L1Trigger/src/L1TSync_Offline.cc b/DQMOffline/L1Trigger/src/L1TSync_Offline.cc index 53d59d92b7766..1d7c709baf71f 100644 --- a/DQMOffline/L1Trigger/src/L1TSync_Offline.cc +++ b/DQMOffline/L1Trigger/src/L1TSync_Offline.cc @@ -589,7 +589,7 @@ void L1TSync_Offline::getBeamConfOffline(const Event& iEvent) { } // End fill beam status with BPTX fires } // End loop on FDL - } // End if readout is valid + } // End if readout is valid } //_____________________________________________________________________ diff --git a/DQMOffline/Lumi/interface/TriggerTools.h b/DQMOffline/Lumi/interface/TriggerTools.h index d1417b4ad628d..549571fe8c853 100644 --- a/DQMOffline/Lumi/interface/TriggerTools.h +++ b/DQMOffline/Lumi/interface/TriggerTools.h @@ -18,8 +18,8 @@ typedef std::bitset TriggerObjectBits; class TriggerTools { public: - TriggerTools(){}; - ~TriggerTools(){}; + TriggerTools() {} + ~TriggerTools() {} void readEvent(const edm::Event &iEvent); diff --git a/DQMOffline/Lumi/plugins/ZCounting.cc b/DQMOffline/Lumi/plugins/ZCounting.cc index 2177235328fe3..2f6617738a094 100644 --- a/DQMOffline/Lumi/plugins/ZCounting.cc +++ b/DQMOffline/Lumi/plugins/ZCounting.cc @@ -665,7 +665,7 @@ void ZCounting::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) } } } //End of probe loop over tracks - } //End of tag loop + } //End of tag loop } // diff --git a/DQMOffline/Lumi/plugins/ZCountingElectrons.cc b/DQMOffline/Lumi/plugins/ZCountingElectrons.cc index 73a8672160c02..1ae604bab7317 100644 --- a/DQMOffline/Lumi/plugins/ZCountingElectrons.cc +++ b/DQMOffline/Lumi/plugins/ZCountingElectrons.cc @@ -388,7 +388,7 @@ void ZCountingElectrons::analyze(const edm::Event& iEvent, } } } // End of probe loop - } //End of tag loop + } //End of tag loop } // diff --git a/DQMOffline/Muon/interface/CSCOfflineMonitor.h b/DQMOffline/Muon/interface/CSCOfflineMonitor.h index 979248f377dd3..3d16330cf7235 100644 --- a/DQMOffline/Muon/interface/CSCOfflineMonitor.h +++ b/DQMOffline/Muon/interface/CSCOfflineMonitor.h @@ -69,7 +69,7 @@ class CSCOfflineMonitor : public DQMEDAnalyzer { public: CSCOfflineMonitor(const edm::ParameterSet &pset); - ~CSCOfflineMonitor() override{}; + ~CSCOfflineMonitor() override {} enum LabelType { SMALL, EXTENDED }; enum AxisType { X = 1, Y = 2, Z = 3 }; diff --git a/DQMOffline/Muon/interface/MuonRecoTest.h b/DQMOffline/Muon/interface/MuonRecoTest.h index 6f58e6196f6d4..afc7ee98ea9ee 100644 --- a/DQMOffline/Muon/interface/MuonRecoTest.h +++ b/DQMOffline/Muon/interface/MuonRecoTest.h @@ -35,7 +35,7 @@ class MuonRecoTest : public DQMEDHarvester { MuonRecoTest(const edm::ParameterSet& ps); /// Destructor - ~MuonRecoTest() override{}; + ~MuonRecoTest() override {} protected: /// Endjob diff --git a/DQMOffline/Muon/interface/MuonTrackResidualsTest.h b/DQMOffline/Muon/interface/MuonTrackResidualsTest.h index 51e3f36064d71..543c8e6f23887 100644 --- a/DQMOffline/Muon/interface/MuonTrackResidualsTest.h +++ b/DQMOffline/Muon/interface/MuonTrackResidualsTest.h @@ -36,11 +36,11 @@ class MuonTrackResidualsTest : public DQMEDHarvester { MuonTrackResidualsTest(const edm::ParameterSet& ps); /// Destructor - ~MuonTrackResidualsTest() override{}; + ~MuonTrackResidualsTest() override {} protected: void dqmEndRun(DQMStore::IBooker&, DQMStore::IGetter&, edm::Run const&, edm::EventSetup const&) override; - void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override{}; + void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override {} private: // Switch for verbosity diff --git a/DQMOffline/Muon/src/CSCOfflineMonitor.cc b/DQMOffline/Muon/src/CSCOfflineMonitor.cc index d117007e1baa3..c4ace6258bb24 100644 --- a/DQMOffline/Muon/src/CSCOfflineMonitor.cc +++ b/DQMOffline/Muon/src/CSCOfflineMonitor.cc @@ -1969,13 +1969,13 @@ void CSCOfflineMonitor::doBXMonitor(edm::Handle alcts, hCLCTL1A2Denominator->Fill(layer.chamber(), typeIndex(layer, 2)); } // end if goodTMB and goodALCT - } // end loop CSCData - } // end loop DDU - } // end if good event + } // end loop CSCData + } // end loop DDU + } // end if good event if (examiner != nullptr) delete examiner; } // end if non-zero fed data - } // end DCC loop for NON-REFERENCE + } // end DCC loop for NON-REFERENCE return; } diff --git a/DQMOffline/Muon/src/DTSegmentsTask.cc b/DQMOffline/Muon/src/DTSegmentsTask.cc index e7ee456286768..9fc8ff4b795fe 100644 --- a/DQMOffline/Muon/src/DTSegmentsTask.cc +++ b/DQMOffline/Muon/src/DTSegmentsTask.cc @@ -209,5 +209,5 @@ void DTSegmentsTask::analyze(const edm::Event& event, const edm::EventSetup& set } } //loop over segments - } // loop over chambers + } // loop over chambers } diff --git a/DQMOffline/Muon/src/DiMuonHistograms.cc b/DQMOffline/Muon/src/DiMuonHistograms.cc index f89cacabf8e9e..1594737ae72f2 100644 --- a/DQMOffline/Muon/src/DiMuonHistograms.cc +++ b/DQMOffline/Muon/src/DiMuonHistograms.cc @@ -369,5 +369,5 @@ void DiMuonHistograms::analyze(const edm::Event& iEvent, const edm::EventSetup& } } } //muon2 - } //Muon1 + } //Muon1 } diff --git a/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc b/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc index d87b6c31f76da..9f650a4549ae9 100644 --- a/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc +++ b/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc @@ -372,5 +372,5 @@ void MuonKinVsEtaAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSet } } } //end iEtaRegions - } //end recoMu iteration + } //end recoMu iteration } diff --git a/DQMOffline/Muon/src/MuonTestSummary.cc b/DQMOffline/Muon/src/MuonTestSummary.cc index 02a4ce4106c41..3c6851ebfeed9 100644 --- a/DQMOffline/Muon/src/MuonTestSummary.cc +++ b/DQMOffline/Muon/src/MuonTestSummary.cc @@ -676,7 +676,7 @@ void MuonTestSummary::doResidualsTests(DQMStore::IGetter &igetter, string type, } } //have pull histo - } //TkSta muons + } //TkSta muons } //this part for Global Muons: @@ -982,7 +982,7 @@ void MuonTestSummary::ResidualCheck(DQMStore::IGetter &igetter, } //if gfit? why would we not have gfit? } //histogram exists... - } // loop over residuals histos + } // loop over residuals histos if (numPlot == 0) { //eg no stats Mean_err = 1; diff --git a/DQMOffline/Muon/src/TriggerMatchMonitor.cc b/DQMOffline/Muon/src/TriggerMatchMonitor.cc index 01f98f171ae13..e9d126260535a 100644 --- a/DQMOffline/Muon/src/TriggerMatchMonitor.cc +++ b/DQMOffline/Muon/src/TriggerMatchMonitor.cc @@ -251,6 +251,6 @@ void TriggerMatchMonitor::analyze(const edm::Event& iEvent, const edm::EventSetu } } } //isolated tight muon - } //pat muon loop - } //valid pat muon + } //pat muon loop + } //valid pat muon } diff --git a/DQMOffline/MuonDPG/BuildFile.xml b/DQMOffline/MuonDPG/BuildFile.xml index 3140fc068b8cc..fe9db0755199c 100644 --- a/DQMOffline/MuonDPG/BuildFile.xml +++ b/DQMOffline/MuonDPG/BuildFile.xml @@ -1,6 +1,8 @@ + + diff --git a/DQMOffline/MuonDPG/plugins/GEMTnPEfficiencyTask.cc b/DQMOffline/MuonDPG/plugins/GEMTnPEfficiencyTask.cc index 5127db61579d1..8c2b0008e872d 100644 --- a/DQMOffline/MuonDPG/plugins/GEMTnPEfficiencyTask.cc +++ b/DQMOffline/MuonDPG/plugins/GEMTnPEfficiencyTask.cc @@ -14,14 +14,31 @@ #include "DQMOffline/MuonDPG/interface/BaseTnPEfficiencyTask.h" +#include "DataFormats/GEMDigi/interface/GEMVFATStatusCollection.h" +#include "DataFormats/GEMDigi/interface/GEMOHStatusCollection.h" +#include "DataFormats/GEMDigi/interface/GEMAMCStatusCollection.h" +#include "Geometry/GEMGeometry/interface/GEMGeometry.h" +#include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" +#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" + class GEMTnPEfficiencyTask : public BaseTnPEfficiencyTask { public: /// Constructor GEMTnPEfficiencyTask(const edm::ParameterSet& config); - + uint16_t maskChamberWithError(const GEMDetId& chamber_id, + const GEMOHStatusCollection*, + const GEMVFATStatusCollection*); + bool checkBounds(const GeomDet* geomDet, const GlobalPoint& global_position, const float bordercut); /// Destructor ~GEMTnPEfficiencyTask() override; + const bool m_maskChamberWithError_; + const edm::EDGetTokenT m_GEMOHStatusCollectionToken_; + const edm::EDGetTokenT m_GEMVFATStatusCollectionToken_; + const edm::EDGetTokenT m_GEMAMCStatusCollectionToken_; + std::unique_ptr muon_service_; + protected: std::string topFolder() const override; @@ -31,8 +48,18 @@ class GEMTnPEfficiencyTask : public BaseTnPEfficiencyTask { void analyze(const edm::Event& event, const edm::EventSetup& context) override; }; -GEMTnPEfficiencyTask::GEMTnPEfficiencyTask(const edm::ParameterSet& config) : BaseTnPEfficiencyTask(config) { +GEMTnPEfficiencyTask::GEMTnPEfficiencyTask(const edm::ParameterSet& config) + : BaseTnPEfficiencyTask(config), + m_maskChamberWithError_((config.getUntrackedParameter("maskChamberWithError"))), + m_GEMOHStatusCollectionToken_( + consumes(config.getUntrackedParameter("ohStatusTag"))), + m_GEMVFATStatusCollectionToken_( + consumes(config.getUntrackedParameter("vfatStatusTag"))), + m_GEMAMCStatusCollectionToken_( + consumes(config.getUntrackedParameter("amcStatusTag"))) { LogTrace("DQMOffline|MuonDPG|GEMTnPEfficiencyTask") << "[GEMTnPEfficiencyTask]: Constructor" << std::endl; + muon_service_ = std::make_unique(config.getParameter("ServiceParameters"), + consumesCollector()); } GEMTnPEfficiencyTask::~GEMTnPEfficiencyTask() { @@ -49,7 +76,6 @@ void GEMTnPEfficiencyTask::bookHistograms(DQMStore::IBooker& iBooker, auto baseDir = topFolder() + "Task/"; iBooker.setCurrentFolder(baseDir); - MonitorElement* me_GE11_pass_Ch_region = iBooker.book2D("GE11_nPassingProbe_Ch_region", "GE11_nPassingProbe_Ch_region", 2, -1.5, 1.5, 36, 1, 37); MonitorElement* me_GE11_fail_Ch_region = @@ -174,6 +200,23 @@ void GEMTnPEfficiencyTask::bookHistograms(DQMStore::IBooker& iBooker, iBooker.book1D("GEM_nPassingProbe_phi_n2_1D", "GEM_nPassingProbe_phi_n2_1D", 20, -TMath::Pi(), TMath::Pi()); MonitorElement* me_GEM_fail_phi_n2_1D = iBooker.book1D("GEM_nFailingProbe_phi_n2_1D", "GEM_nFailingProbe_phi_n2_1D", 20, -TMath::Pi(), TMath::Pi()); + MonitorElement* me_GE11_pass_Ch_ieta_p1 = + iBooker.book2D("GE11_nPassingProbe_Ch_ieta_p1", "GE11_nPassingProbe_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* me_GE11_fail_Ch_ieta_p1 = + iBooker.book2D("GE11_nFailingProbe_Ch_ieta_p1", "GE11_nFailingProbe_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* me_GE11_pass_Ch_ieta_p2 = + iBooker.book2D("GE11_nPassingProbe_Ch_ieta_p2", "GE11_nPassingProbe_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* me_GE11_fail_Ch_ieta_p2 = + iBooker.book2D("GE11_nFailingProbe_Ch_ieta_p2", "GE11_nFailingProbe_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* me_GE11_pass_Ch_ieta_n1 = + iBooker.book2D("GE11_nPassingProbe_Ch_ieta_n1", "GE11_nPassingProbe_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* me_GE11_fail_Ch_ieta_n1 = + iBooker.book2D("GE11_nFailingProbe_Ch_ieta_n1", "GE11_nFailingProbe_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* me_GE11_pass_Ch_ieta_n2 = + iBooker.book2D("GE11_nPassingProbe_Ch_ieta_n2", "GE11_nPassingProbe_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + MonitorElement* me_GE11_fail_Ch_ieta_n2 = + iBooker.book2D("GE11_nFailingProbe_Ch_ieta_n2", "GE11_nFailingProbe_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + //// MonitorElement* me_ME0_pass_chamber_1D = iBooker.book1D("ME0_nPassingProbe_chamber_1D", "ME0_nPassingProbe_chamber_1D", 18, 1, 19); @@ -183,6 +226,525 @@ void GEMTnPEfficiencyTask::bookHistograms(DQMStore::IBooker& iBooker, "GEM_nPassingProbe_Ch_region_layer_phase2", "GEM_nPassingProbe_Ch_region_layer_phase2", 10, 0, 10, 36, 1, 37); MonitorElement* me_GEM_fail_Ch_region_layer_phase2 = iBooker.book2D( "GEM_nFailingProbe_Ch_region_layer_phase2", "GEM_nFailingProbe_Ch_region_layer_phase2", 10, 0, 10, 36, 1, 37); + // Bad VFAT Mask + Empty OH Mask + MonitorElement* OHmissing_me_GE11_pass_allCh_1D = + iBooker.book1D("GE11_nPassingProbe_OHmissing_allCh_1D", "GE11_nPassingProbe_OHmissing_allCh_1D", 2, -1.5, 1.5); + MonitorElement* OHmissing_me_GE11_fail_allCh_1D = + iBooker.book1D("GE11_nFailingProbe_OHmissing_allCh_1D", "GE11_nFailingProbe_OHmissing_allCh_1D", 2, -1.5, 1.5); + MonitorElement* OHmissing_me_GEM_pass_chamber_p1_1D = iBooker.book1D( + "GEM_nPassingProbe_OHmissing_chamber_p1_1D", "GEM_nPassingProbe_OHmissing_chamber_p1_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_fail_chamber_p1_1D = iBooker.book1D( + "GEM_nFailingProbe_OHmissing_chamber_p1_1D", "GEM_nFailingProbe_OHmissing_chamber_p1_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_pass_chamber_p2_1D = iBooker.book1D( + "GEM_nPassingProbe_OHmissing_chamber_p2_1D", "GEM_nPassingProbe_OHmissing_chamber_p2_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_fail_chamber_p2_1D = iBooker.book1D( + "GEM_nFailingProbe_OHmissing_chamber_p2_1D", "GEM_nFailingProbe_OHmissing_chamber_p2_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_pass_chamber_n1_1D = iBooker.book1D( + "GEM_nPassingProbe_OHmissing_chamber_n1_1D", "GEM_nPassingProbe_OHmissing_chamber_n1_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_fail_chamber_n1_1D = iBooker.book1D( + "GEM_nFailingProbe_OHmissing_chamber_n1_1D", "GEM_nFailingProbe_OHmissing_chamber_n1_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_pass_chamber_n2_1D = iBooker.book1D( + "GEM_nPassingProbe_OHmissing_chamber_n2_1D", "GEM_nPassingProbe_OHmissing_chamber_n2_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_fail_chamber_n2_1D = iBooker.book1D( + "GEM_nFailingProbe_OHmissing_chamber_n2_1D", "GEM_nFailingProbe_OHmissing_chamber_n2_1D", 36, 1, 37); + MonitorElement* OHmissing_me_GEM_pass_pt_1D = + iBooker.book1D("GEM_nPassingProbe_OHmissing_pt_1D", "GEM_nPassingProbe_OHmissing_pt_1D", 20, 0, 100); + MonitorElement* OHmissing_me_GEM_fail_pt_1D = + iBooker.book1D("GEM_nFailingProbe_OHmissing_pt_1D", "GEM_nFailingProbe_OHmissing_pt_1D", 20, 0, 100); + MonitorElement* OHmissing_me_GEM_pass_eta_1D = + iBooker.book1D("GEM_nPassingProbe_OHmissing_eta_1D", "GEM_nPassingProbe_OHmissing_eta_1D", 24, 0, 2.4); + MonitorElement* OHmissing_me_GEM_fail_eta_1D = + iBooker.book1D("GEM_nFailingProbe_OHmissing_eta_1D", "GEM_nFailingProbe_OHmissing_eta_1D", 24, 0, 2.4); + MonitorElement* OHmissing_me_GEM_pass_phi_1D = iBooker.book1D( + "GEM_nPassingProbe_OHmissing_phi_1D", "GEM_nPassingProbe_OHmissing_phi_1D", 20, -TMath::Pi(), TMath::Pi()); + MonitorElement* OHmissing_me_GEM_fail_phi_1D = iBooker.book1D( + "GEM_nFailingProbe_OHmissing_phi_1D", "GEM_nFailingProbe_OHmissing_phi_1D", 20, -TMath::Pi(), TMath::Pi()); + MonitorElement* OHmissing_me_GE11_pass_Ch_ieta_p1 = iBooker.book2D( + "GE11_nPassingProbe_OHmissing_Ch_ieta_p1", "GE11_nPassingProbe_OHmissing_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHmissing_me_GE11_fail_Ch_ieta_p1 = iBooker.book2D( + "GE11_nFailingProbe_OHmissing_Ch_ieta_p1", "GE11_nFailingProbe_OHmissing_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHmissing_me_GE11_pass_Ch_ieta_p2 = iBooker.book2D( + "GE11_nPassingProbe_OHmissing_Ch_ieta_p2", "GE11_nPassingProbe_OHmissing_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* OHmissing_me_GE11_fail_Ch_ieta_p2 = iBooker.book2D( + "GE11_nFailingProbe_OHmissing_Ch_ieta_p2", "GE11_nFailingProbe_OHmissing_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* OHmissing_me_GE11_pass_Ch_ieta_n1 = iBooker.book2D( + "GE11_nPassingProbe_OHmissing_Ch_ieta_n1", "GE11_nPassingProbe_OHmissing_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHmissing_me_GE11_fail_Ch_ieta_n1 = iBooker.book2D( + "GE11_nFailingProbe_OHmissing_Ch_ieta_n1", "GE11_nFailingProbe_OHmissing_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHmissing_me_GE11_pass_Ch_ieta_n2 = iBooker.book2D( + "GE11_nPassingProbe_OHmissing_Ch_ieta_n2", "GE11_nPassingProbe_OHmissing_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + MonitorElement* OHmissing_me_GE11_fail_Ch_ieta_n2 = iBooker.book2D( + "GE11_nFailingProbe_OHmissing_Ch_ieta_n2", "GE11_nFailingProbe_OHmissing_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + + OHmissing_me_GE11_pass_allCh_1D->setBinLabel(1, "GE-11", 1); + OHmissing_me_GE11_pass_allCh_1D->setBinLabel(2, "GE+11", 1); + OHmissing_me_GE11_pass_allCh_1D->setAxisTitle("Number of passing probes", 2); + + OHmissing_me_GE11_fail_allCh_1D->setBinLabel(1, "GE-11", 1); + OHmissing_me_GE11_fail_allCh_1D->setBinLabel(2, "GE+11", 1); + OHmissing_me_GE11_fail_allCh_1D->setAxisTitle("Number of failing probes", 2); + + OHmissing_me_GEM_pass_chamber_p1_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_pass_chamber_p1_1D->setAxisTitle("Number of passing probes", 2); + OHmissing_me_GEM_fail_chamber_p1_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_fail_chamber_p1_1D->setAxisTitle("Number of failing probes", 2); + + OHmissing_me_GEM_pass_chamber_p2_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_pass_chamber_p2_1D->setAxisTitle("Number of passing probes", 2); + OHmissing_me_GEM_fail_chamber_p2_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_fail_chamber_p2_1D->setAxisTitle("Number of failing probes", 2); + + OHmissing_me_GEM_pass_chamber_n1_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_pass_chamber_n1_1D->setAxisTitle("Number of passing probes", 2); + OHmissing_me_GEM_fail_chamber_n1_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_fail_chamber_n1_1D->setAxisTitle("Number of failing probes", 2); + + OHmissing_me_GEM_pass_chamber_n2_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_pass_chamber_n2_1D->setAxisTitle("Number of passing probes", 2); + OHmissing_me_GEM_fail_chamber_n2_1D->setAxisTitle("Chamber", 1); + OHmissing_me_GEM_fail_chamber_n2_1D->setAxisTitle("Number of failing probes", 2); + + OHmissing_me_GEM_pass_pt_1D->setAxisTitle("P_{T}", 1); + OHmissing_me_GEM_pass_pt_1D->setAxisTitle("Number of passing probes", 2); + OHmissing_me_GEM_fail_pt_1D->setAxisTitle("P_{T}", 1); + OHmissing_me_GEM_fail_pt_1D->setAxisTitle("Number of failing probes", 2); + + OHmissing_me_GEM_pass_eta_1D->setAxisTitle("#eta", 1); + OHmissing_me_GEM_pass_eta_1D->setAxisTitle("Number of passing probes", 2); + OHmissing_me_GEM_fail_eta_1D->setAxisTitle("#eta", 1); + OHmissing_me_GEM_fail_eta_1D->setAxisTitle("Number of failing probes", 2); + + OHmissing_me_GEM_pass_phi_1D->setAxisTitle("#phi", 1); + OHmissing_me_GEM_pass_phi_1D->setAxisTitle("Number of passing probes", 2); + OHmissing_me_GEM_fail_phi_1D->setAxisTitle("#phi", 1); + OHmissing_me_GEM_fail_phi_1D->setAxisTitle("Number of failing probes", 2); + //// + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_fail_Ch_ieta_p1->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_fail_Ch_ieta_p1->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_fail_Ch_ieta_p1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_pass_Ch_ieta_p1->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_pass_Ch_ieta_p1->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_pass_Ch_ieta_p1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_fail_Ch_ieta_p2->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_fail_Ch_ieta_p2->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_fail_Ch_ieta_p2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_pass_Ch_ieta_p2->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_pass_Ch_ieta_p2->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_pass_Ch_ieta_p2->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_fail_Ch_ieta_n1->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_fail_Ch_ieta_n1->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_fail_Ch_ieta_n1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_pass_Ch_ieta_n1->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_pass_Ch_ieta_n1->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_pass_Ch_ieta_n1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_fail_Ch_ieta_n2->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_fail_Ch_ieta_n2->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_fail_Ch_ieta_n2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHmissing_me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + OHmissing_me_GE11_pass_Ch_ieta_n2->setAxisTitle("#ieta", 1); + OHmissing_me_GE11_pass_Ch_ieta_n2->setAxisTitle("Chamber", 2); + OHmissing_me_GE11_pass_Ch_ieta_n2->setAxisTitle("Number of passing probes", 3); + + // Bad VFAT Mask + Empty OH Mask + EvtNF + + MonitorElement* OHerror_me_GE11_pass_allCh_1D = + iBooker.book1D("GE11_nPassingProbe_OHerror_allCh_1D", "GE11_nPassingProbe_OHerror_allCh_1D", 2, -1.5, 1.5); + MonitorElement* OHerror_me_GE11_fail_allCh_1D = + iBooker.book1D("GE11_nFailingProbe_OHerror_allCh_1D", "GE11_nFailingProbe_OHerror_allCh_1D", 2, -1.5, 1.5); + MonitorElement* OHerror_me_GEM_pass_chamber_p1_1D = + iBooker.book1D("GEM_nPassingProbe_OHerror_chamber_p1_1D", "GEM_nPassingProbe_OHerror_chamber_p1_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_fail_chamber_p1_1D = + iBooker.book1D("GEM_nFailingProbe_OHerror_chamber_p1_1D", "GEM_nFailingProbe_OHerror_chamber_p1_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_pass_chamber_p2_1D = + iBooker.book1D("GEM_nPassingProbe_OHerror_chamber_p2_1D", "GEM_nPassingProbe_OHerror_chamber_p2_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_fail_chamber_p2_1D = + iBooker.book1D("GEM_nFailingProbe_OHerror_chamber_p2_1D", "GEM_nFailingProbe_OHerror_chamber_p2_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_pass_chamber_n1_1D = + iBooker.book1D("GEM_nPassingProbe_OHerror_chamber_n1_1D", "GEM_nPassingProbe_OHerror_chamber_n1_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_fail_chamber_n1_1D = + iBooker.book1D("GEM_nFailingProbe_OHerror_chamber_n1_1D", "GEM_nFailingProbe_OHerror_chamber_n1_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_pass_chamber_n2_1D = + iBooker.book1D("GEM_nPassingProbe_OHerror_chamber_n2_1D", "GEM_nPassingProbe_OHerror_chamber_n2_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_fail_chamber_n2_1D = + iBooker.book1D("GEM_nFailingProbe_OHerror_chamber_n2_1D", "GEM_nFailingProbe_OHerror_chamber_n2_1D", 36, 1, 37); + MonitorElement* OHerror_me_GEM_pass_pt_1D = + iBooker.book1D("GEM_nPassingProbe_OHerror_pt_1D", "GEM_nPassingProbe_OHerror_pt_1D", 20, 0, 100); + MonitorElement* OHerror_me_GEM_fail_pt_1D = + iBooker.book1D("GEM_nFailingProbe_OHerror_pt_1D", "GEM_nFailingProbe_OHerror_pt_1D", 20, 0, 100); + MonitorElement* OHerror_me_GEM_pass_eta_1D = + iBooker.book1D("GEM_nPassingProbe_OHerror_eta_1D", "GEM_nPassingProbe_OHerror_eta_1D", 24, 0, 2.4); + MonitorElement* OHerror_me_GEM_fail_eta_1D = + iBooker.book1D("GEM_nFailingProbe_OHerror_eta_1D", "GEM_nFailingProbe_OHerror_eta_1D", 24, 0, 2.4); + MonitorElement* OHerror_me_GEM_pass_phi_1D = iBooker.book1D( + "GEM_nPassingProbe_OHerror_phi_1D", "GEM_nPassingProbe_OHerror_phi_1D", 20, -TMath::Pi(), TMath::Pi()); + MonitorElement* OHerror_me_GEM_fail_phi_1D = iBooker.book1D( + "GEM_nFailingProbe_OHerror_phi_1D", "GEM_nFailingProbe_OHerror_phi_1D", 20, -TMath::Pi(), TMath::Pi()); + MonitorElement* OHerror_me_GE11_pass_Ch_ieta_p1 = iBooker.book2D( + "GE11_nPassingProbe_OHerror_Ch_ieta_p1", "GE11_nPassingProbe_OHerror_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHerror_me_GE11_fail_Ch_ieta_p1 = iBooker.book2D( + "GE11_nFailingProbe_OHerror_Ch_ieta_p1", "GE11_nFailingProbe_OHerror_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHerror_me_GE11_pass_Ch_ieta_p2 = iBooker.book2D( + "GE11_nPassingProbe_OHerror_Ch_ieta_p2", "GE11_nPassingProbe_OHerror_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* OHerror_me_GE11_fail_Ch_ieta_p2 = iBooker.book2D( + "GE11_nFailingProbe_OHerror_Ch_ieta_p2", "GE11_nFailingProbe_OHerror_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* OHerror_me_GE11_pass_Ch_ieta_n1 = iBooker.book2D( + "GE11_nPassingProbe_OHerror_Ch_ieta_n1", "GE11_nPassingProbe_OHerror_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHerror_me_GE11_fail_Ch_ieta_n1 = iBooker.book2D( + "GE11_nFailingProbe_OHerror_Ch_ieta_n1", "GE11_nFailingProbe_OHerror_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* OHerror_me_GE11_pass_Ch_ieta_n2 = iBooker.book2D( + "GE11_nPassingProbe_OHerror_Ch_ieta_n2", "GE11_nPassingProbe_OHerror_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + MonitorElement* OHerror_me_GE11_fail_Ch_ieta_n2 = iBooker.book2D( + "GE11_nFailingProbe_OHerror_Ch_ieta_n2", "GE11_nFailingProbe_OHerror_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + + OHerror_me_GE11_pass_allCh_1D->setBinLabel(1, "GE-11", 1); + OHerror_me_GE11_pass_allCh_1D->setBinLabel(2, "GE+11", 1); + OHerror_me_GE11_pass_allCh_1D->setAxisTitle("Number of passing probes", 2); + + OHerror_me_GE11_fail_allCh_1D->setBinLabel(1, "GE-11", 1); + OHerror_me_GE11_fail_allCh_1D->setBinLabel(2, "GE+11", 1); + OHerror_me_GE11_fail_allCh_1D->setAxisTitle("Number of failing probes", 2); + + OHerror_me_GEM_pass_chamber_p1_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_pass_chamber_p1_1D->setAxisTitle("Number of passing probes", 2); + OHerror_me_GEM_fail_chamber_p1_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_fail_chamber_p1_1D->setAxisTitle("Number of failing probes", 2); + + OHerror_me_GEM_pass_chamber_p2_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_pass_chamber_p2_1D->setAxisTitle("Number of passing probes", 2); + OHerror_me_GEM_fail_chamber_p2_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_fail_chamber_p2_1D->setAxisTitle("Number of failing probes", 2); + + OHerror_me_GEM_pass_chamber_n1_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_pass_chamber_n1_1D->setAxisTitle("Number of passing probes", 2); + OHerror_me_GEM_fail_chamber_n1_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_fail_chamber_n1_1D->setAxisTitle("Number of failing probes", 2); + + OHerror_me_GEM_pass_chamber_n2_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_pass_chamber_n2_1D->setAxisTitle("Number of passing probes", 2); + OHerror_me_GEM_fail_chamber_n2_1D->setAxisTitle("Chamber", 1); + OHerror_me_GEM_fail_chamber_n2_1D->setAxisTitle("Number of failing probes", 2); + + OHerror_me_GEM_pass_pt_1D->setAxisTitle("P_{T}", 1); + OHerror_me_GEM_pass_pt_1D->setAxisTitle("Number of passing probes", 2); + OHerror_me_GEM_fail_pt_1D->setAxisTitle("P_{T}", 1); + OHerror_me_GEM_fail_pt_1D->setAxisTitle("Number of failing probes", 2); + + OHerror_me_GEM_pass_eta_1D->setAxisTitle("#eta", 1); + OHerror_me_GEM_pass_eta_1D->setAxisTitle("Number of passing probes", 2); + OHerror_me_GEM_fail_eta_1D->setAxisTitle("#eta", 1); + OHerror_me_GEM_fail_eta_1D->setAxisTitle("Number of failing probes", 2); + + OHerror_me_GEM_pass_phi_1D->setAxisTitle("#phi", 1); + OHerror_me_GEM_pass_phi_1D->setAxisTitle("Number of passing probes", 2); + OHerror_me_GEM_fail_phi_1D->setAxisTitle("#phi", 1); + OHerror_me_GEM_fail_phi_1D->setAxisTitle("Number of failing probes", 2); + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_fail_Ch_ieta_p1->setAxisTitle("#ieta", 1); + OHerror_me_GE11_fail_Ch_ieta_p1->setAxisTitle("Chamber", 2); + OHerror_me_GE11_fail_Ch_ieta_p1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_pass_Ch_ieta_p1->setAxisTitle("#ieta", 1); + OHerror_me_GE11_pass_Ch_ieta_p1->setAxisTitle("Chamber", 2); + OHerror_me_GE11_pass_Ch_ieta_p1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_fail_Ch_ieta_p2->setAxisTitle("#ieta", 1); + OHerror_me_GE11_fail_Ch_ieta_p2->setAxisTitle("Chamber", 2); + OHerror_me_GE11_fail_Ch_ieta_p2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_pass_Ch_ieta_p2->setAxisTitle("#ieta", 1); + OHerror_me_GE11_pass_Ch_ieta_p2->setAxisTitle("Chamber", 2); + OHerror_me_GE11_pass_Ch_ieta_p2->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_fail_Ch_ieta_n1->setAxisTitle("#ieta", 1); + OHerror_me_GE11_fail_Ch_ieta_n1->setAxisTitle("Chamber", 2); + OHerror_me_GE11_fail_Ch_ieta_n1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_pass_Ch_ieta_n1->setAxisTitle("#ieta", 1); + OHerror_me_GE11_pass_Ch_ieta_n1->setAxisTitle("Chamber", 2); + OHerror_me_GE11_pass_Ch_ieta_n1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_fail_Ch_ieta_n2->setAxisTitle("#ieta", 1); + OHerror_me_GE11_fail_Ch_ieta_n2->setAxisTitle("Chamber", 2); + OHerror_me_GE11_fail_Ch_ieta_n2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + OHerror_me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + OHerror_me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + OHerror_me_GE11_pass_Ch_ieta_n2->setAxisTitle("#ieta", 1); + OHerror_me_GE11_pass_Ch_ieta_n2->setAxisTitle("Chamber", 2); + OHerror_me_GE11_pass_Ch_ieta_n2->setAxisTitle("Number of passing probes", 3); + + // Bad VFAT Mask + Empty OH Mask + OHerrorMask + + MonitorElement* VFATMask_me_GE11_pass_allCh_1D = + iBooker.book1D("GE11_nPassingProbe_VFATMask_allCh_1D", "GE11_nPassingProbe_VFATMask_allCh_1D", 2, -1.5, 1.5); + MonitorElement* VFATMask_me_GE11_fail_allCh_1D = + iBooker.book1D("GE11_nFailingProbe_VFATMask_allCh_1D", "GE11_nFailingProbe_VFATMask_allCh_1D", 2, -1.5, 1.5); + MonitorElement* VFATMask_me_GEM_pass_chamber_p1_1D = + iBooker.book1D("GEM_nPassingProbe_VFATMask_chamber_p1_1D", "GEM_nPassingProbe_VFATMask_chamber_p1_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_fail_chamber_p1_1D = + iBooker.book1D("GEM_nFailingProbe_VFATMask_chamber_p1_1D", "GEM_nFailingProbe_VFATMask_chamber_p1_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_pass_chamber_p2_1D = + iBooker.book1D("GEM_nPassingProbe_VFATMask_chamber_p2_1D", "GEM_nPassingProbe_VFATMask_chamber_p2_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_fail_chamber_p2_1D = + iBooker.book1D("GEM_nFailingProbe_VFATMask_chamber_p2_1D", "GEM_nFailingProbe_VFATMask_chamber_p2_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_pass_chamber_n1_1D = + iBooker.book1D("GEM_nPassingProbe_VFATMask_chamber_n1_1D", "GEM_nPassingProbe_VFATMask_chamber_n1_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_fail_chamber_n1_1D = + iBooker.book1D("GEM_nFailingProbe_VFATMask_chamber_n1_1D", "GEM_nFailingProbe_VFATMask_chamber_n1_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_pass_chamber_n2_1D = + iBooker.book1D("GEM_nPassingProbe_VFATMask_chamber_n2_1D", "GEM_nPassingProbe_VFATMask_chamber_n2_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_fail_chamber_n2_1D = + iBooker.book1D("GEM_nFailingProbe_VFATMask_chamber_n2_1D", "GEM_nFailingProbe_VFATMask_chamber_n2_1D", 36, 1, 37); + MonitorElement* VFATMask_me_GEM_pass_pt_1D = + iBooker.book1D("GEM_nPassingProbe_VFATMask_pt_1D", "GEM_nPassingProbe_VFATMask_pt_1D", 20, 0, 100); + MonitorElement* VFATMask_me_GEM_fail_pt_1D = + iBooker.book1D("GEM_nFailingProbe_VFATMask_pt_1D", "GEM_nFailingProbe_VFATMask_pt_1D", 20, 0, 100); + MonitorElement* VFATMask_me_GEM_pass_eta_1D = + iBooker.book1D("GEM_nPassingProbe_VFATMask_eta_1D", "GEM_nPassingProbe_VFATMask_eta_1D", 24, 0, 2.4); + MonitorElement* VFATMask_me_GEM_fail_eta_1D = + iBooker.book1D("GEM_nFailingProbe_VFATMask_eta_1D", "GEM_nFailingProbe_VFATMask_eta_1D", 24, 0, 2.4); + MonitorElement* VFATMask_me_GEM_pass_phi_1D = iBooker.book1D( + "GEM_nPassingProbe_VFATMask_phi_1D", "GEM_nPassingProbe_VFATMask_phi_1D", 20, -TMath::Pi(), TMath::Pi()); + MonitorElement* VFATMask_me_GEM_fail_phi_1D = iBooker.book1D( + "GEM_nFailingProbe_VFATMask_phi_1D", "GEM_nFailingProbe_VFATMask_phi_1D", 20, -TMath::Pi(), TMath::Pi()); + MonitorElement* VFATMask_me_GE11_pass_Ch_ieta_p1 = iBooker.book2D( + "GE11_nPassingProbe_VFATMask_Ch_ieta_p1", "GE11_nPassingProbe_VFATMask_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* VFATMask_me_GE11_fail_Ch_ieta_p1 = iBooker.book2D( + "GE11_nFailingProbe_VFATMask_Ch_ieta_p1", "GE11_nFailingProbe_VFATMask_Ch_ieta_p1", 8, 1, 9, 36, 1, 37); + MonitorElement* VFATMask_me_GE11_pass_Ch_ieta_p2 = iBooker.book2D( + "GE11_nPassingProbe_VFATMask_Ch_ieta_p2", "GE11_nPassingProbe_VFATMask_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* VFATMask_me_GE11_fail_Ch_ieta_p2 = iBooker.book2D( + "GE11_nFailingProbe_VFATMask_Ch_ieta_p2", "GE11_nFailingProbe_VFATMask_Ch_ieta_p2", 8, 1, 9, 36, 1, 37); + MonitorElement* VFATMask_me_GE11_pass_Ch_ieta_n1 = iBooker.book2D( + "GE11_nPassingProbe_VFATMask_Ch_ieta_n1", "GE11_nPassingProbe_VFATMask_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* VFATMask_me_GE11_fail_Ch_ieta_n1 = iBooker.book2D( + "GE11_nFailingProbe_VFATMask_Ch_ieta_n1", "GE11_nFailingProbe_VFATMask_Ch_ieta_n1", 8, 1, 9, 36, 1, 37); + MonitorElement* VFATMask_me_GE11_pass_Ch_ieta_n2 = iBooker.book2D( + "GE11_nPassingProbe_VFATMask_Ch_ieta_n2", "GE11_nPassingProbe_VFATMask_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + MonitorElement* VFATMask_me_GE11_fail_Ch_ieta_n2 = iBooker.book2D( + "GE11_nFailingProbe_VFATMask_Ch_ieta_n2", "GE11_nFailingProbe_VFATMask_Ch_ieta_n2", 8, 1, 9, 36, 1, 37); + + VFATMask_me_GE11_pass_allCh_1D->setBinLabel(1, "GE-11", 1); + VFATMask_me_GE11_pass_allCh_1D->setBinLabel(2, "GE+11", 1); + VFATMask_me_GE11_pass_allCh_1D->setAxisTitle("Number of passing probes", 2); + + VFATMask_me_GE11_fail_allCh_1D->setBinLabel(1, "GE-11", 1); + VFATMask_me_GE11_fail_allCh_1D->setBinLabel(2, "GE+11", 1); + VFATMask_me_GE11_fail_allCh_1D->setAxisTitle("Number of failing probes", 2); + + VFATMask_me_GEM_pass_chamber_p1_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_pass_chamber_p1_1D->setAxisTitle("Number of passing probes", 2); + VFATMask_me_GEM_fail_chamber_p1_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_fail_chamber_p1_1D->setAxisTitle("Number of failing probes", 2); + + VFATMask_me_GEM_pass_chamber_p2_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_pass_chamber_p2_1D->setAxisTitle("Number of passing probes", 2); + VFATMask_me_GEM_fail_chamber_p2_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_fail_chamber_p2_1D->setAxisTitle("Number of failing probes", 2); + + VFATMask_me_GEM_pass_chamber_n1_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_pass_chamber_n1_1D->setAxisTitle("Number of passing probes", 2); + VFATMask_me_GEM_fail_chamber_n1_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_fail_chamber_n1_1D->setAxisTitle("Number of failing probes", 2); + + VFATMask_me_GEM_pass_chamber_n2_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_pass_chamber_n2_1D->setAxisTitle("Number of passing probes", 2); + VFATMask_me_GEM_fail_chamber_n2_1D->setAxisTitle("Chamber", 1); + VFATMask_me_GEM_fail_chamber_n2_1D->setAxisTitle("Number of failing probes", 2); + + VFATMask_me_GEM_pass_pt_1D->setAxisTitle("P_{T}", 1); + VFATMask_me_GEM_pass_pt_1D->setAxisTitle("Number of passing probes", 2); + VFATMask_me_GEM_fail_pt_1D->setAxisTitle("P_{T}", 1); + VFATMask_me_GEM_fail_pt_1D->setAxisTitle("Number of failing probes", 2); + + VFATMask_me_GEM_pass_eta_1D->setAxisTitle("#eta", 1); + VFATMask_me_GEM_pass_eta_1D->setAxisTitle("Number of passing probes", 2); + VFATMask_me_GEM_fail_eta_1D->setAxisTitle("#eta", 1); + VFATMask_me_GEM_fail_eta_1D->setAxisTitle("Number of failing probes", 2); + + VFATMask_me_GEM_pass_phi_1D->setAxisTitle("#phi", 1); + VFATMask_me_GEM_pass_phi_1D->setAxisTitle("Number of passing probes", 2); + VFATMask_me_GEM_fail_phi_1D->setAxisTitle("#phi", 1); + VFATMask_me_GEM_fail_phi_1D->setAxisTitle("Number of failing probes", 2); + + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_fail_Ch_ieta_p1->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_fail_Ch_ieta_p1->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_fail_Ch_ieta_p1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_pass_Ch_ieta_p1->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_pass_Ch_ieta_p1->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_pass_Ch_ieta_p1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_fail_Ch_ieta_p2->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_fail_Ch_ieta_p2->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_fail_Ch_ieta_p2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_pass_Ch_ieta_p2->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_pass_Ch_ieta_p2->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_pass_Ch_ieta_p2->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_fail_Ch_ieta_n1->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_fail_Ch_ieta_n1->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_fail_Ch_ieta_n1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_pass_Ch_ieta_n1->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_pass_Ch_ieta_n1->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_pass_Ch_ieta_n1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_fail_Ch_ieta_n2->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_fail_Ch_ieta_n2->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_fail_Ch_ieta_n2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + VFATMask_me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + VFATMask_me_GE11_pass_Ch_ieta_n2->setAxisTitle("#ieta", 1); + VFATMask_me_GE11_pass_Ch_ieta_n2->setAxisTitle("Chamber", 2); + VFATMask_me_GE11_pass_Ch_ieta_n2->setAxisTitle("Number of passing probes", 3); me_GE11_pass_allCh_1D->setBinLabel(1, "GE-11", 1); me_GE11_pass_allCh_1D->setBinLabel(2, "GE+11", 1); @@ -485,6 +1047,86 @@ void GEMTnPEfficiencyTask::bookHistograms(DQMStore::IBooker& iBooker, me_GEM_pass_Ch_region_layer_phase2->setAxisTitle("Chamber", 2); me_GEM_pass_Ch_region_layer_phase2->setAxisTitle("Number of passing probes", 3); + for (int i = 1; i < 37; ++i) { + me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_fail_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_fail_Ch_ieta_p1->setAxisTitle("#ieta", 1); + me_GE11_fail_Ch_ieta_p1->setAxisTitle("Chamber", 2); + me_GE11_fail_Ch_ieta_p1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_pass_Ch_ieta_p1->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_pass_Ch_ieta_p1->setAxisTitle("#ieta", 1); + me_GE11_pass_Ch_ieta_p1->setAxisTitle("Chamber", 2); + me_GE11_pass_Ch_ieta_p1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_fail_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_fail_Ch_ieta_p2->setAxisTitle("#ieta", 1); + me_GE11_fail_Ch_ieta_p2->setAxisTitle("Chamber", 2); + me_GE11_fail_Ch_ieta_p2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_pass_Ch_ieta_p2->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_pass_Ch_ieta_p2->setAxisTitle("#ieta", 1); + me_GE11_pass_Ch_ieta_p2->setAxisTitle("Chamber", 2); + me_GE11_pass_Ch_ieta_p2->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_fail_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_fail_Ch_ieta_n1->setAxisTitle("#ieta", 1); + me_GE11_fail_Ch_ieta_n1->setAxisTitle("Chamber", 2); + me_GE11_fail_Ch_ieta_n1->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_pass_Ch_ieta_n1->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_pass_Ch_ieta_n1->setAxisTitle("#ieta", 1); + me_GE11_pass_Ch_ieta_n1->setAxisTitle("Chamber", 2); + me_GE11_pass_Ch_ieta_n1->setAxisTitle("Number of passing probes", 3); + //// + for (int i = 1; i < 37; ++i) { + me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_fail_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_fail_Ch_ieta_n2->setAxisTitle("#ieta", 1); + me_GE11_fail_Ch_ieta_n2->setAxisTitle("Chamber", 2); + me_GE11_fail_Ch_ieta_n2->setAxisTitle("Number of failing probes", 3); + + for (int i = 1; i < 37; ++i) { + me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 2); + } + for (int i = 1; i < 9; ++i) { + me_GE11_pass_Ch_ieta_n2->setBinLabel(i, std::to_string(i), 1); + } + me_GE11_pass_Ch_ieta_n2->setAxisTitle("#ieta", 1); + me_GE11_pass_Ch_ieta_n2->setAxisTitle("Chamber", 2); + me_GE11_pass_Ch_ieta_n2->setAxisTitle("Number of passing probes", 3); + m_histos["GE11_nPassingProbe_Ch_region"] = me_GE11_pass_Ch_region; m_histos["GE11_nFailingProbe_Ch_region"] = me_GE11_fail_Ch_region; m_histos["GE21_nPassingProbe_Ch_region"] = me_GE21_pass_Ch_region; @@ -551,6 +1193,89 @@ void GEMTnPEfficiencyTask::bookHistograms(DQMStore::IBooker& iBooker, m_histos["ME0_nFailingProbe_chamber_1D"] = me_ME0_fail_chamber_1D; m_histos["GEM_nPassingProbe_Ch_region_layer_phase2"] = me_GEM_pass_Ch_region_layer_phase2; m_histos["GEM_nFailingProbe_Ch_region_layer_phase2"] = me_GEM_fail_Ch_region_layer_phase2; + m_histos["GE11_nPassingProbe_Ch_ieta_p1"] = me_GE11_pass_Ch_ieta_p1; + m_histos["GE11_nFailingProbe_Ch_ieta_p1"] = me_GE11_fail_Ch_ieta_p1; + m_histos["GE11_nPassingProbe_Ch_ieta_p2"] = me_GE11_pass_Ch_ieta_p2; + m_histos["GE11_nFailingProbe_Ch_ieta_p2"] = me_GE11_fail_Ch_ieta_p2; + m_histos["GE11_nPassingProbe_Ch_ieta_n1"] = me_GE11_pass_Ch_ieta_n1; + m_histos["GE11_nFailingProbe_Ch_ieta_n1"] = me_GE11_fail_Ch_ieta_n1; + m_histos["GE11_nPassingProbe_Ch_ieta_n2"] = me_GE11_pass_Ch_ieta_n2; + m_histos["GE11_nFailingProbe_Ch_ieta_n2"] = me_GE11_fail_Ch_ieta_n2; + + m_histos["GE11_nPassingProbe_OHmissing_allCh_1D"] = OHmissing_me_GE11_pass_allCh_1D; + m_histos["GE11_nFailingProbe_OHmissing_allCh_1D"] = OHmissing_me_GE11_fail_allCh_1D; + m_histos["GEM_nPassingProbe_OHmissing_chamber_p1_1D"] = OHmissing_me_GEM_pass_chamber_p1_1D; + m_histos["GEM_nFailingProbe_OHmissing_chamber_p1_1D"] = OHmissing_me_GEM_fail_chamber_p1_1D; + m_histos["GEM_nPassingProbe_OHmissing_chamber_p2_1D"] = OHmissing_me_GEM_pass_chamber_p2_1D; + m_histos["GEM_nFailingProbe_OHmissing_chamber_p2_1D"] = OHmissing_me_GEM_fail_chamber_p2_1D; + m_histos["GEM_nPassingProbe_OHmissing_chamber_n1_1D"] = OHmissing_me_GEM_pass_chamber_n1_1D; + m_histos["GEM_nFailingProbe_OHmissing_chamber_n1_1D"] = OHmissing_me_GEM_fail_chamber_n1_1D; + m_histos["GEM_nPassingProbe_OHmissing_chamber_n2_1D"] = OHmissing_me_GEM_pass_chamber_n2_1D; + m_histos["GEM_nFailingProbe_OHmissing_chamber_n2_1D"] = OHmissing_me_GEM_fail_chamber_n2_1D; + m_histos["GEM_nPassingProbe_OHmissing_pt_1D"] = OHmissing_me_GEM_pass_pt_1D; + m_histos["GEM_nFailingProbe_OHmissing_pt_1D"] = OHmissing_me_GEM_fail_pt_1D; + m_histos["GEM_nPassingProbe_OHmissing_eta_1D"] = OHmissing_me_GEM_pass_eta_1D; + m_histos["GEM_nFailingProbe_OHmissing_eta_1D"] = OHmissing_me_GEM_fail_eta_1D; + m_histos["GEM_nPassingProbe_OHmissing_phi_1D"] = OHmissing_me_GEM_pass_phi_1D; + m_histos["GEM_nFailingProbe_OHmissing_phi_1D"] = OHmissing_me_GEM_fail_phi_1D; + m_histos["GE11_nPassingProbe_OHmissing_Ch_ieta_p1"] = OHmissing_me_GE11_pass_Ch_ieta_p1; + m_histos["GE11_nFailingProbe_OHmissing_Ch_ieta_p1"] = OHmissing_me_GE11_fail_Ch_ieta_p1; + m_histos["GE11_nPassingProbe_OHmissing_Ch_ieta_p2"] = OHmissing_me_GE11_pass_Ch_ieta_p2; + m_histos["GE11_nFailingProbe_OHmissing_Ch_ieta_p2"] = OHmissing_me_GE11_fail_Ch_ieta_p2; + m_histos["GE11_nPassingProbe_OHmissing_Ch_ieta_n1"] = OHmissing_me_GE11_pass_Ch_ieta_n1; + m_histos["GE11_nFailingProbe_OHmissing_Ch_ieta_n1"] = OHmissing_me_GE11_fail_Ch_ieta_n1; + m_histos["GE11_nPassingProbe_OHmissing_Ch_ieta_n2"] = OHmissing_me_GE11_pass_Ch_ieta_n2; + m_histos["GE11_nFailingProbe_OHmissing_Ch_ieta_n2"] = OHmissing_me_GE11_fail_Ch_ieta_n2; + + m_histos["GE11_nPassingProbe_OHerror_allCh_1D"] = OHerror_me_GE11_pass_allCh_1D; + m_histos["GE11_nFailingProbe_OHerror_allCh_1D"] = OHerror_me_GE11_fail_allCh_1D; + m_histos["GEM_nPassingProbe_OHerror_chamber_p1_1D"] = OHerror_me_GEM_pass_chamber_p1_1D; + m_histos["GEM_nFailingProbe_OHerror_chamber_p1_1D"] = OHerror_me_GEM_fail_chamber_p1_1D; + m_histos["GEM_nPassingProbe_OHerror_chamber_p2_1D"] = OHerror_me_GEM_pass_chamber_p2_1D; + m_histos["GEM_nFailingProbe_OHerror_chamber_p2_1D"] = OHerror_me_GEM_fail_chamber_p2_1D; + m_histos["GEM_nPassingProbe_OHerror_chamber_n1_1D"] = OHerror_me_GEM_pass_chamber_n1_1D; + m_histos["GEM_nFailingProbe_OHerror_chamber_n1_1D"] = OHerror_me_GEM_fail_chamber_n1_1D; + m_histos["GEM_nPassingProbe_OHerror_chamber_n2_1D"] = OHerror_me_GEM_pass_chamber_n2_1D; + m_histos["GEM_nFailingProbe_OHerror_chamber_n2_1D"] = OHerror_me_GEM_fail_chamber_n2_1D; + m_histos["GEM_nPassingProbe_OHerror_pt_1D"] = OHerror_me_GEM_pass_pt_1D; + m_histos["GEM_nFailingProbe_OHerror_pt_1D"] = OHerror_me_GEM_fail_pt_1D; + m_histos["GEM_nPassingProbe_OHerror_eta_1D"] = OHerror_me_GEM_pass_eta_1D; + m_histos["GEM_nFailingProbe_OHerror_eta_1D"] = OHerror_me_GEM_fail_eta_1D; + m_histos["GEM_nPassingProbe_OHerror_phi_1D"] = OHerror_me_GEM_pass_phi_1D; + m_histos["GEM_nFailingProbe_OHerror_phi_1D"] = OHerror_me_GEM_fail_phi_1D; + m_histos["GE11_nPassingProbe_OHerror_Ch_ieta_p1"] = OHerror_me_GE11_pass_Ch_ieta_p1; + m_histos["GE11_nFailingProbe_OHerror_Ch_ieta_p1"] = OHerror_me_GE11_fail_Ch_ieta_p1; + m_histos["GE11_nPassingProbe_OHerror_Ch_ieta_p2"] = OHerror_me_GE11_pass_Ch_ieta_p2; + m_histos["GE11_nFailingProbe_OHerror_Ch_ieta_p2"] = OHerror_me_GE11_fail_Ch_ieta_p2; + m_histos["GE11_nPassingProbe_OHerror_Ch_ieta_n1"] = OHerror_me_GE11_pass_Ch_ieta_n1; + m_histos["GE11_nFailingProbe_OHerror_Ch_ieta_n1"] = OHerror_me_GE11_fail_Ch_ieta_n1; + m_histos["GE11_nPassingProbe_OHerror_Ch_ieta_n2"] = OHerror_me_GE11_pass_Ch_ieta_n2; + m_histos["GE11_nFailingProbe_OHerror_Ch_ieta_n2"] = OHerror_me_GE11_fail_Ch_ieta_n2; + + m_histos["GE11_nPassingProbe_VFATMask_allCh_1D"] = VFATMask_me_GE11_pass_allCh_1D; + m_histos["GE11_nFailingProbe_VFATMask_allCh_1D"] = VFATMask_me_GE11_fail_allCh_1D; + m_histos["GEM_nPassingProbe_VFATMask_chamber_p1_1D"] = VFATMask_me_GEM_pass_chamber_p1_1D; + m_histos["GEM_nFailingProbe_VFATMask_chamber_p1_1D"] = VFATMask_me_GEM_fail_chamber_p1_1D; + m_histos["GEM_nPassingProbe_VFATMask_chamber_p2_1D"] = VFATMask_me_GEM_pass_chamber_p2_1D; + m_histos["GEM_nFailingProbe_VFATMask_chamber_p2_1D"] = VFATMask_me_GEM_fail_chamber_p2_1D; + m_histos["GEM_nPassingProbe_VFATMask_chamber_n1_1D"] = VFATMask_me_GEM_pass_chamber_n1_1D; + m_histos["GEM_nFailingProbe_VFATMask_chamber_n1_1D"] = VFATMask_me_GEM_fail_chamber_n1_1D; + m_histos["GEM_nPassingProbe_VFATMask_chamber_n2_1D"] = VFATMask_me_GEM_pass_chamber_n2_1D; + m_histos["GEM_nFailingProbe_VFATMask_chamber_n2_1D"] = VFATMask_me_GEM_fail_chamber_n2_1D; + m_histos["GEM_nPassingProbe_VFATMask_pt_1D"] = VFATMask_me_GEM_pass_pt_1D; + m_histos["GEM_nFailingProbe_VFATMask_pt_1D"] = VFATMask_me_GEM_fail_pt_1D; + m_histos["GEM_nPassingProbe_VFATMask_eta_1D"] = VFATMask_me_GEM_pass_eta_1D; + m_histos["GEM_nFailingProbe_VFATMask_eta_1D"] = VFATMask_me_GEM_fail_eta_1D; + m_histos["GEM_nPassingProbe_VFATMask_phi_1D"] = VFATMask_me_GEM_pass_phi_1D; + m_histos["GEM_nFailingProbe_VFATMask_phi_1D"] = VFATMask_me_GEM_fail_phi_1D; + m_histos["GE11_nPassingProbe_VFATMask_Ch_ieta_p1"] = VFATMask_me_GE11_pass_Ch_ieta_p1; + m_histos["GE11_nFailingProbe_VFATMask_Ch_ieta_p1"] = VFATMask_me_GE11_fail_Ch_ieta_p1; + m_histos["GE11_nPassingProbe_VFATMask_Ch_ieta_p2"] = VFATMask_me_GE11_pass_Ch_ieta_p2; + m_histos["GE11_nFailingProbe_VFATMask_Ch_ieta_p2"] = VFATMask_me_GE11_fail_Ch_ieta_p2; + m_histos["GE11_nPassingProbe_VFATMask_Ch_ieta_n1"] = VFATMask_me_GE11_pass_Ch_ieta_n1; + m_histos["GE11_nFailingProbe_VFATMask_Ch_ieta_n1"] = VFATMask_me_GE11_fail_Ch_ieta_n1; + m_histos["GE11_nPassingProbe_VFATMask_Ch_ieta_n2"] = VFATMask_me_GE11_pass_Ch_ieta_n2; + m_histos["GE11_nFailingProbe_VFATMask_Ch_ieta_n2"] = VFATMask_me_GE11_fail_Ch_ieta_n2; std::string baseDir_ = topFolder() + "/detailed/"; iBooker.setCurrentFolder(baseDir_); @@ -564,11 +1289,83 @@ void GEMTnPEfficiencyTask::bookHistograms(DQMStore::IBooker& iBooker, m_histos["Cham_x_ME0"] = iBooker.book1D("Cham_x_ME0", "Cham_x;probe x [cm];Events", 100, -10., 10.); m_histos["Cham_x_GE1"] = iBooker.book1D("Cham_x_GE1", "Cham_x;probe x [cm];Events", 100, -10., 10.); m_histos["Cham_x_GE2"] = iBooker.book1D("Cham_x_GE2", "Cham_x;probe x [cm];Events", 100, -10., 10.); + m_histos["xyErr_GE1"] = iBooker.book2D("xyErr_GE1", "xyErr_GE1", 50, 0., 5., 50, 0., 5.); +} + +uint16_t GEMTnPEfficiencyTask::maskChamberWithError(const GEMDetId& chamber_id, + const GEMOHStatusCollection* oh_status_collection, + const GEMVFATStatusCollection* vfat_status_collection) { + uint16_t oh_warning = 0; + bool oh_exists = false; + for (auto iter = oh_status_collection->begin(); iter != oh_status_collection->end(); iter++) { + const auto [oh_id, range] = (*iter); + if (chamber_id.chamberId() != oh_id) { + continue; + } + for (auto oh_status = range.first; oh_status != range.second; oh_status++) { + oh_exists = true; + if (oh_status->isBad()) { + oh_warning = oh_warning | (1 << 1); + } + //oh_warning = oh_warning | (oh_status->warnings()); // If doing oh warning masking + uint32_t vfatmask = oh_status->vfatMask(); + if (vfatmask != 16777215) { + int ieta = chamber_id.ieta(); + if (!((vfatmask >> (8 - ieta) & 1) && (vfatmask >> (16 - ieta) & 1) && + (vfatmask >> (24 - ieta) & 1))) { // will not work for GE21 + oh_warning = oh_warning | (1 << 2); + } + } + } // range + } // collection + if (!oh_exists) { + oh_warning = oh_warning | 1; + } + return oh_warning; +} + +bool GEMTnPEfficiencyTask::checkBounds(const GeomDet* geomDet, + const GlobalPoint& global_position, + const float bordercut) { + const TrapezoidalPlaneBounds* bounds = dynamic_cast(&geomDet->surface().bounds()); + LocalPoint localPoint = geomDet->surface().toLocal(global_position); + float wideWidth = bounds->width(); + float narrowWidth = 2.f * bounds->widthAtHalfLength() - wideWidth; + float length = bounds->length(); + float tangent = (wideWidth - narrowWidth) / (2.f * length); + float halfWidthAtY = tangent * localPoint.y() + 0.25f * (narrowWidth + wideWidth); + float distanceY = std::abs(localPoint.y()) - 0.5f * length; + float distanceX = std::abs(localPoint.x()) - halfWidthAtY; + if (distanceX < bordercut && distanceY < bordercut) { + return true; + } + return false; } void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetup& context) { BaseTnPEfficiencyTask::analyze(event, context); + GEMOHStatusCollection oh_status; + GEMVFATStatusCollection vfat_status; + edm::Handle oh_status_collection; + edm::Handle vfat_status_collection; + muon_service_->update(context); + if (m_maskChamberWithError_) { + event.getByToken(m_GEMOHStatusCollectionToken_, oh_status_collection); + //if (oh_status_collem_tion.isValid()) { + oh_status = *oh_status_collection; + } else { + LogTrace("DQMOffline|MuonDPG|BaseTnPEfficiencyTask") << "failed to get GEMOHStatusCollection" << std::endl; + return; + } + // event.getByToken(kGEMVFATStatusCollectionToken_, vfat_status_collection); + // if (vfat_status_collection.isValid()) { + // vfat_status = *vfat_status_collection; + // } else { + // LogTrace("DQMOffline|MuonDPG|BaseTnPEfficiencyTask") << "failed to get GEMVFATStatusCollection" << std::endl; + // return; + // } + // } edm::Handle muons; event.getByToken(m_muToken, muons); @@ -582,6 +1379,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu std::vector> probe_coll_GE11_phi; std::vector> probe_coll_GE11_sta; std::vector> probe_coll_GE11_dx; + std::vector> probe_coll_GE11_warnings; //GE21 variables std::vector> probe_coll_GE21_region; @@ -593,6 +1391,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu std::vector> probe_coll_GE21_phi; std::vector> probe_coll_GE21_sta; std::vector> probe_coll_GE21_dx; + std::vector> probe_coll_GE21_warnings; std::vector probe_coll_GEM_staMatch; // ME0 to 0b0001, GE11 to 0b0010, GE21 to 0b0100 @@ -607,6 +1406,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu std::vector> probe_coll_ME0_phi; std::vector> probe_coll_ME0_sta; std::vector> probe_coll_ME0_dx; + std::vector> probe_coll_ME0_warnings; std::vector probe_indices; if (!m_probeIndices.empty()) @@ -624,6 +1424,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu std::vector probe_GE11_ieta; std::vector probe_GE11_phi; std::vector probe_GE11_dx; + std::vector probe_GE11_warnings; //GE21 variables std::vector probe_GE21_region; std::vector probe_GE21_sta; @@ -634,6 +1435,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu std::vector probe_GE21_ieta; std::vector probe_GE21_phi; std::vector probe_GE21_dx; + std::vector probe_GE21_warnings; //std::vector probe_GEM_dx_seg; uint8_t GEM_stationMatching = 0; //ME0 variables @@ -647,6 +1449,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu std::vector probe_ME0_ieta; std::vector probe_ME0_phi; std::vector probe_ME0_dx; + std::vector probe_ME0_warnings; bool gem_matched = false; // fill detailed plots only for probes matching GEM @@ -658,18 +1461,31 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu gem_matched = true; //fill detailed plots if at least one GEM probe match GEMDetId chId(chambMatch.id.rawId()); - + const uint16_t warnings = maskChamberWithError(chId, &oh_status, &vfat_status); const int roll = chId.roll(); const int region = chId.region(); const int station = chId.station(); const int layer = chId.layer(); const int chamber = chId.chamber(); - const int ieta = chId.ieta(); const float pt = (*muons).at(i).pt(); const float eta = (*muons).at(i).eta(); const float phi = (*muons).at(i).phi(); + int ieta = 0; GEM_stationMatching = GEM_stationMatching | (1 << station); + const GeomDet* geomDet = muon_service_->trackingGeometry()->idToDet(chId); + LocalPoint pos(chambMatch.x, chambMatch.y); + + const GlobalPoint& global_position = geomDet->toGlobal(pos); + + if (const GEMChamber* gemChamber = dynamic_cast(geomDet)) { + for (const GEMEtaPartition* eta_partition : gemChamber->etaPartitions()) + if (checkBounds(eta_partition, global_position, m_borderCut)) { + ieta = eta_partition->id().ieta(); + break; + } + } + if (station == 1 || station == 2) { reco::MuonGEMHitMatch closest_matchedHit; double smallestDx = 99999.; @@ -695,6 +1511,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu probe_GE11_eta.push_back(eta); probe_GE11_phi.push_back(phi); probe_GE11_dx.push_back(smallestDx); + probe_GE11_warnings.push_back(warnings); } if (station == 2) { @@ -707,13 +1524,14 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu probe_GE21_eta.push_back(eta); probe_GE21_phi.push_back(phi); probe_GE21_dx.push_back(smallestDx); + probe_GE21_warnings.push_back(warnings); } - if (m_detailedAnalysis && hit_matched) { if (station == 1) { m_histos.find("GEMhit_dx_GE1")->second->Fill(smallestDx); m_histos.find("GEMhit_x_GE1")->second->Fill(matched_GEMHit_x); m_histos.find("Cham_x_GE1")->second->Fill(chambMatch.x); + m_histos.find("xyErr_GE1")->second->Fill(chambMatch.xErr, chambMatch.yErr); } if (station == 2) { m_histos.find("GEMhit_dx_GE2")->second->Fill(smallestDx); @@ -746,6 +1564,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu probe_ME0_eta.push_back(eta); probe_ME0_phi.push_back(phi); probe_ME0_dx.push_back(smallestDx_seg); + probe_ME0_warnings.push_back(warnings); if (m_detailedAnalysis && hit_matched) { m_histos.find("GEMseg_dx_ME0")->second->Fill(smallestDx_seg); @@ -781,6 +1600,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu probe_coll_GE11_eta.push_back(probe_GE11_eta); probe_coll_GE11_phi.push_back(probe_GE11_phi); probe_coll_GE11_dx.push_back(probe_GE11_dx); + probe_coll_GE11_warnings.push_back(probe_GE11_warnings); probe_coll_GEM_staMatch.push_back(GEM_stationMatching); @@ -794,6 +1614,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu probe_coll_GE21_eta.push_back(probe_GE21_eta); probe_coll_GE21_phi.push_back(probe_GE21_phi); probe_coll_GE21_dx.push_back(probe_GE21_dx); + probe_coll_GE21_warnings.push_back(probe_GE21_warnings); //Fill ME0 variables probe_coll_ME0_region.push_back(probe_ME0_region); @@ -806,6 +1627,7 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu probe_coll_ME0_eta.push_back(probe_ME0_eta); probe_coll_ME0_phi.push_back(probe_ME0_phi); probe_coll_ME0_dx.push_back(probe_ME0_dx); + probe_coll_ME0_warnings.push_back(probe_ME0_warnings); } //loop over probe collection @@ -856,12 +1678,24 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu float GEM_dx = probe_coll_GE11_dx.at(i).at(j); float GEM_eta = probe_coll_GE11_eta.at(i).at(j); float GEM_phi = probe_coll_GE11_phi.at(i).at(j); + + uint16_t GEM_warning = probe_coll_GE11_warnings.at(i).at(j); //Fill GEM plots if (GEM_dx < m_dxCut) { m_histos.find("GE11_nPassingProbe_Ch_region")->second->Fill(GEM_region, GEM_chamber); m_histos.find("GE11_nPassingProbe_Ch_ieta")->second->Fill(GEM_ieta, GEM_chamber); m_histos.find("GE11_nPassingProbe_Ch_phi")->second->Fill(GEM_phi, GEM_chamber); m_histos.find("GE11_nPassingProbe_allCh_1D")->second->Fill(GEM_region); + if (~GEM_warning & 1) { + m_histos.find("GE11_nPassingProbe_OHmissing_allCh_1D")->second->Fill(GEM_region); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nPassingProbe_OHerror_allCh_1D")->second->Fill(GEM_region); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nPassingProbe_VFATMask_allCh_1D")->second->Fill(GEM_region); + } + } + } + m_histos.find("GE11_nPassingProbe_chamber_1D")->second->Fill(GEM_chamber); if (GEM_region < 0) { if (GEM_lay == 2) @@ -883,37 +1717,157 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu if (GEM_region == 1 && GEM_lay == 1) { m_histos.find("GEM_nPassingProbe_chamber_p1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nPassingProbe_OHmissing_chamber_p1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nPassingProbe_OHerror_chamber_p1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nPassingProbe_VFATMask_chamber_p1_1D")->second->Fill(GEM_chamber); + } + } + } + if (GEM_sta == 1) { + m_histos.find("GE11_nPassingProbe_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nPassingProbe_OHmissing_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nPassingProbe_OHerror_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nPassingProbe_VFATMask_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } m_histos.find("GEM_nPassingProbe_Ch_region_GE1")->second->Fill(2, GEM_chamber); m_histos.find("GEM_nPassingProbe_pt_p1_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nPassingProbe_eta_p1_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nPassingProbe_phi_p1_1D")->second->Fill(GEM_phi); } else if (GEM_region == 1 && GEM_lay == 2) { m_histos.find("GEM_nPassingProbe_chamber_p2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nPassingProbe_OHmissing_chamber_p2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nPassingProbe_OHerror_chamber_p2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nPassingProbe_VFATMask_chamber_p2_1D")->second->Fill(GEM_chamber); + } + } + } + if (GEM_sta == 1) { + m_histos.find("GE11_nPassingProbe_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nPassingProbe_OHmissing_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nPassingProbe_OHerror_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nPassingProbe_VFATMask_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } m_histos.find("GEM_nPassingProbe_Ch_region_GE1")->second->Fill(3, GEM_chamber); m_histos.find("GEM_nPassingProbe_pt_p2_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nPassingProbe_eta_p2_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nPassingProbe_phi_p2_1D")->second->Fill(GEM_phi); } else if (GEM_region == -1 && GEM_lay == 1) { m_histos.find("GEM_nPassingProbe_chamber_n1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nPassingProbe_OHmissing_chamber_n1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nPassingProbe_OHerror_chamber_n1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nPassingProbe_VFATMask_chamber_n1_1D")->second->Fill(GEM_chamber); + } + } + } + if (GEM_sta == 1) { + m_histos.find("GE11_nPassingProbe_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nPassingProbe_OHmissing_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nPassingProbe_OHerror_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nPassingProbe_VFATMask_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } m_histos.find("GEM_nPassingProbe_Ch_region_GE1")->second->Fill(1, GEM_chamber); m_histos.find("GEM_nPassingProbe_pt_n1_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nPassingProbe_eta_n1_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nPassingProbe_phi_n1_1D")->second->Fill(GEM_phi); } else if (GEM_region == -1 && GEM_lay == 2) { m_histos.find("GEM_nPassingProbe_chamber_n2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nPassingProbe_OHmissing_chamber_n2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nPassingProbe_OHerror_chamber_n2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nPassingProbe_VFATMask_chamber_n2_1D")->second->Fill(GEM_chamber); + } + } + } + if (GEM_sta == 1) { + m_histos.find("GE11_nPassingProbe_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nPassingProbe_OHmissing_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nPassingProbe_OHerror_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nPassingProbe_VFATMask_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } m_histos.find("GEM_nPassingProbe_Ch_region_GE1")->second->Fill(0, GEM_chamber); m_histos.find("GEM_nPassingProbe_pt_n2_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nPassingProbe_eta_n2_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nPassingProbe_phi_n2_1D")->second->Fill(GEM_phi); } m_histos.find("GEM_nPassingProbe_pt_1D")->second->Fill(GEM_pt); + if (~GEM_warning & 1) { + m_histos.find("GEM_nPassingProbe_OHmissing_pt_1D")->second->Fill(GEM_pt); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nPassingProbe_OHerror_pt_1D")->second->Fill(GEM_pt); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nPassingProbe_VFATMask_pt_1D")->second->Fill(GEM_pt); + } + } + } m_histos.find("GEM_nPassingProbe_eta_1D")->second->Fill(abs(GEM_eta)); + if (~GEM_warning & 1) { + m_histos.find("GEM_nPassingProbe_OHmissing_eta_1D")->second->Fill(GEM_eta); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nPassingProbe_OHerror_eta_1D")->second->Fill(GEM_eta); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nPassingProbe_VFATMask_eta_1D")->second->Fill(GEM_eta); + } + } + } m_histos.find("GEM_nPassingProbe_phi_1D")->second->Fill(GEM_phi); + if (~GEM_warning & 1) { + m_histos.find("GEM_nPassingProbe_OHmissing_phi_1D")->second->Fill(GEM_phi); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nPassingProbe_OHerror_phi_1D")->second->Fill(GEM_phi); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nPassingProbe_VFATMask_phi_1D")->second->Fill(GEM_phi); + } + } + } } else { m_histos.find("GE11_nFailingProbe_Ch_region")->second->Fill(GEM_region, GEM_chamber); m_histos.find("GE11_nFailingProbe_Ch_ieta")->second->Fill(GEM_ieta, GEM_chamber); m_histos.find("GE11_nFailingProbe_Ch_phi")->second->Fill(GEM_phi, GEM_chamber); m_histos.find("GE11_nFailingProbe_allCh_1D")->second->Fill(GEM_region); + if (~GEM_warning & 1) { + m_histos.find("GE11_nFailingProbe_OHmissing_allCh_1D")->second->Fill(GEM_region); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nFailingProbe_OHerror_allCh_1D")->second->Fill(GEM_region); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nFailingProbe_VFATMask_allCh_1D")->second->Fill(GEM_region); + } + } + } m_histos.find("GE11_nFailingProbe_chamber_1D")->second->Fill(GEM_chamber); if (GEM_region < 0) { if (GEM_sta == 2 and GEM_lay == 2) @@ -943,32 +1897,143 @@ void GEMTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSetu // if (GEM_region == 1 && GEM_lay == 1) { m_histos.find("GEM_nFailingProbe_chamber_p1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nFailingProbe_OHmissing_chamber_p1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nFailingProbe_OHerror_chamber_p1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nFailingProbe_VFATMask_chamber_p1_1D")->second->Fill(GEM_chamber); + } + } + } m_histos.find("GEM_nFailingProbe_Ch_region_GE1")->second->Fill(2, GEM_chamber); m_histos.find("GEM_nFailingProbe_pt_p1_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nFailingProbe_eta_p1_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nFailingProbe_phi_p1_1D")->second->Fill(GEM_phi); + if (GEM_sta == 1) { + m_histos.find("GE11_nFailingProbe_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nFailingProbe_OHmissing_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nFailingProbe_OHerror_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nFailingProbe_VFATMask_Ch_ieta_p1")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } } else if (GEM_region == 1 && GEM_lay == 2) { m_histos.find("GEM_nFailingProbe_chamber_p2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nFailingProbe_OHmissing_chamber_p2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nFailingProbe_OHerror_chamber_p2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nFailingProbe_VFATMask_chamber_p2_1D")->second->Fill(GEM_chamber); + } + } + } m_histos.find("GEM_nFailingProbe_Ch_region_GE1")->second->Fill(3, GEM_chamber); m_histos.find("GEM_nFailingProbe_pt_p2_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nFailingProbe_eta_p2_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nFailingProbe_phi_p2_1D")->second->Fill(GEM_phi); + if (GEM_sta == 1) { + m_histos.find("GE11_nFailingProbe_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nFailingProbe_OHmissing_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nFailingProbe_OHerror_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nFailingProbe_VFATMask_Ch_ieta_p2")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } } else if (GEM_region == -1 && GEM_lay == 1) { m_histos.find("GEM_nFailingProbe_chamber_n1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nFailingProbe_OHmissing_chamber_n1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nFailingProbe_OHerror_chamber_n1_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nFailingProbe_VFATMask_chamber_n1_1D")->second->Fill(GEM_chamber); + } + } + } m_histos.find("GEM_nFailingProbe_Ch_region_GE1")->second->Fill(1, GEM_chamber); m_histos.find("GEM_nFailingProbe_pt_n1_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nFailingProbe_eta_n1_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nFailingProbe_phi_n1_1D")->second->Fill(GEM_phi); + if (GEM_sta == 1) { + m_histos.find("GE11_nFailingProbe_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nFailingProbe_OHmissing_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nFailingProbe_OHerror_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nFailingProbe_VFATMask_Ch_ieta_n1")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } } else if (GEM_region == -1 && GEM_lay == 2) { m_histos.find("GEM_nFailingProbe_chamber_n2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GEM_nFailingProbe_OHmissing_chamber_n2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nFailingProbe_OHerror_chamber_n2_1D")->second->Fill(GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nFailingProbe_VFATMask_chamber_n2_1D")->second->Fill(GEM_chamber); + } + } + } m_histos.find("GEM_nFailingProbe_Ch_region_GE1")->second->Fill(0, GEM_chamber); m_histos.find("GEM_nFailingProbe_pt_n2_1D")->second->Fill(GEM_pt); m_histos.find("GEM_nFailingProbe_eta_n2_1D")->second->Fill(abs(GEM_eta)); m_histos.find("GEM_nFailingProbe_phi_n2_1D")->second->Fill(GEM_phi); + if (GEM_sta == 1) { + m_histos.find("GE11_nFailingProbe_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning & 1) { + m_histos.find("GE11_nFailingProbe_OHmissing_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GE11_nFailingProbe_OHerror_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GE11_nFailingProbe_VFATMask_Ch_ieta_n2")->second->Fill(GEM_ieta, GEM_chamber); + } + } + } + } } m_histos.find("GEM_nFailingProbe_pt_1D")->second->Fill(GEM_pt); + if (~GEM_warning & 1) { + m_histos.find("GEM_nFailingProbe_OHmissing_pt_1D")->second->Fill(GEM_pt); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nFailingProbe_OHerror_pt_1D")->second->Fill(GEM_pt); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nFailingProbe_VFATMask_pt_1D")->second->Fill(GEM_pt); + } + } + } m_histos.find("GEM_nFailingProbe_eta_1D")->second->Fill(abs(GEM_eta)); + if (~GEM_warning & 1) { + m_histos.find("GEM_nFailingProbe_OHmissing_eta_1D")->second->Fill(GEM_eta); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nFailingProbe_OHerror_eta_1D")->second->Fill(GEM_eta); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nFailingProbe_VFATMask_eta_1D")->second->Fill(GEM_eta); + } + } + } m_histos.find("GEM_nFailingProbe_phi_1D")->second->Fill(GEM_phi); + if (~GEM_warning & 1) { + m_histos.find("GEM_nFailingProbe_OHmissing_phi_1D")->second->Fill(GEM_phi); + if (~GEM_warning >> 1 & 1) { + m_histos.find("GEM_nFailingProbe_OHerror_phi_1D")->second->Fill(GEM_phi); + if (~GEM_warning >> 2 & 1) { + m_histos.find("GEM_nFailingProbe_VFATMask_phi_1D")->second->Fill(GEM_phi); + } + } + } } } diff --git a/DQMOffline/MuonDPG/python/gemTnPEfficiencyClient_cfi.py b/DQMOffline/MuonDPG/python/gemTnPEfficiencyClient_cfi.py index 84e15a1aa64c6..2000be9b2a4ab 100644 --- a/DQMOffline/MuonDPG/python/gemTnPEfficiencyClient_cfi.py +++ b/DQMOffline/MuonDPG/python/gemTnPEfficiencyClient_cfi.py @@ -36,5 +36,45 @@ "GEM_nPassingProbe_eta_n2_1D:GEM_nFailingProbe_eta_n2_1D", "GEM_nPassingProbe_phi_n2_1D:GEM_nFailingProbe_phi_n2_1D", "ME0_nPassingProbe_chamber_1D:ME0_nFailingProbe_chamber_1D", + "GE11_nPassingProbe_Ch_ieta_p1:GE11_nFailingProbe_Ch_ieta_p1", + "GE11_nPassingProbe_Ch_ieta_p2:GE11_nFailingProbe_Ch_ieta_p2", + "GE11_nPassingProbe_Ch_ieta_n1:GE11_nFailingProbe_Ch_ieta_n1", + "GE11_nPassingProbe_Ch_ieta_n2:GE11_nFailingProbe_Ch_ieta_n2", + "GE11_nPassingProbe_OHmissing_allCh_1D:GE11_nFailingProbe_OHmissing_allCh_1D", + "GEM_nPassingProbe_OHmissing_chamber_p1_1D:GEM_nFailingProbe_OHmissing_chamber_p1_1D", + "GEM_nPassingProbe_OHmissing_chamber_p2_1D:GEM_nFailingProbe_OHmissing_chamber_p2_1D", + "GEM_nPassingProbe_OHmissing_chamber_n1_1D:GEM_nFailingProbe_OHmissing_chamber_n1_1D", + "GEM_nPassingProbe_OHmissing_chamber_n2_1D:GEM_nFailingProbe_OHmissing_chamber_n2_1D", + "GEM_nPassingProbe_OHmissing_pt_1D:GEM_nFailingProbe_OHmissing_pt_1D", + "GEM_nPassingProbe_OHmissing_eta_1D:GEM_nFailingProbe_OHmissing_eta_1D", + "GEM_nPassingProbe_OHmissing_phi_1D:GEM_nFailingProbe_OHmissing_phi_1D", + "GE11_nPassingProbe_OHmissing_Ch_ieta_p1:GE11_nFailingProbe_OHmissing_Ch_ieta_p1", + "GE11_nPassingProbe_OHmissing_Ch_ieta_p2:GE11_nFailingProbe_OHmissing_Ch_ieta_p2", + "GE11_nPassingProbe_OHmissing_Ch_ieta_n1:GE11_nFailingProbe_OHmissing_Ch_ieta_n1", + "GE11_nPassingProbe_OHmissing_Ch_ieta_n2:GE11_nFailingProbe_OHmissing_Ch_ieta_n2", + "GE11_nPassingProbe_OHerror_allCh_1D:GE11_nFailingProbe_OHerror_allCh_1D", + "GEM_nPassingProbe_OHerror_chamber_p1_1D:GEM_nFailingProbe_OHerror_chamber_p1_1D", + "GEM_nPassingProbe_OHerror_chamber_p2_1D:GEM_nFailingProbe_OHerror_chamber_p2_1D", + "GEM_nPassingProbe_OHerror_chamber_n1_1D:GEM_nFailingProbe_OHerror_chamber_n1_1D", + "GEM_nPassingProbe_OHerror_chamber_n2_1D:GEM_nFailingProbe_OHerror_chamber_n2_1D", + "GEM_nPassingProbe_OHerror_pt_1D:GEM_nFailingProbe_OHerror_pt_1D", + "GEM_nPassingProbe_OHerror_eta_1D:GEM_nFailingProbe_OHerror_eta_1D", + "GEM_nPassingProbe_OHerror_phi_1D:GEM_nFailingProbe_OHerror_phi_1D", + "GE11_nPassingProbe_OHerror_Ch_ieta_p1:GE11_nFailingProbe_OHerror_Ch_ieta_p1", + "GE11_nPassingProbe_OHerror_Ch_ieta_p2:GE11_nFailingProbe_OHerror_Ch_ieta_p2", + "GE11_nPassingProbe_OHerror_Ch_ieta_n1:GE11_nFailingProbe_OHerror_Ch_ieta_n1", + "GE11_nPassingProbe_OHerror_Ch_ieta_n2:GE11_nFailingProbe_OHerror_Ch_ieta_n2", + "GE11_nPassingProbe_VFATMask_allCh_1D:GE11_nFailingProbe_VFATMask_allCh_1D", + "GEM_nPassingProbe_VFATMask_chamber_p1_1D:GEM_nFailingProbe_VFATMask_chamber_p1_1D", + "GEM_nPassingProbe_VFATMask_chamber_p2_1D:GEM_nFailingProbe_VFATMask_chamber_p2_1D", + "GEM_nPassingProbe_VFATMask_chamber_n1_1D:GEM_nFailingProbe_VFATMask_chamber_n1_1D", + "GEM_nPassingProbe_VFATMask_chamber_n2_1D:GEM_nFailingProbe_VFATMask_chamber_n2_1D", + "GEM_nPassingProbe_VFATMask_pt_1D:GEM_nFailingProbe_VFATMask_pt_1D", + "GEM_nPassingProbe_VFATMask_eta_1D:GEM_nFailingProbe_VFATMask_eta_1D", + "GEM_nPassingProbe_VFATMask_phi_1D:GEM_nFailingProbe_VFATMask_phi_1D", + "GE11_nPassingProbe_VFATMask_Ch_ieta_p1:GE11_nFailingProbe_VFATMask_Ch_ieta_p1", + "GE11_nPassingProbe_VFATMask_Ch_ieta_p2:GE11_nFailingProbe_VFATMask_Ch_ieta_p2", + "GE11_nPassingProbe_VFATMask_Ch_ieta_n1:GE11_nFailingProbe_VFATMask_Ch_ieta_n1", + "GE11_nPassingProbe_VFATMask_Ch_ieta_n2:GE11_nFailingProbe_VFATMask_Ch_ieta_n2", "GEM_nPassingProbe_Ch_region_layer_phase2:GEM_nFailingProbe_Ch_region_layer_phase2"), diagnosticPrescale = cms.untracked.int32(1)) diff --git a/DQMOffline/MuonDPG/python/gemTnPEfficiencyTask_cfi.py b/DQMOffline/MuonDPG/python/gemTnPEfficiencyTask_cfi.py index 92fcb8af326ad..d864bc8af2ac9 100644 --- a/DQMOffline/MuonDPG/python/gemTnPEfficiencyTask_cfi.py +++ b/DQMOffline/MuonDPG/python/gemTnPEfficiencyTask_cfi.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from RecoMuon.TrackingTools.MuonServiceProxy_cff import * from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer gemTnPEfficiencyMonitor = DQMEDAnalyzer('GEMTnPEfficiencyTask', @@ -16,8 +17,13 @@ # CutBasedIdMedium = 1UL << 1 # CutBasedIdMediumPrompt = 1UL << 2 # CutBasedIdTight = 1UL << 3 + maskChamberWithError=cms.untracked.bool(True), + ServiceParameters = MuonServiceProxy.ServiceParameters.clone(), + ohStatusTag=cms.untracked.InputTag("muonGEMDigis", "OHStatus"), + vfatStatusTag=cms.untracked.InputTag("muonGEMDigis","VFATStatus"), + amcStatusTag=cms.untracked.InputTag("muonGEMDigis","AMCStatus"), tagCut = cms.untracked.string('(selectors & 8) && ((isolationR03.sumPt)/(pt) < 0.05) && pt>24.'), - borderCut = cms.untracked.double(-10.), + borderCut = cms.untracked.double(-2.), lowPairMassCut = cms.untracked.double (80.), highPairMassCut = cms.untracked.double (100.), trigName = cms.untracked.string("HLT_IsoMu*"), diff --git a/DQMOffline/MuonDPG/src/BaseTnPEfficiencyTask.cc b/DQMOffline/MuonDPG/src/BaseTnPEfficiencyTask.cc index ea018c5b82776..62cfd2a08be8e 100644 --- a/DQMOffline/MuonDPG/src/BaseTnPEfficiencyTask.cc +++ b/DQMOffline/MuonDPG/src/BaseTnPEfficiencyTask.cc @@ -142,8 +142,7 @@ void BaseTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSet for (const auto i_tag : preSel_tag_indices) { reco::Muon tag = (*muons).at(i_tag); float pt_max = 0.; - int max_pt_idx; - bool pair_found = false; + int max_pt_idx = -1; for (const auto i_probe : preSel_probe_indices) { //Prevent tag and probe to be the same object @@ -166,12 +165,11 @@ void BaseTnPEfficiencyTask::analyze(const edm::Event& event, const edm::EventSet float pair_pt = (tag.polarP4() + preSel_probe.polarP4()).Pt(); if (pair_pt > pt_max) { - pair_found = true; pt_max = pair_pt; max_pt_idx = i_probe; } } - if (pair_found) { + if (max_pt_idx != -1) { probe_indices.push_back(max_pt_idx); tag_indices.push_back(i_tag); } diff --git a/DQMOffline/RecoB/interface/BaseBTagPlotter.h b/DQMOffline/RecoB/interface/BaseBTagPlotter.h index d3f6bbf7c4128..8e31c508b402f 100644 --- a/DQMOffline/RecoB/interface/BaseBTagPlotter.h +++ b/DQMOffline/RecoB/interface/BaseBTagPlotter.h @@ -12,9 +12,9 @@ class BaseBTagPlotter { typedef dqm::legacy::MonitorElement MonitorElement; BaseBTagPlotter(const std::string& tagName, const EtaPtBin& etaPtBin) - : etaPtBin_(etaPtBin), tagName_(tagName), theExtensionString("_" + tagName + etaPtBin.getDescriptionString()){}; + : etaPtBin_(etaPtBin), tagName_(tagName), theExtensionString("_" + tagName + etaPtBin.getDescriptionString()) {} - virtual ~BaseBTagPlotter(){}; + virtual ~BaseBTagPlotter() {} const EtaPtBin& etaPtBin() { return etaPtBin_; } diff --git a/DQMOffline/RecoB/interface/BaseTagInfoPlotter.h b/DQMOffline/RecoB/interface/BaseTagInfoPlotter.h index 445633915c275..6c1092c0e28bf 100644 --- a/DQMOffline/RecoB/interface/BaseTagInfoPlotter.h +++ b/DQMOffline/RecoB/interface/BaseTagInfoPlotter.h @@ -10,9 +10,9 @@ class BaseTagInfoPlotter : public BaseBTagPlotter { public: - BaseTagInfoPlotter(const std::string &tagName, const EtaPtBin &etaPtBin) : BaseBTagPlotter(tagName, etaPtBin){}; + BaseTagInfoPlotter(const std::string &tagName, const EtaPtBin &etaPtBin) : BaseBTagPlotter(tagName, etaPtBin) {} - ~BaseTagInfoPlotter() override{}; + ~BaseTagInfoPlotter() override {} virtual void analyzeTag(const reco::BaseTagInfo *tagInfo, double jec, int jetFlavour, float w = 1); virtual void analyzeTag(const std::vector &tagInfos, double jec, diff --git a/DQMOffline/RecoB/interface/EtaPtBin.h b/DQMOffline/RecoB/interface/EtaPtBin.h index dae9d874bcb27..cbc1769a315f8 100644 --- a/DQMOffline/RecoB/interface/EtaPtBin.h +++ b/DQMOffline/RecoB/interface/EtaPtBin.h @@ -21,7 +21,7 @@ class EtaPtBin { const double& ptMin_, const double& ptMax_); - ~EtaPtBin(){}; + ~EtaPtBin() {} /// String describes rapidity/pt range. std::string getDescriptionString() const { return descriptionString; } diff --git a/DQMOffline/RecoB/interface/TrackIPHistograms.h b/DQMOffline/RecoB/interface/TrackIPHistograms.h index dc3dc74aaf337..fdfd899e0c42a 100644 --- a/DQMOffline/RecoB/interface/TrackIPHistograms.h +++ b/DQMOffline/RecoB/interface/TrackIPHistograms.h @@ -37,7 +37,7 @@ class TrackIPHistograms : public FlavourHistograms { const bool& quality, DQMStore::IBooker& ibook); - ~TrackIPHistograms() override{}; + ~TrackIPHistograms() override {} void fill(const int& flavour, const reco::TrackBase::TrackQuality& quality, diff --git a/DQMOffline/Trigger/interface/EgHLTMonElemFuncs.h b/DQMOffline/Trigger/interface/EgHLTMonElemFuncs.h index a6342c4a72f81..8043f44995299 100644 --- a/DQMOffline/Trigger/interface/EgHLTMonElemFuncs.h +++ b/DQMOffline/Trigger/interface/EgHLTMonElemFuncs.h @@ -33,7 +33,7 @@ namespace egHLT { const TrigCodes& trigCodes; public: - MonElemFuncs(DQMStore::IBooker& i, const TrigCodes& c) : iBooker(i), trigCodes(c){}; + MonElemFuncs(DQMStore::IBooker& i, const TrigCodes& c) : iBooker(i), trigCodes(c) {} ~MonElemFuncs() = default; ; DQMStore::IBooker& getIB() { return iBooker; }; diff --git a/DQMOffline/Trigger/interface/EgHLTTrigTools.h b/DQMOffline/Trigger/interface/EgHLTTrigTools.h index f41beadc12ed8..d9af73729ddc7 100644 --- a/DQMOffline/Trigger/interface/EgHLTTrigTools.h +++ b/DQMOffline/Trigger/interface/EgHLTTrigTools.h @@ -93,10 +93,10 @@ namespace egHLT { if (reco::deltaR(particles[partNr].eta(), particles[partNr].phi(), trigObjEta, trigObjPhi) < maxDeltaR) { partTrigBits[partNr] |= filterCode; } //end dR::fill( filterHist.fillHists(*tagRef, *probeRef, event, setup, *trigEvtHandle); } } //end of t&p pair cuts - } //end of probe loop - } //end of tag loop + } //end of probe loop + } //end of tag loop } //yo dawg, I heard you like templates... diff --git a/DQMOffline/Trigger/interface/HLTInclusiveVBFSource.h b/DQMOffline/Trigger/interface/HLTInclusiveVBFSource.h index b866f5fd613f7..583120ddd63ac 100644 --- a/DQMOffline/Trigger/interface/HLTInclusiveVBFSource.h +++ b/DQMOffline/Trigger/interface/HLTInclusiveVBFSource.h @@ -180,7 +180,7 @@ class HLTInclusiveVBFSource : public DQMEDAnalyzer { filterName_("unset"), processName_("unset"), objectType_(-1), - triggerType_("unset"){}; + triggerType_("unset") {} // public: // @@ -286,7 +286,7 @@ class HLTInclusiveVBFSource : public DQMEDAnalyzer { // simple collection class PathInfoCollection : public std::vector { public: - PathInfoCollection() : std::vector(){}; + PathInfoCollection() : std::vector() {} std::vector::iterator find(const std::string& pathName) { return std::find(begin(), end(), pathName); } }; PathInfoCollection hltPathsAll_; diff --git a/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h b/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h index 346e6a18362b8..886c7b0785274 100644 --- a/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h +++ b/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h @@ -189,7 +189,7 @@ class JetMETHLTOfflineSource : public DQMEDAnalyzer { DenomfilterName_("unset"), processName_("unset"), objectType_(-1), - triggerType_("unset"){}; + triggerType_("unset") {} public: void setHistos(MonitorElement* const N, @@ -934,7 +934,7 @@ class JetMETHLTOfflineSource : public DQMEDAnalyzer { // simple collection class PathInfoCollection : public std::vector { public: - PathInfoCollection() : std::vector(){}; + PathInfoCollection() : std::vector() {} std::vector::iterator find(const std::string& pathName) { return std::find(begin(), end(), pathName); } }; PathInfoCollection hltPathsAllTriggerSummary_; diff --git a/DQMOffline/Trigger/plugins/BPHMonitor.cc b/DQMOffline/Trigger/plugins/BPHMonitor.cc index 7fa313c39f953..18526483976a2 100644 --- a/DQMOffline/Trigger/plugins/BPHMonitor.cc +++ b/DQMOffline/Trigger/plugins/BPHMonitor.cc @@ -1180,7 +1180,7 @@ void BPHMonitor::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup } } // for (auto const & t1 : *trHandle) - } // for (auto const & t : *trHandle) + } // for (auto const & t : *trHandle) break; } diff --git a/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc b/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc index 3eef29e15c3d2..9591b4c42fef4 100644 --- a/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc +++ b/DQMOffline/Trigger/plugins/BTVHLTOfflineSource.cc @@ -84,6 +84,9 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { float turnon_threshold_loose_; float turnon_threshold_medium_; float turnon_threshold_tight_; + float turnon_threshold_offline_loose_; + float turnon_threshold_offline_medium_; + float turnon_threshold_offline_tight_; edm::EDGetTokenT offlineDiscrTokenb_; edm::EDGetTokenT> offlineIPToken_; @@ -227,7 +230,7 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { class PathInfoCollection : public std::vector { public: - PathInfoCollection() : std::vector(){}; + PathInfoCollection() : std::vector() {}; std::vector::iterator find(const std::string& pathName) { return std::find(begin(), end(), pathName); } }; @@ -248,6 +251,9 @@ BTVHLTOfflineSource::BTVHLTOfflineSource(const edm::ParameterSet& iConfig) turnon_threshold_loose_(iConfig.getParameter("turnon_threshold_loose")), turnon_threshold_medium_(iConfig.getParameter("turnon_threshold_medium")), turnon_threshold_tight_(iConfig.getParameter("turnon_threshold_tight")), + turnon_threshold_offline_loose_(iConfig.getParameter("turnon_threshold_offline_loose")), + turnon_threshold_offline_medium_(iConfig.getParameter("turnon_threshold_offline_medium")), + turnon_threshold_offline_tight_(iConfig.getParameter("turnon_threshold_offline_tight")), offlineDiscrTokenb_(consumes(iConfig.getParameter("offlineDiscrLabelb"))), offlineIPToken_(consumes>(iConfig.getParameter("offlineIPLabel"))), @@ -354,7 +360,7 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu iEvent.getByToken(SVTagInfosTokenPf_, jetSVTagsCollPF); - // PF and Calo btagging + // PF btagging if (v.getTriggerType() == "PF" && pfTags.isValid()) { const auto& iter = pfTags->begin(); @@ -384,35 +390,42 @@ void BTVHLTOfflineSource::analyze(const edm::Event& iEvent, const edm::EventSetu v.Discr_turnon_medium.denominator->Fill(Discr_offline); v.Discr_turnon_tight.denominator->Fill(Discr_offline); - v.Pt_turnon_loose.denominator->Fill(Pt_offline); - v.Pt_turnon_medium.denominator->Fill(Pt_offline); - v.Pt_turnon_tight.denominator->Fill(Pt_offline); - - v.Eta_turnon_loose.denominator->Fill(Eta_offline); - v.Eta_turnon_medium.denominator->Fill(Eta_offline); - v.Eta_turnon_tight.denominator->Fill(Eta_offline); - - v.Phi_turnon_loose.denominator->Fill(Phi_offline); - v.Phi_turnon_medium.denominator->Fill(Phi_offline); - v.Phi_turnon_tight.denominator->Fill(Phi_offline); - - if (Discr_online > turnon_threshold_loose_) { + if (Discr_online > turnon_threshold_loose_) v.Discr_turnon_loose.numerator->Fill(Discr_offline); - v.Pt_turnon_loose.numerator->Fill(Pt_offline); - v.Eta_turnon_loose.numerator->Fill(Eta_offline); - v.Phi_turnon_loose.numerator->Fill(Phi_offline); - } - if (Discr_online > turnon_threshold_medium_) { + if (Discr_online > turnon_threshold_medium_) v.Discr_turnon_medium.numerator->Fill(Discr_offline); - v.Pt_turnon_medium.numerator->Fill(Pt_offline); - v.Eta_turnon_medium.numerator->Fill(Eta_offline); - v.Phi_turnon_medium.numerator->Fill(Phi_offline); - } - if (Discr_online > turnon_threshold_tight_) { + if (Discr_online > turnon_threshold_tight_) v.Discr_turnon_tight.numerator->Fill(Discr_offline); - v.Pt_turnon_tight.numerator->Fill(Pt_offline); - v.Eta_turnon_tight.numerator->Fill(Eta_offline); - v.Phi_turnon_tight.numerator->Fill(Phi_offline); + + if (Discr_offline > turnon_threshold_offline_loose_) { + v.Pt_turnon_loose.denominator->Fill(Pt_offline); + v.Eta_turnon_loose.denominator->Fill(Eta_offline); + v.Phi_turnon_loose.denominator->Fill(Phi_offline); + if (Discr_online > turnon_threshold_loose_) { + v.Pt_turnon_loose.numerator->Fill(Pt_offline); + v.Eta_turnon_loose.numerator->Fill(Eta_offline); + v.Phi_turnon_loose.numerator->Fill(Phi_offline); + } + } + if (Discr_offline > turnon_threshold_offline_medium_) { + v.Pt_turnon_medium.denominator->Fill(Pt_offline); + v.Eta_turnon_medium.denominator->Fill(Eta_offline); + v.Phi_turnon_medium.denominator->Fill(Phi_offline); + if (Discr_online > turnon_threshold_medium_) { + v.Pt_turnon_medium.numerator->Fill(Pt_offline); + v.Eta_turnon_medium.numerator->Fill(Eta_offline); + v.Phi_turnon_medium.numerator->Fill(Phi_offline); + } + } + if (Discr_offline > turnon_threshold_offline_tight_) { + v.Pt_turnon_tight.denominator->Fill(Pt_offline); + v.Eta_turnon_tight.denominator->Fill(Eta_offline); + v.Phi_turnon_tight.denominator->Fill(Phi_offline); + if (Discr_online > turnon_threshold_tight_) { + v.Pt_turnon_tight.numerator->Fill(Pt_offline); + v.Eta_turnon_tight.numerator->Fill(Eta_offline); + v.Phi_turnon_tight.numerator->Fill(Phi_offline); + } } break; diff --git a/DQMOffline/Trigger/plugins/DQMGenericTnPClient.cc b/DQMOffline/Trigger/plugins/DQMGenericTnPClient.cc index 95a067b23232b..ff4fc2c6104bc 100644 --- a/DQMOffline/Trigger/plugins/DQMGenericTnPClient.cc +++ b/DQMOffline/Trigger/plugins/DQMGenericTnPClient.cc @@ -26,7 +26,7 @@ class DQMGenericTnPClient : public edm::one::EDAnalyzer& makeEffMonElemFromPassAndFail("LooseTight", newHistName, effHistTitle, pass, fail, ibooker, igetter); } //end loop over trigger pairs - } //end loop over vsVarNames + } //end loop over vsVarNames } //-----Morse------- EgHLTOfflineClient::MonitorElement* EgHLTOfflineClient::makeEffMonElemFromPassAndAll(const std::string& filterName, diff --git a/DQMOffline/Trigger/plugins/JetMETHLTOfflineClient.cc b/DQMOffline/Trigger/plugins/JetMETHLTOfflineClient.cc index afb4783c699fa..9fd98676721fd 100644 --- a/DQMOffline/Trigger/plugins/JetMETHLTOfflineClient.cc +++ b/DQMOffline/Trigger/plugins/JetMETHLTOfflineClient.cc @@ -94,12 +94,12 @@ void JetMETHLTOfflineClient::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGe delete teff; } } // Denominator - } // Loop-l - } // Numerator + } // Loop-l + } // Numerator } // Loop-k - } // fullSubPath - } // fullPath + } // fullSubPath + } // fullPath } #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc b/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc index 88e06473e0450..ffc5b61ed5426 100644 --- a/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc +++ b/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc @@ -477,9 +477,9 @@ void JetMETHLTOfflineSource::fillMEforTriggerNTfired() { const CaloMET met = calometcol->front(); v.getMEhisto_JetPt()->Fill(met.pt()); } //MET trigger is not fired - } // L1 is fired - } // - } // trigger not fired + } // L1 is fired + } // + } // trigger not fired } //------------------------------------------------------------------------// @@ -699,8 +699,8 @@ void JetMETHLTOfflineSource::fillMEforMonAllTrigger(const Event& iEvent, const e hltPyVec.push_back(toc[*kj].py()); } } // matching jet - } // Jet Loop - } // valid calojet collection, with calojet trigger + } // Jet Loop + } // valid calojet collection, with calojet trigger //PFJet trigger if (pfjetColl_.isValid() && (v.getObjectType() == trigger::TriggerJet) && (v.getPath() != "PFJet")) { @@ -746,11 +746,11 @@ void JetMETHLTOfflineSource::fillMEforMonAllTrigger(const Event& iEvent, const e hltPyVec.push_back(toc[*kj].py()); } } // matching jet - } //PFJet loop - } //valid pfjet collection, with pfjet trigger - // - } // hlt matching with l1 - } // jet trigger + } //PFJet loop + } //valid pfjet collection, with pfjet trigger + // + } // hlt matching with l1 + } // jet trigger //------------------------------------------------------ if (calometColl_.isValid() && @@ -787,8 +787,8 @@ void JetMETHLTOfflineSource::fillMEforMonAllTrigger(const Event& iEvent, const e if ((v.getTriggerType() == "DiJet_Trigger")) diJetFire = true; } // Valid hlt trigger object - } // Loop over L1 objects - } // Valid L1 trigger object + } // Loop over L1 objects + } // Valid L1 trigger object v.getMEhisto_N()->Fill(jetsize); //-------------------------------------------------------- @@ -1060,7 +1060,7 @@ void JetMETHLTOfflineSource::fillMEforEffAllTrigger(const Event& iEvent, const e } } } //numpassed - } //CalojetID filter + } //CalojetID filter } if (jetIDbool == true && (v.getTriggerType() == "DiJet_Trigger") && calojet.size() > 1) { diff --git a/DQMOffline/Trigger/plugins/ZGammaplusJetsMonitor.cc b/DQMOffline/Trigger/plugins/ZGammaplusJetsMonitor.cc index fb0421df3207a..a1ee0ef5c6837 100644 --- a/DQMOffline/Trigger/plugins/ZGammaplusJetsMonitor.cc +++ b/DQMOffline/Trigger/plugins/ZGammaplusJetsMonitor.cc @@ -444,7 +444,7 @@ void ZGammaplusJetsMonitor::analyze(edm::Event const& iEvent, edm::EventSetup co trigobj_pt.push_back(Zhltreco.Pt()); trigobj_eta.push_back(Zhltreco.Eta()); trigobj_phi.push_back(Zhltreco.Phi()); - } //end check di-object + } //end check di-object else { //if not di-object return; } @@ -453,7 +453,7 @@ void ZGammaplusJetsMonitor::analyze(edm::Event const& iEvent, edm::EventSetup co } // key1 kCnt0++; } // key - } // end else + } // end else // ---------------- module for Jet leg Jets -------------------------- // index of last module executed in this Path diff --git a/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py index e8067e4d6dd33..3505dda0c4ee0 100644 --- a/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py +++ b/DQMOffline/Trigger/python/BTVHLTOfflineSource_cfi.py @@ -15,9 +15,12 @@ hltPFPVLabel = cms.InputTag("hltVerticesPFSelector"), offlinePVLabel = cms.InputTag("offlinePrimaryVertices"), offlineIPLabel = cms.InputTag("pfImpactParameterTagInfos"), - turnon_threshold_loose = cms.double(0.03), - turnon_threshold_medium = cms.double(0.2), - turnon_threshold_tight = cms.double(0.6), + turnon_threshold_loose = cms.double(0.1), + turnon_threshold_medium = cms.double(0.5), + turnon_threshold_tight = cms.double(0.9), + turnon_threshold_offline_loose = cms.double(0.03), + turnon_threshold_offline_medium = cms.double(0.2), + turnon_threshold_offline_tight = cms.double(0.6), minDecayLength = cms.double(-9999.0), maxDecayLength = cms.double(5.0), minJetDistance = cms.double(0.0), diff --git a/DQMOffline/Trigger/python/DisplacedJet_Monitor_cff.py b/DQMOffline/Trigger/python/DisplacedJet_Monitor_cff.py index 05c86dd087cd3..9959a1795f5a4 100644 --- a/DQMOffline/Trigger/python/DisplacedJet_Monitor_cff.py +++ b/DQMOffline/Trigger/python/DisplacedJet_Monitor_cff.py @@ -6,9 +6,9 @@ from DQMOffline.Trigger.TrackingMonitoring_cff import * DisplacedJetIter2TracksMonitoringHLT = trackingMonHLT.clone( - FolderName = 'HLT/EXO/DisplacedJet/Tracking/iter2MergedForBTag', - TrackProducer = 'hltIter2MergedForBTag', - allTrackProducer = 'hltIter2MergedForBTag', + FolderName = 'HLT/EXO/DisplacedJet/Tracking/iter2ForDisplaced', + TrackProducer = 'hltIter2MergedForDisplaced', + allTrackProducer = 'hltIter2MergedForDisplaced', doEffFromHitPatternVsPU = False, doEffFromHitPatternVsBX = False, doEffFromHitPatternVsLUMI = False diff --git a/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py b/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py index f6354bad83460..08afda0e6be08 100644 --- a/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py +++ b/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py @@ -9,7 +9,7 @@ from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltVerticesMonitoring, TopFolderName = "HLT/Vertexing/hltFullVertices", - vertexLabel = cms.InputTag("offlinePrimaryVertices","","HLT")) + vertexLabel = cms.InputTag("hltOfflinePrimaryVertices")) hltPixelVerticesMonitoring = hltVerticesMonitoring.clone( TopFolderName = "HLT/Vertexing/hltPixelVertices", diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Client_cff.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Client_cff.py index 9fa9351ab0248..75a03b5ec98d7 100644 --- a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Client_cff.py @@ -2,6 +2,7 @@ from DQMOffline.Trigger.SiPixel_OfflineMonitoring_Cluster_cff import * from DQMOffline.Trigger.SiPixel_OfflineMonitoring_TrackCluster_cff import * +from DQMOffline.Trigger.SiPixel_OfflineMonitoring_TrackResiduals_cff import * from DQM.HLTEvF.dqmCorrelationClient_cfi import * pixelClusterVsLumi = dqmCorrelationClient.clone( @@ -51,9 +52,11 @@ pixelTrackClusterVsLumiPXForward.me2.name = "num_clusters_ontrack_per_Lumisection_PXForward" sipixelHarvesterHLTsequence = cms.Sequence( -# hltSiPixelPhase1ClustersHarvester -# + hltSiPixelPhase1TrackClustersHarvester - pixelClusterVsLumiPXBarrel + #hltSiPixelPhase1ClustersHarvester + #+ hltSiPixelPhase1TrackClustersHarvester + hltSiPixelPhase1TrackResidualsHarvester + + hltSiPixelPhase1ResidualsExtra + + pixelClusterVsLumiPXBarrel + pixelClusterVsLumiPXForward # + pixelTrackClusterVsLumiPXBarrel # + pixelTrackClusterVsLumiPXForward diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_HistogramManager_cfi.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_HistogramManager_cfi.py index 1a86814a6c1c3..e65161e9a8590 100644 --- a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_HistogramManager_cfi.py +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_HistogramManager_cfi.py @@ -23,6 +23,10 @@ hltDefaultHistoTrack = DefaultHistoTrack.clone( topFolderName= "HLT/Pixel/TrackClusters" ) +hltDefaultHistoTrackResiduals = DefaultHistoTrack.clone( + topFolderName= "HLT/Pixel/Tracks" +) + hltStandardSpecificationPixelmapProfile = [#produces pixel map with the mean (TProfile) Specification(PerLayer2D) .groupBy("PXBarrel/PXLayer/SignedLadderCoord/SignedModuleCoord") diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackResiduals_cff.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackResiduals_cff.py new file mode 100644 index 0000000000000..c653c326db42c --- /dev/null +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackResiduals_cff.py @@ -0,0 +1,154 @@ +import FWCore.ParameterSet.Config as cms +from DQMServices.Core.DQMEDHarvester import DQMEDHarvester + +from DQMOffline.Trigger.SiPixel_OfflineMonitoring_HistogramManager_cfi import * + +# order is important and it should follow ordering in hltSiPixelPhase1ClustersConf VPSet +hltSiPixelPhase1TrackResidualsResidualsX = hltDefaultHistoTrackResiduals.clone( + name = "residual_x", + title = "Track Residuals X", + range_min = -0.1, range_max = 0.1, range_nbins = 100, + xlabel = "(x_rec - x_pred) [cm]", + dimensions = 1, + specs = VPSet( + StandardSpecification2DProfile, + Specification().groupBy("PXBarrel/PXLayer").saveAll(), + Specification().groupBy("PXForward/PXDisk").saveAll(), + + Specification().groupBy("PXBarrel/PXLayer/LumiBlock") + .reduce("MEAN") + .groupBy("PXBarrel/PXLayer", "EXTEND_X") + .save(), + + Specification().groupBy("PXForward/PXDisk/LumiBlock") + .reduce("MEAN") + .groupBy("PXForward/PXDisk", "EXTEND_X") + .save(), + + Specification(PerLayer1D).groupBy("PXBarrel/Shell/PXLayer").save(), + Specification(PerLayer1D).groupBy("PXForward/HalfCylinder/PXRing/PXDisk").save() + ) +) + +hltSiPixelPhase1TrackResidualsResidualsY = hltSiPixelPhase1TrackResidualsResidualsX.clone( + name = "residual_y", + title = "Track Residuals Y", + xlabel = "(y_rec - y_pred) [cm]", +) + +hltSiPixelPhase1TrackResidualsResOnEdgeX = hltDefaultHistoTrackResiduals.clone( + name = "residual_OnEdge_x", + title = "Track Residuals X (OnEdge Clusters)", + range_min = -0.1, range_max = 0.1, range_nbins = 100, + xlabel = "(x_rec - x_pred) [cm]", + dimensions = 1, + specs = VPSet( + Specification().groupBy("PXBarrel/PXLayer").saveAll(), + Specification().groupBy("PXForward/PXDisk").saveAll(), + Specification(PerLayer1D).groupBy("PXBarrel/Shell/PXLayer").save(), + Specification(PerLayer1D).groupBy("PXForward/HalfCylinder/PXRing/PXDisk").save() + ) +) + +hltSiPixelPhase1TrackResidualsResOnEdgeY = hltSiPixelPhase1TrackResidualsResOnEdgeX.clone( + name = "residual_OnEdge_y", + title = "Track Residuals Y (OnEdge Clusters)", + xlabel = "(y_rec - y_pred) [cm]", +) + + +hltSiPixelPhase1TrackResidualsResOtherBadX = hltDefaultHistoTrackResiduals.clone( + name = "residual_OtherBad_x", + title = "Track Residuals X (OtherBad Clusters)", + range_min = -0.1, range_max = 0.1, range_nbins = 100, + xlabel = "(x_rec - x_pred) [cm]", + dimensions = 1, + specs = VPSet( + Specification().groupBy("PXBarrel/PXLayer").saveAll(), + Specification().groupBy("PXForward/PXDisk").saveAll(), + Specification(PerLayer1D).groupBy("PXBarrel/Shell/PXLayer").save(), + Specification(PerLayer1D).groupBy("PXForward/HalfCylinder/PXRing/PXDisk").save() + ) +) + +hltSiPixelPhase1TrackResidualsResOtherBadY = hltSiPixelPhase1TrackResidualsResOtherBadX.clone( + name = "residual_OtherBad_y", + title = "Track Residuals Y (OtherBad Clusters)", + xlabel = "(y_rec - y_pred) [cm]", +) + + +hltSiPixelPhase1TrackNormResX = hltDefaultHistoTrackResiduals.clone( + topFolderName= cms.string("HLT/Pixel/Tracks/ResidualsExtra"), + name = "NormRes_x", + title = "Normalized Residuals X", + range_min = -5, range_max = 5, range_nbins = 100, + xlabel = "(x_rec - x_pred)/x_err", + dimensions = 1, + specs = VPSet( + Specification().groupBy("PXBarrel/PXLayer").saveAll(), + Specification().groupBy("PXForward/PXDisk").saveAll(), + Specification(PerLayer1D).groupBy("PXBarrel/Shell/PXLayer").save(), + Specification(PerLayer1D).groupBy("PXForward/HalfCylinder/PXRing/PXDisk").save() + ) +) + +hltSiPixelPhase1TrackNormResY = hltSiPixelPhase1TrackNormResX.clone( + name = "NormRes_y", + title = "Normalized Residuals Y", + range_min = -5, range_max = 5, range_nbins = 100, + xlabel = "(y_rec - y_pred)/y_err", +) + +hltSiPixelPhase1TrackDRnRX = hltDefaultHistoTrackResiduals.clone( + topFolderName= cms.string("HLT/Pixel/Tracks/ResidualsExtra"), + name = "DRnR_x", + title = "Distribution of RMS of Normalized Residuals X", + range_min = -5, range_max = 5, range_nbins = 100, + xlabel = "#sigma_{(x_rec - x_pred)/x_err}", + dimensions = 1, + specs = VPSet( + StandardSpecification2DProfile + ) +) + +hltSiPixelPhase1TrackDRnRY = hltSiPixelPhase1TrackDRnRX.clone( + name = "DRnR_y", + title = "Distribution of RMS of Normalized Residuals Y", + range_min = -5, range_max = 5, range_nbins = 100, + xlabel = "#sigma_{(y_rec - y_pred)/y_err}", +) + +hltSiPixelPhase1TrackResidualsConf = cms.VPSet( + hltSiPixelPhase1TrackResidualsResidualsX, + hltSiPixelPhase1TrackResidualsResidualsY, + hltSiPixelPhase1TrackResidualsResOnEdgeX, + hltSiPixelPhase1TrackResidualsResOnEdgeY, + hltSiPixelPhase1TrackResidualsResOtherBadX, + hltSiPixelPhase1TrackResidualsResOtherBadY, + hltSiPixelPhase1TrackNormResX, + hltSiPixelPhase1TrackNormResY, + hltSiPixelPhase1TrackDRnRX, + hltSiPixelPhase1TrackDRnRY +) + +from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer +hltSiPixelPhase1TrackResidualsAnalyzer = DQMEDAnalyzer('SiPixelPhase1TrackResiduals', + trajectoryInput = cms.string("hltrefittedForPixelDQM"), + Tracks = cms.InputTag("hltrefittedForPixelDQM"), + vertices = cms.InputTag("hltPixelVertices"), + histograms = hltSiPixelPhase1TrackResidualsConf, + geometry = hltSiPixelPhase1Geometry, + VertexCut = cms.untracked.bool(True) +) + +hltSiPixelPhase1TrackResidualsHarvester = DQMEDHarvester("SiPixelPhase1Harvester", + histograms = hltSiPixelPhase1TrackResidualsConf, + geometry = hltSiPixelPhase1Geometry +) + +hltSiPixelPhase1ResidualsExtra = DQMEDHarvester("SiPixelPhase1ResidualsExtra", + TopFolderName = cms.string('HLT/Pixel/Tracks/ResidualsExtra'), + InputFolderName = cms.string('HLT/Pixel/Tracks'), + MinHits = cms.int32(30) +) diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py index ecd04eb15e582..0d1904ac471a6 100644 --- a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py @@ -2,6 +2,7 @@ from DQMOffline.Trigger.SiPixel_OfflineMonitoring_Cluster_cff import * from DQMOffline.Trigger.SiPixel_OfflineMonitoring_TrackCluster_cff import * +from DQMOffline.Trigger.SiPixel_OfflineMonitoring_TrackResiduals_cff import * from RecoTracker.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import * from DQM.SiPixelMonitorTrack.RefitterForPixelDQM import * from RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi import * @@ -22,6 +23,7 @@ hltSiPixelClusterShapeCache + hltSiPixelPhase1ClustersAnalyzer + hltrefittedForPixelDQM - + hltSiPixelPhase1TrackClustersAnalyzer, + + hltSiPixelPhase1TrackClustersAnalyzer + + hltSiPixelPhase1TrackResidualsAnalyzer, cms.Task(SiPixelTemplateStoreESProducer) ) diff --git a/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py index 245b70652e468..e78fe6da73def 100644 --- a/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SiTrackerPhase2_OfflineMonitoring_cff.py @@ -4,11 +4,11 @@ HLTclusterMonitorIT = clusterMonitorIT.clone( TopFolderName = cms.string('HLT/TrackerPhase2ITCluster'), - InnerPixelClusterSource = cms.InputTag('siPixelClusters','','HLT'), + InnerPixelClusterSource = cms.InputTag('hltSiPixelClusters'), ) HLTclusterMonitorOT = clusterMonitorOT.clone( TopFolderName = cms.string('HLT/TrackerPhase2OTCluster'), - clusterSrc = cms.InputTag('siPhase2Clusters','','HLT'), + clusterSrc = cms.InputTag('hltSiPhase2Clusters'), ) HLTtrackerphase2DQMSource = cms.Sequence(HLTclusterMonitorIT + diff --git a/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py b/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py index 8c7aacc7b6a6c..bcb8af4d4e612 100644 --- a/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py +++ b/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py @@ -30,8 +30,8 @@ from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltMerged2highPurity, - monitoredTrack = cms.InputTag("generalTracks","","HLT"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredTrack = cms.InputTag("hltGeneralTracks"), + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) hltMerged2highPurityPV = TrackToTrackComparisonHists.clone( dzWRTPvCut = 0.1, @@ -51,8 +51,8 @@ from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker phase2_tracker.toModify(hltMerged2highPurityPV, - monitoredTrack = cms.InputTag("generalTracks","","HLT"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredTrack = cms.InputTag("hltGeneralTracks"), + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) # # E/gamma monitoring @@ -82,11 +82,11 @@ from Configuration.Eras.Modifier_phase2_common_cff import phase2_common phase2_common.toModify(hltEgammaGsfTracksVsOffline, monitoredTrack = cms.InputTag("hltEgammaGsfTracksL1Seeded"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) phase2_common.toModify(hltEgammaGsfTracksVsOfflinePV, monitoredTrack = cms.InputTag("hltEgammaGsfTracksL1Seeded"), - monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT")) + monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices")) hltToOfflineTrackValidatorSequence = cms.Sequence( cms.ignore(highPurityTracks) diff --git a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py index 49df998fa33f2..eb779d8bc27dc 100644 --- a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py +++ b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py @@ -115,8 +115,8 @@ phase2_tracker.toModify(iterHLTTracksMonitoringHLT, primaryVertex = 'hltPhase2PixelVertices', - TrackProducer = 'generalTracks::HLT', - allTrackProducer = 'generalTracks::HLT') + TrackProducer = 'hltGeneralTracks', + allTrackProducer = 'hltGeneralTracks') iter3TracksMonitoringHLT = trackingMonHLT.clone( FolderName = 'HLT/Tracking/iter3Merged', diff --git a/DQMOffline/Trigger/src/EgHLTEleHLTFilterMon.cc b/DQMOffline/Trigger/src/EgHLTEleHLTFilterMon.cc index 99e95ad4e32fd..54edc9f16824f 100644 --- a/DQMOffline/Trigger/src/EgHLTEleHLTFilterMon.cc +++ b/DQMOffline/Trigger/src/EgHLTEleHLTFilterMon.cc @@ -171,6 +171,6 @@ void EleHLTFilterMon::fill(const OffEvt& evt, float weight) { } } } //end inner ele loop - } //end outer ele loop - } //end check if filter is present + } //end outer ele loop + } //end check if filter is present } diff --git a/DQMOffline/Trigger/src/EgHLTPhoHLTFilterMon.cc b/DQMOffline/Trigger/src/EgHLTPhoHLTFilterMon.cc index 68d8e972a134e..affde347f3b4f 100644 --- a/DQMOffline/Trigger/src/EgHLTPhoHLTFilterMon.cc +++ b/DQMOffline/Trigger/src/EgHLTPhoHLTFilterMon.cc @@ -145,6 +145,6 @@ void PhoHLTFilterMon::fill(const OffEvt& evt, float weight) { } } } //end inner pho loop - } //end outer pho loop - } //end check if filter is present + } //end outer pho loop + } //end check if filter is present } diff --git a/DQMOffline/Trigger/src/EgHLTTrigTools.cc b/DQMOffline/Trigger/src/EgHLTTrigTools.cc index 6ff5a7a880f30..d7469b0d02d70 100644 --- a/DQMOffline/Trigger/src/EgHLTTrigTools.cc +++ b/DQMOffline/Trigger/src/EgHLTTrigTools.cc @@ -21,7 +21,7 @@ TrigCodes::TrigBitSet trigTools::getFiltersPassed(const std::vector, void globalEndRun(edm::Run const&, const edm::EventSetup&) override; void endRunProduce(edm::Run&, const edm::EventSetup&) override; void endLuminosityBlockProduce(edm::LuminosityBlock&, const edm::EventSetup&) override; - void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override{}; + void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {} std::shared_ptr globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override; diff --git a/DQMServices/Core/interface/DQMEDHarvester.h b/DQMServices/Core/interface/DQMEDHarvester.h index ab6a2ed9b7f76..d07883a9de2c9 100644 --- a/DQMServices/Core/interface/DQMEDHarvester.h +++ b/DQMServices/Core/interface/DQMEDHarvester.h @@ -95,9 +95,9 @@ class DQMEDHarvester }); }; - DQMEDHarvester() : DQMEDHarvester(edm::ParameterSet()){}; + DQMEDHarvester() : DQMEDHarvester(edm::ParameterSet()) {} - void beginJob() override{}; + void beginJob() override {} void beginRun(edm::Run const &run, edm::EventSetup const &) override { // According to edm experts, it is never save to look at run products @@ -129,7 +129,7 @@ class DQMEDHarvester lumi.put(lumiToken_, std::make_unique()); } - void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) final{}; + void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) final {} void endRunProduce(edm::Run &run, edm::EventSetup const &es) final { dqmstore_->meBookerGetter([this, &run, &es](DQMStore::IBooker &b, DQMStore::IGetter &g) { @@ -140,7 +140,7 @@ class DQMEDHarvester run.put(runToken_, std::make_unique()); } - void endRun(edm::Run const &, edm::EventSetup const &) override{}; + void endRun(edm::Run const &, edm::EventSetup const &) override {} void endProcessBlockProduce(edm::ProcessBlock &) final { dqmstore_->meBookerGetter([this](DQMStore::IBooker &b, DQMStore::IGetter &g) { @@ -154,15 +154,15 @@ class DQMEDHarvester // DQM_EXPERIMENTAL // Could be used for niche workflows like commissioning. // Real harvesting jobs have no events and will never call this. - virtual void dqmAnalyze(DQMStore::IBooker &, DQMStore::IGetter &, edm::Event const &, edm::EventSetup const &){}; + virtual void dqmAnalyze(DQMStore::IBooker &, DQMStore::IGetter &, edm::Event const &, edm::EventSetup const &) {} virtual void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, - edm::EventSetup const &){}; + edm::EventSetup const &) {}; // HARVESTING should happen in endJob (or endLumi, for online), but there can // be applications for end-run harvesting. Better to have a callback than // have unprotected DQMStore access. - virtual void dqmEndRun(DQMStore::IBooker &, DQMStore::IGetter &, edm::Run const &, edm::EventSetup const &){}; + virtual void dqmEndRun(DQMStore::IBooker &, DQMStore::IGetter &, edm::Run const &, edm::EventSetup const &) {} virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) = 0; }; diff --git a/DQMServices/Core/interface/DQMGlobalEDAnalyzer.h b/DQMServices/Core/interface/DQMGlobalEDAnalyzer.h index fa8b4a45f44c4..4287c2b6f8c8a 100644 --- a/DQMServices/Core/interface/DQMGlobalEDAnalyzer.h +++ b/DQMServices/Core/interface/DQMGlobalEDAnalyzer.h @@ -57,7 +57,7 @@ class DQMGlobalEDAnalyzerBase // Subsystems could safely override this, but any changes to MEs would not be // noticeable since the product was made already. - void globalEndRun(edm::Run const&, edm::EventSetup const&) const final{}; + void globalEndRun(edm::Run const&, edm::EventSetup const&) const final {} // methods to be implemented by the user, in order of invocation virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&, H&) const {} diff --git a/DQMServices/Core/interface/DQMOneEDAnalyzer.h b/DQMServices/Core/interface/DQMOneEDAnalyzer.h index 5b2fe4ab836ae..9a07a61b9da7a 100644 --- a/DQMServices/Core/interface/DQMOneEDAnalyzer.h +++ b/DQMServices/Core/interface/DQMOneEDAnalyzer.h @@ -66,7 +66,7 @@ class DQMOneEDAnalyzer // Subsystems could safely override this, but any changes to MEs would not be // noticeable since the product was made already. - void endRun(edm::Run const&, edm::EventSetup const&) final{}; + void endRun(edm::Run const&, edm::EventSetup const&) final {} protected: // methods to be implemented by the user, in order of invocation @@ -116,7 +116,7 @@ class DQMOneLumiEDAnalyzer // Subsystems could safely override this, but any changes to MEs would not be // noticeable since the product was made already. - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) final{}; + void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) final {} protected: // methods to be implemented by the user, in order of invocation diff --git a/DQMServices/Core/interface/LegacyIOHelper.h b/DQMServices/Core/interface/LegacyIOHelper.h index 9e1ae4b506df4..b54e22c59dc02 100644 --- a/DQMServices/Core/interface/LegacyIOHelper.h +++ b/DQMServices/Core/interface/LegacyIOHelper.h @@ -23,8 +23,8 @@ class LegacyIOHelper { using MEMap = std::set; - LegacyIOHelper(DQMStore* dqmstore) : dbe_(dqmstore){}; - LegacyIOHelper(HarvestedDQMStore* hdqmstore) : dbe_(hdqmstore){}; + LegacyIOHelper(DQMStore* dqmstore) : dbe_(dqmstore) {} + LegacyIOHelper(HarvestedDQMStore* hdqmstore) : dbe_(hdqmstore) {} // Replace or append to `filename`, a TDirectory ROOT file. If a run number // is passed, the paths are rewritten to the "Run Summary" format used by // DQMGUI. The run number does not affect which MEs are saved; this code only diff --git a/DQMServices/Core/src/DQMNet.cc b/DQMServices/Core/src/DQMNet.cc index 5586209255c35..396db6f8bfac9 100644 --- a/DQMServices/Core/src/DQMNet.cc +++ b/DQMServices/Core/src/DQMNet.cc @@ -38,7 +38,7 @@ namespace dqm { static const int STATUS_OK = 100; //< Test was succesful. static const int WARNING = 200; //< Test had some problems. static const int ERROR = 300; //< Test has failed. - } // namespace qstatus + } // namespace qstatus } // namespace dqm ////////////////////////////////////////////////////////////////////// diff --git a/DQMServices/Core/src/QTest.cc b/DQMServices/Core/src/QTest.cc index 3a30a6c3ab785..df2f43930b668 100644 --- a/DQMServices/Core/src/QTest.cc +++ b/DQMServices/Core/src/QTest.cc @@ -358,7 +358,7 @@ float NoisyChannel::runTest(const MonitorElement* me) { badChannels_.push_back(chan); } } //end x loop - } //end y loop + } //end y loop // return fraction of bins that passed test return 1. * ((nbinsX * nbinsY) - fail) / (nbinsX * nbinsY); } //end nullptr conditional diff --git a/DQMServices/Demo/test/TestDQMEDAnalyzer.cc b/DQMServices/Demo/test/TestDQMEDAnalyzer.cc index c117297bc4d64..1d6e53982485f 100644 --- a/DQMServices/Demo/test/TestDQMEDAnalyzer.cc +++ b/DQMServices/Demo/test/TestDQMEDAnalyzer.cc @@ -13,7 +13,7 @@ class BookerFiller { this->folder = folder; } - BookerFiller(){}; + BookerFiller() {} void bookall(BOOKERLIKE& ibooker) { mes_1D.clear(); @@ -95,7 +95,7 @@ class TestDQMEDAnalyzer : public DQMEDAnalyzer { : mymes_(iConfig.getParameter("folder"), iConfig.getParameter("howmany")), myvalue_(iConfig.getParameter("value")) {} - ~TestDQMEDAnalyzer() override{}; + ~TestDQMEDAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -126,7 +126,7 @@ class TestDQMOneEDAnalyzer : public DQMOneEDAnalyzer<> { : mymes_(iConfig.getParameter("folder"), iConfig.getParameter("howmany")), myvalue_(iConfig.getParameter("value")) {} - ~TestDQMOneEDAnalyzer() override{}; + ~TestDQMOneEDAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -156,7 +156,7 @@ class TestDQMOneFillRunEDAnalyzer : public DQMOneEDAnalyzer<> { : mymes_(iConfig.getParameter("folder"), iConfig.getParameter("howmany")), myvalue_(iConfig.getParameter("value")) {} - ~TestDQMOneFillRunEDAnalyzer() override{}; + ~TestDQMOneFillRunEDAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -185,7 +185,7 @@ class TestDQMOneLumiEDAnalyzer : public DQMOneLumiEDAnalyzer<> { : mymes_(iConfig.getParameter("folder"), iConfig.getParameter("howmany")), myvalue_(iConfig.getParameter("value")) {} - ~TestDQMOneLumiEDAnalyzer() override{}; + ~TestDQMOneLumiEDAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -215,7 +215,7 @@ class TestDQMOneLumiFillLumiEDAnalyzer : public DQMOneLumiEDAnalyzer<> { : mymes_(iConfig.getParameter("folder"), iConfig.getParameter("howmany")), myvalue_(iConfig.getParameter("value")) {} - ~TestDQMOneLumiFillLumiEDAnalyzer() override{}; + ~TestDQMOneLumiFillLumiEDAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -249,7 +249,7 @@ class TestDQMGlobalEDAnalyzer : public DQMGlobalEDAnalyzer { : folder_(iConfig.getParameter("folder")), howmany_(iConfig.getParameter("howmany")), myvalue_(iConfig.getParameter("value")) {} - ~TestDQMGlobalEDAnalyzer() override{}; + ~TestDQMGlobalEDAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -286,7 +286,7 @@ class TestDQMGlobalRunSummaryEDAnalyzer : public DQMGlobalRunSummaryEDAnalyzer("folder")), howmany_(iConfig.getParameter("howmany")), myvalue_(iConfig.getParameter("value")) {} - ~TestDQMGlobalRunSummaryEDAnalyzer() override{}; + ~TestDQMGlobalRunSummaryEDAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -344,7 +344,7 @@ class TestLegacyEDAnalyzer : public edm::one::EDAnalyzer("value"); } - ~TH1FFiller() override{}; + ~TH1FFiller() override {} void reset() override { m_element->Reset(); } void fill() override { m_element->Fill(m_valueToFill); } @@ -90,7 +90,7 @@ namespace { m_valueToFill = iPSet.getUntrackedParameter("value"); } - ~TH2FFiller() override{}; + ~TH2FFiller() override {} void reset() override { m_element->Reset(); } void fill() override { m_element->Fill(m_valueToFill, m_valueToFill); } diff --git a/DQMServices/StreamerIO/plugins/DQMProtobufReader.cc b/DQMServices/StreamerIO/plugins/DQMProtobufReader.cc index 3e761778d60b4..22f8474fcdc24 100644 --- a/DQMServices/StreamerIO/plugins/DQMProtobufReader.cc +++ b/DQMServices/StreamerIO/plugins/DQMProtobufReader.cc @@ -281,7 +281,7 @@ void DQMProtobufReader::load(DQMStore* store, std::string filename) { } } -void DQMProtobufReader::readEvent_(edm::EventPrincipal&){}; +void DQMProtobufReader::readEvent_(edm::EventPrincipal&) {} void DQMProtobufReader::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; diff --git a/DQMServices/StreamerIO/test/DQMStreamerOutputRepackerTest.cc b/DQMServices/StreamerIO/test/DQMStreamerOutputRepackerTest.cc index 48723ec412ddc..6800784e6daed 100644 --- a/DQMServices/StreamerIO/test/DQMStreamerOutputRepackerTest.cc +++ b/DQMServices/StreamerIO/test/DQMStreamerOutputRepackerTest.cc @@ -40,8 +40,8 @@ namespace dqmservices { void doOutputHeader(InitMsgBuilder const& init_message) override; void doOutputEvent(EventMsgBuilder const& msg) override; - void beginLuminosityBlock(edm::LuminosityBlockForOutput const&) override{}; - void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override{}; + void beginLuminosityBlock(edm::LuminosityBlockForOutput const&) override {} + void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override {} private: void openFile_(uint32_t run, uint32_t lumi); diff --git a/DataFormats/BTauReco/interface/CombinedTauTagInfo.h b/DataFormats/BTauReco/interface/CombinedTauTagInfo.h index 1ed5b6d032f04..f8036dcb43146 100644 --- a/DataFormats/BTauReco/interface/CombinedTauTagInfo.h +++ b/DataFormats/BTauReco/interface/CombinedTauTagInfo.h @@ -52,7 +52,7 @@ namespace reco { theECALEt_o_leadTkPt = NAN; theHCALEt_o_leadTkPt = NAN; } - ~CombinedTauTagInfo() override{}; + ~CombinedTauTagInfo() override {} // float discriminator() returns 0. if candidate did not pass tracker selection, // 1. if candidate passed tracker selection and did not contain neutral ECAL clus., diff --git a/DataFormats/BTauReco/interface/VertexTypes.h b/DataFormats/BTauReco/interface/VertexTypes.h index cd9e18be8e1b2..6c3846caedd7a 100644 --- a/DataFormats/BTauReco/interface/VertexTypes.h +++ b/DataFormats/BTauReco/interface/VertexTypes.h @@ -24,7 +24,7 @@ namespace reco { std::string name(VertexType); VertexType type(const std::string&); } // namespace Vertices - } // namespace btag + } // namespace btag } // namespace reco #endif diff --git a/DataFormats/BTauReco/src/classes_def.xml b/DataFormats/BTauReco/src/classes_def.xml index f772ee0ff4fcc..f5f697a7a2c98 100644 --- a/DataFormats/BTauReco/src/classes_def.xml +++ b/DataFormats/BTauReco/src/classes_def.xml @@ -392,7 +392,7 @@ - + diff --git a/DataFormats/CSCDigi/test/testCSCDigis.cpp b/DataFormats/CSCDigi/test/testCSCDigis.cpp index 40c75d34ae363..47bcd61037329 100644 --- a/DataFormats/CSCDigi/test/testCSCDigis.cpp +++ b/DataFormats/CSCDigi/test/testCSCDigis.cpp @@ -434,7 +434,7 @@ void testCSCDigis::readCSCWireDigi(CSCWireDigiCollection &collection) { std::cout << std::endl; std::cout << " CSC Wire Word with Time Bins Bits On " << (*digiIt).getTimeBinWord() << std::endl; } // for digis in layer - } // end of for (detUnitIt=... + } // end of for (detUnitIt=... printf("CSC Wire count: %3d \n", count); } @@ -468,7 +468,7 @@ void testCSCDigis::readCSCComparatorDigi(CSCComparatorDigiCollection &collection std::cout << std::endl; } // for digis in layer - } // end of for (detUnitIt=... + } // end of for (detUnitIt=... printf("CSCComparatorDigi count: %3d \n", count); } @@ -503,7 +503,7 @@ void testCSCDigis::readCSCStripDigi(CSCStripDigiCollection &collection) { (*digiIt).getADCCounts()[7]); } // for digis in layer - } // end of for (detUnitIt=... + } // end of for (detUnitIt=... printf("CSC Strip count: %3d \n", count); } @@ -530,7 +530,7 @@ void testCSCDigis::readCSCRPCDigi(CSCRPCDigiCollection &collection) { (*digiIt).getBXN()); } // for digis in layer - } // end of for (detUnitIt=... + } // end of for (detUnitIt=... printf("RPC count: %3d \n", count); } @@ -568,7 +568,7 @@ void testCSCDigis::readCSCALCTDigi(CSCALCTDigiCollection &collection) { (*digiIt).getBX(), (*digiIt).getTrknmb()); } // for digis in layer - } // end of for (detUnitIt=... + } // end of for (detUnitIt=... printf("CSC ALCT count: %3d \n", count); } @@ -610,7 +610,7 @@ void testCSCDigis::readCSCCLCTDigi(CSCCLCTDigiCollection &collection) { (*digiIt).getTrknmb()); } // for digis in layer - } // end of for (detUnitIt=... + } // end of for (detUnitIt=... printf("CSC CLCT count: %3d \n", count); } @@ -658,7 +658,7 @@ void testCSCDigis::readCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection &collection std::cout< - + @@ -24,7 +24,7 @@ - + diff --git a/DataFormats/CTPPSDigi/interface/CTPPSDiamondDigi.h b/DataFormats/CTPPSDigi/interface/CTPPSDiamondDigi.h index 8c3a931d73711..ae554c5ec6105 100644 --- a/DataFormats/CTPPSDigi/interface/CTPPSDiamondDigi.h +++ b/DataFormats/CTPPSDigi/interface/CTPPSDiamondDigi.h @@ -18,7 +18,7 @@ class CTPPSDiamondDigi { CTPPSDiamondDigi( unsigned int ledgt_, unsigned int tedgt_, unsigned int threvolt, bool mhit_, unsigned short hptdcerror_); CTPPSDiamondDigi(); - ~CTPPSDiamondDigi(){}; + ~CTPPSDiamondDigi() {} /// Digis are equal if they are have same ledt and tedt, threshold voltage, multihit flag, hptdcerror flags bool operator==(const CTPPSDiamondDigi& digi) const; diff --git a/DataFormats/CTPPSDigi/interface/TotemRPDigi.h b/DataFormats/CTPPSDigi/interface/TotemRPDigi.h index 40729f5e7a414..4daf60af5c44e 100644 --- a/DataFormats/CTPPSDigi/interface/TotemRPDigi.h +++ b/DataFormats/CTPPSDigi/interface/TotemRPDigi.h @@ -15,7 +15,7 @@ **/ class TotemRPDigi { public: - TotemRPDigi(unsigned short strip_no = 0) : strip_no_(strip_no){}; + TotemRPDigi(unsigned short strip_no = 0) : strip_no_(strip_no) {} unsigned short stripNumber() const { return strip_no_; } diff --git a/DataFormats/Candidate/interface/Candidate.h b/DataFormats/Candidate/interface/Candidate.h index 748ed7bd6a966..baa17ae7164d7 100644 --- a/DataFormats/Candidate/interface/Candidate.h +++ b/DataFormats/Candidate/interface/Candidate.h @@ -50,7 +50,7 @@ namespace reco { typedef unsigned int index; /// default constructor - Candidate(){}; + Candidate() {} /// destructor virtual ~Candidate(); /// electric charge @@ -176,7 +176,7 @@ namespace reco { /// this function can be used to set the ptr to the source of the /// Candidate, which will allow to keep track /// of the reconstruction history. - virtual void setSourceCandidatePtr(const CandidatePtr& ptr){}; + virtual void setSourceCandidatePtr(const CandidatePtr& ptr) {} /// chi-squares virtual double vertexChi2() const = 0; diff --git a/DataFormats/Candidate/src/classes_def.xml b/DataFormats/Candidate/src/classes_def.xml index 8b40654e3589f..d03784321be05 100644 --- a/DataFormats/Candidate/src/classes_def.xml +++ b/DataFormats/Candidate/src/classes_def.xml @@ -203,8 +203,8 @@ - - + + diff --git a/DataFormats/Common/interface/DetSetVectorNew.h b/DataFormats/Common/interface/DetSetVectorNew.h index 041098a000b9f..02f5cb1dba9ea 100644 --- a/DataFormats/Common/interface/DetSetVectorNew.h +++ b/DataFormats/Common/interface/DetSetVectorNew.h @@ -690,7 +690,7 @@ namespace edm { typedef FindSetForNewDetSetVector value; }; } // namespace refhelper - /* ... implementation is provided, just in case it's needed */ + /* ... implementation is provided, just in case it's needed */ } // namespace edm namespace edmNew { diff --git a/DataFormats/Common/interface/ELseverityLevel.h b/DataFormats/Common/interface/ELseverityLevel.h index 012b4124259a0..87efd7a71e1d1 100644 --- a/DataFormats/Common/interface/ELseverityLevel.h +++ b/DataFormats/Common/interface/ELseverityLevel.h @@ -41,7 +41,7 @@ namespace edm { ELsev_highestSeverity, // threshold use only // ----- nLevels // how many levels? - }; // ELsev_ + }; // ELsev_ // ----- Birth/death: // diff --git a/DataFormats/Common/interface/Ptr.h b/DataFormats/Common/interface/Ptr.h index 09b819220b229..f106ee148e7c5 100644 --- a/DataFormats/Common/interface/Ptr.h +++ b/DataFormats/Common/interface/Ptr.h @@ -109,7 +109,8 @@ namespace edm { Ptr() : core_(), key_(key_traits::value) {} template - Ptr(Ptr const& iOther, std::enable_if_t::value>* = nullptr) + requires std::is_base_of_v + Ptr(Ptr const& iOther) : core_(iOther.id(), (iOther.hasProductCache() ? static_cast(iOther.get()) : static_cast(nullptr)), iOther.productGetter(), @@ -123,7 +124,8 @@ namespace edm { } template - explicit Ptr(Ptr const& iOther, std::enable_if_t::value>* = nullptr) + requires std::is_base_of_v + explicit Ptr(Ptr const& iOther) : core_(iOther.id(), dynamic_cast(iOther.get()), nullptr, iOther.isTransient()), key_(iOther.key()) {} /// Destructor diff --git a/DataFormats/Common/interface/PtrVector.h b/DataFormats/Common/interface/PtrVector.h index 0d414ee1451af..fd878baa173e7 100644 --- a/DataFormats/Common/interface/PtrVector.h +++ b/DataFormats/Common/interface/PtrVector.h @@ -65,7 +65,7 @@ namespace edm { Ptr const operator[](difference_type n) const { // Otherwise the return base_->fromItr(iter_ + n); // boost::range - } // doesn't have [] + } // doesn't have [] PtrHolder operator->() const { return PtrHolder(this->operator*()); } diff --git a/DataFormats/Common/interface/Ref.h b/DataFormats/Common/interface/Ref.h index 396fcea17a66b..8ba258f8bfe6b 100644 --- a/DataFormats/Common/interface/Ref.h +++ b/DataFormats/Common/interface/Ref.h @@ -120,15 +120,9 @@ Ref: A template for a interproduct reference to a member of a product_. #include "DataFormats/Common/interface/RefTraits.h" namespace edm { - //Use SFINAE to test for embedded type with name key_compare - template - struct has_key_compare : std::false_type {}; - template - struct has_key_compare> : std::true_type {}; - template bool compare_key(K const& lhs, K const& rhs) { - if constexpr (has_key_compare::value) { + if constexpr (requires { typename C::key_compare; }) { using comparison_functor = typename C::key_compare; return comparison_functor()(lhs, rhs); } else { diff --git a/DataFormats/Common/interface/RefToBase.h b/DataFormats/Common/interface/RefToBase.h index d12434a65b4a7..d6b57bbc8e429 100644 --- a/DataFormats/Common/interface/RefToBase.h +++ b/DataFormats/Common/interface/RefToBase.h @@ -99,6 +99,11 @@ namespace edm { size_t key() const; template + requires requires { + typename REF::value_type; + requires std::is_same_v or std::is_base_of_v or + std::is_base_of_v; + } REF castTo() const; bool isNull() const; @@ -228,34 +233,13 @@ namespace edm { return holder_->key(); } - namespace { - // If the template parameters are classes or structs they should be - // related by inheritance, otherwise they should be the same type. - template - typename std::enable_if::value>::type checkTypeCompatibility() { - static_assert(std::is_base_of::value || std::is_base_of::value, - "RefToBase::castTo error element types are not related by inheritance"); - } - - template - typename std::enable_if::value>::type checkTypeCompatibility() { - static_assert(std::is_same::value, "RefToBase::castTo error non-class element types are not the same"); - } - - // Convert the pointer types, use dynamic_cast if they are classes - template - typename std::enable_if::value, OUT const*>::type convertTo(T const* t) { - return dynamic_cast(t); - } - - template - typename std::enable_if::value, OUT const*>::type convertTo(T const* t) { - return t; - } - } // namespace - template template + requires requires { + typename REF::value_type; + requires std::is_same_v or std::is_base_of_v or + std::is_base_of_v; + } REF RefToBase::castTo() const { if (!holder_) { Exception::throwThis(errors::InvalidReference, @@ -263,8 +247,6 @@ namespace edm { "You should check for nullity before casting."); } - checkTypeCompatibility(); - // If REF is type edm::Ref, then it is impossible to // check the container type C here. We just have to assume // that the caller provided the correct type. @@ -278,7 +260,12 @@ namespace edm { if (value == nullptr) { return REF(id()); } - typename REF::value_type const* newValue = convertTo(value); + typename REF::value_type const* newValue; + if constexpr (std::is_same_v or std::is_base_of_v) { + newValue = value; + } else { + newValue = dynamic_cast(value); + } if (newValue) { return REF(id(), newValue, key(), isTransient()); } diff --git a/DataFormats/Common/interface/Wrapper.h b/DataFormats/Common/interface/Wrapper.h index c387d6e13adb3..97d193779dcf9 100644 --- a/DataFormats/Common/interface/Wrapper.h +++ b/DataFormats/Common/interface/Wrapper.h @@ -108,38 +108,55 @@ namespace edm { template inline bool Wrapper::isMergeable_() const { - return detail::getHasMergeFunction()(); + if constexpr (requires(T& a, T const& b) { a.mergeProduct(b); }) { + return true; + } + return false; } template inline bool Wrapper::mergeProduct_(WrapperBase const* newProduct) { Wrapper const* wrappedNewProduct = dynamic_cast const*>(newProduct); assert(wrappedNewProduct != nullptr); - return detail::doMergeProduct()(obj, wrappedNewProduct->obj); + if constexpr (requires(T& a, T const& b) { a.mergeProduct(b); }) { + return obj.mergeProduct(wrappedNewProduct->obj); + } + return true; } template inline bool Wrapper::hasIsProductEqual_() const { - return detail::getHasIsProductEqual()(); + if constexpr (requires(T& a, T const& b) { a.isProductEqual(b); }) { + return true; + } + return false; } template inline bool Wrapper::isProductEqual_(WrapperBase const* newProduct) const { Wrapper const* wrappedNewProduct = dynamic_cast const*>(newProduct); assert(wrappedNewProduct != nullptr); - return detail::doIsProductEqual()(obj, wrappedNewProduct->obj); + if constexpr (requires(T& a, T const& b) { a.isProductEqual(b); }) { + return obj.isProductEqual(wrappedNewProduct->obj); + } + return true; } template inline bool Wrapper::hasSwap_() const { - return detail::getHasSwapFunction()(); + if constexpr (requires(T& a, T& b) { a.swap(b); }) { + return true; + } + return false; } template inline void Wrapper::swapProduct_(WrapperBase* newProduct) { Wrapper* wrappedNewProduct = dynamic_cast*>(newProduct); assert(wrappedNewProduct != nullptr); - detail::doSwapProduct()(obj, wrappedNewProduct->obj); + if constexpr (requires(T& a, T& b) { a.swap(b); }) { + obj.swap(wrappedNewProduct->obj); + } } namespace soa { diff --git a/DataFormats/Common/interface/WrapperDetail.h b/DataFormats/Common/interface/WrapperDetail.h index 2a64d26b49930..e58bbf8ac7622 100644 --- a/DataFormats/Common/interface/WrapperDetail.h +++ b/DataFormats/Common/interface/WrapperDetail.h @@ -86,119 +86,6 @@ namespace edm { std::type_info const& operator()() { return typeid(T); } }; - // bool isMergeable_() will return true if T::mergeProduct(T const&) is declared and false otherwise - // bool mergeProduct_(WrapperBase const*) will merge products if T::mergeProduct(T const&) is defined - // Definitions for the following struct and function templates are not needed; we only require the declarations. - template - struct mergeProduct_function; - template - static yes_tag has_mergeProduct(mergeProduct_function* dummy); - template - static no_tag has_mergeProduct(...); - - template - struct has_mergeProduct_function { - static constexpr bool value = std::is_same(nullptr)), yes_tag>::value; - }; - - template ::value> - struct getHasMergeFunction; - template - struct getHasMergeFunction { - bool operator()() { return true; } - }; - template - struct getHasMergeFunction { - bool operator()() { return false; } - }; - template ::value> - struct doMergeProduct; - template - struct doMergeProduct { - bool operator()(T& thisProduct, T const& newProduct) { return thisProduct.mergeProduct(newProduct); } - }; - template - struct doMergeProduct { - bool operator()(T& thisProduct, T const& newProduct) { - return true; // Should never be called - } - }; - - // bool hasIsProductEqual_() will return true if T::isProductEqual(T const&) const is declared and false otherwise - // bool isProductEqual _(WrapperBase const*) will call T::isProductEqual(T const&) if it is defined - // Definitions for the following struct and function templates are not needed; we only require the declarations. - template - struct isProductEqual_function; - template - static yes_tag has_isProductEqual(isProductEqual_function* dummy); - template - static no_tag has_isProductEqual(...); - - template - struct has_isProductEqual_function { - static constexpr bool value = std::is_same(nullptr)), yes_tag>::value; - }; - - template ::value> - struct getHasIsProductEqual; - template - struct getHasIsProductEqual { - bool operator()() { return true; } - }; - template - struct getHasIsProductEqual { - bool operator()() { return false; } - }; - template ::value> - struct doIsProductEqual; - template - struct doIsProductEqual { - bool operator()(T const& thisProduct, T const& newProduct) { return thisProduct.isProductEqual(newProduct); } - }; - template - struct doIsProductEqual { - bool operator()(T const& thisProduct, T const& newProduct) { - return true; // Should never be called - } - }; - - // bool hasSwap_() will return true if T::swap(T&) is declared and false otherwise - // void swapProduct_() will call T::swap(T&) if it is defined otherwise it does nothing - // Definitions for the following struct and function templates are not needed; we only require the declarations. - template - struct swap_function; - template - static yes_tag has_swap(swap_function* dummy); - template - static no_tag has_swap(...); - - template - struct has_swap_function { - static constexpr bool value = std::is_same(nullptr)), yes_tag>::value; - }; - - template ::value> - struct getHasSwapFunction; - template - struct getHasSwapFunction { - bool operator()() { return true; } - }; - template - struct getHasSwapFunction { - bool operator()() { return false; } - }; - template ::value> - struct doSwapProduct; - template - struct doSwapProduct { - void operator()(T& thisProduct, T& newProduct) { thisProduct.swap(newProduct); } - }; - template - struct doSwapProduct { - void operator()(T&, T&) { - return; // Should never be called - } - }; } // namespace detail } // namespace edm #endif diff --git a/DataFormats/Common/src/classes_def.xml b/DataFormats/Common/src/classes_def.xml index 2c963c6f49f1f..c56ef3e094bf2 100644 --- a/DataFormats/Common/src/classes_def.xml +++ b/DataFormats/Common/src/classes_def.xml @@ -8,7 +8,7 @@ - + @@ -20,7 +20,7 @@ edm::refcoreimpl::setCacheIsProductGetter(cachePtr_, getter); ]]> - + diff --git a/DataFormats/Common/test/BuildFile.xml b/DataFormats/Common/test/BuildFile.xml index 37e5d74046467..82abdee08a756 100644 --- a/DataFormats/Common/test/BuildFile.xml +++ b/DataFormats/Common/test/BuildFile.xml @@ -11,10 +11,10 @@ - + - + diff --git a/DataFormats/Common/test/Wrapper_t.cpp b/DataFormats/Common/test/Wrapper_t.cpp index 2972278a0b764..53de087741a9b 100644 --- a/DataFormats/Common/test/Wrapper_t.cpp +++ b/DataFormats/Common/test/Wrapper_t.cpp @@ -14,11 +14,8 @@ class CopyNoMove { public: CopyNoMove() {} - CopyNoMove(CopyNoMove const&) { /* std::cout << "copied\n"; */ - } - CopyNoMove& operator=(CopyNoMove const&) { /*std::cout << "assigned\n";*/ - return *this; - } + CopyNoMove(CopyNoMove const&) { /* std::cout << "copied\n"; */ } + CopyNoMove& operator=(CopyNoMove const&) { /*std::cout << "assigned\n";*/ return *this; } private: }; @@ -28,11 +25,8 @@ class MoveNoCopy { MoveNoCopy() {} MoveNoCopy(MoveNoCopy const&) = delete; MoveNoCopy& operator=(MoveNoCopy const&) = delete; - MoveNoCopy(MoveNoCopy&&) { /* std::cout << "moved\n";*/ - } - MoveNoCopy& operator=(MoveNoCopy&&) { /* std::cout << "moved\n";*/ - return *this; - } + MoveNoCopy(MoveNoCopy&&) { /* std::cout << "moved\n";*/ } + MoveNoCopy& operator=(MoveNoCopy&&) { /* std::cout << "moved\n";*/ return *this; } private: }; diff --git a/DataFormats/Common/test/ptr_t.cppunit.cc b/DataFormats/Common/test/ptr_t.cppunit.cc index c0a8dde54ea82..cb2e3460ae32c 100644 --- a/DataFormats/Common/test/ptr_t.cppunit.cc +++ b/DataFormats/Common/test/ptr_t.cppunit.cc @@ -207,6 +207,9 @@ void testPtr::constructTest() { CPPUNIT_ASSERT(dummy2Ptr.key() == copyPtr.key()); CPPUNIT_ASSERT(dummy2Ptr.get() == static_cast(dummy2Ptr.get())); + Ptr copyCtrPtr(copyPtr); + CPPUNIT_ASSERT(copyPtr.key() == copyCtrPtr.key()); + Ptr movePtr(std::move(copyPtr)); CPPUNIT_ASSERT(dummy2Ptr.key() == movePtr.key()); } diff --git a/DataFormats/Common/test/reftobase_t.cpp b/DataFormats/Common/test/reftobase_t.cpp new file mode 100644 index 0000000000000..a52ea205a5af8 --- /dev/null +++ b/DataFormats/Common/test/reftobase_t.cpp @@ -0,0 +1,92 @@ +#include "catch.hpp" + +#include "DataFormats/Common/interface/RefToBase.h" +#include "DataFormats/Common/interface/Ref.h" +#include "DataFormats/Common/interface/TestHandle.h" + +#include + +namespace testreftobase { + struct Base { + virtual ~Base() {} + virtual int val() const = 0; + }; + + struct Inherit1 : public Base { + virtual int val() const { return 1; } + }; + struct Inherit2 : public Base { + virtual int val() const { return 2; } + }; +} // namespace testreftobase + +using namespace testreftobase; + +TEST_CASE("test RefToBase", "[RefToBase]") { + SECTION("Class type") { + using namespace edm; + + std::vector v1(2, Inherit1()); + + TestHandle > h1(&v1, ProductID(1, 1)); + Ref > r1(h1, 1); + RefToBase b1(r1); + + SECTION("Value check") { + CHECK(&(*b1) == static_cast(&(v1[1]))); + CHECK(b1.operator->() == b1.get()); + CHECK(b1.get() == static_cast(&(v1[1]))); + CHECK(b1.id() == ProductID(1, 1)); + } + SECTION("Copy constructor") { + //copy constructor + RefToBase b2(b1); + CHECK(&(*b2) == static_cast(&(v1[1]))); + CHECK(b2.id() == b1.id()); + } + + SECTION("operator=") { + //operator= + RefToBase b3; + CHECK(b3.isNull()); + CHECK(!(b3.isNonnull())); + CHECK(!b3); + b3 = b1; + CHECK(&(*b3) == static_cast(&(v1[1]))); + CHECK(b3.id() == b1.id()); + CHECK(!(b3.isNull())); + CHECK(b3.isNonnull()); + CHECK(!(!b3)); + } + + SECTION("castTo inheriting type") { CHECK(b1.castTo > >() == r1); } + SECTION("castTo incorrect inherting type") { + CHECK_THROWS_AS(b1.castTo > >(), cms::Exception); + } + /* + Uncomment to test compile time failure + SECTION("castTo unrelated type") { + b1.castTo > >(); + } */ + } + + SECTION("builtin type") { + using namespace edm; + std::vector v1(2, 3); + + TestHandle > h1(&v1, ProductID(1, 1)); + Ref > r1(h1, 1); + RefToBase b1(r1); + + SECTION("Value check") { + CHECK(&(*b1) == &v1[1]); + CHECK(b1.operator->() == b1.get()); + CHECK(b1.get() == (&(v1[1]))); + CHECK(b1.id() == ProductID(1, 1)); + } + SECTION("castTo Ref") { CHECK(b1.castTo > >() == r1); } + /* uncomment to test compile time failure + SECTION("bad castTo Ref") { b1.castTo > >(); } + */ + } +} diff --git a/DataFormats/Common/test/reftobase_t.cppunit.cc b/DataFormats/Common/test/reftobase_t.cppunit.cc deleted file mode 100644 index f7d6b0483de1c..0000000000000 --- a/DataFormats/Common/test/reftobase_t.cppunit.cc +++ /dev/null @@ -1,75 +0,0 @@ -#include "cppunit/extensions/HelperMacros.h" -#include "DataFormats/Common/interface/RefToBase.h" -#include "DataFormats/Common/interface/Ref.h" -#include "DataFormats/Common/interface/TestHandle.h" - -#include - -class testRefToBase : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(testRefToBase); - CPPUNIT_TEST(check); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp() {} - void tearDown() {} - void check(); -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(testRefToBase); -namespace testreftobase { - struct Base { - virtual ~Base() {} - virtual int val() const = 0; - }; - - struct Inherit1 : public Base { - virtual int val() const { return 1; } - }; - struct Inherit2 : public Base { - virtual int val() const { return 2; } - }; -} // namespace testreftobase - -using namespace testreftobase; - -void testRefToBase::check() { - using namespace edm; - - std::vector v1(2, Inherit1()); - std::vector v2(2, Inherit2()); - - TestHandle > h1(&v1, ProductID(1, 1)); - Ref > r1(h1, 1); - RefToBase b1(r1); - CPPUNIT_ASSERT(&(*b1) == static_cast(&(v1[1]))); - CPPUNIT_ASSERT(b1.operator->() == b1.get()); - CPPUNIT_ASSERT(b1.get() == static_cast(&(v1[1]))); - CPPUNIT_ASSERT(b1.id() == ProductID(1, 1)); - - //copy constructor - RefToBase b2(b1); - CPPUNIT_ASSERT(&(*b2) == static_cast(&(v1[1]))); - CPPUNIT_ASSERT(b2.id() == b1.id()); - - //operator= - RefToBase b3; - CPPUNIT_ASSERT(b3.isNull()); - CPPUNIT_ASSERT(!(b3.isNonnull())); - CPPUNIT_ASSERT(!b3); - b3 = b1; - CPPUNIT_ASSERT(&(*b3) == static_cast(&(v1[1]))); - CPPUNIT_ASSERT(b3.id() == b1.id()); - CPPUNIT_ASSERT(!(b3.isNull())); - CPPUNIT_ASSERT(b3.isNonnull()); - CPPUNIT_ASSERT(!(!b3)); - - CPPUNIT_ASSERT(b1.castTo > >() == r1); - bool throwed = false; - try { - b1.castTo > >(); - } catch (edm::Exception const& e) { - throwed = true; - } - CPPUNIT_ASSERT(throwed); -} diff --git a/DataFormats/DTDigi/interface/DTDDUWords.h b/DataFormats/DTDigi/interface/DTDDUWords.h index 2d5776801497d..b56acec037f1c 100644 --- a/DataFormats/DTDigi/interface/DTDDUWords.h +++ b/DataFormats/DTDigi/interface/DTDDUWords.h @@ -90,10 +90,10 @@ class DTROSWordType { /// Constructor DTROSWordType(const uint32_t index) { word_ = index; } - DTROSWordType() : word_(0){}; + DTROSWordType() : word_(0) {} /// Destructor - virtual ~DTROSWordType(){}; + virtual ~DTROSWordType() {} /// List of DT DDU Word Types enum wordTypes { diff --git a/DataFormats/DTDigi/interface/DTuROSControlData.h b/DataFormats/DTDigi/interface/DTuROSControlData.h index 5250bbd831a9a..78f7e1f1507af 100644 --- a/DataFormats/DTDigi/interface/DTuROSControlData.h +++ b/DataFormats/DTDigi/interface/DTuROSControlData.h @@ -28,7 +28,7 @@ class DTuROSROSData { } /// Destructor - ~DTuROSROSData(){}; + ~DTuROSROSData() {} void setslot(int slot) { slot_ = slot; } @@ -109,7 +109,7 @@ class DTuROSFEDData { } /// Destructor - ~DTuROSFEDData(){}; + ~DTuROSFEDData() {} void setfed(int fed) { fed_ = fed; } diff --git a/DataFormats/DTDigi/test/testDTDigis.cpp b/DataFormats/DTDigi/test/testDTDigis.cpp index f25f98a0ea718..1229018ca33bf 100644 --- a/DataFormats/DTDigi/test/testDTDigis.cpp +++ b/DataFormats/DTDigi/test/testDTDigis.cpp @@ -73,7 +73,7 @@ void testDTDigis::testDigiCollectionPut() { // CPPUNIT_ASSERT((*digiIt)==digi2); } // for digis in layer - } // for layers + } // for layers } void testDTDigis::testDigiCollectionInsert() { @@ -105,7 +105,7 @@ void testDTDigis::testDigiCollectionInsert() { count++; } // for digis in layer - } // for layers + } // for layers CPPUNIT_ASSERT(count != 0); } diff --git a/DataFormats/DTRecHit/interface/DTChamberRecSegment2D.h b/DataFormats/DTRecHit/interface/DTChamberRecSegment2D.h index f5a9840667ce2..95712ff072c75 100644 --- a/DataFormats/DTRecHit/interface/DTChamberRecSegment2D.h +++ b/DataFormats/DTRecHit/interface/DTChamberRecSegment2D.h @@ -45,7 +45,7 @@ class DTChamberRecSegment2D : public DTRecSegment2D { std::vector &hits1D); /// Destructor - ~DTChamberRecSegment2D() override{}; + ~DTChamberRecSegment2D() override {} /* Operations */ diff --git a/DataFormats/DTRecHit/interface/DTSLRecSegment2D.h b/DataFormats/DTRecHit/interface/DTSLRecSegment2D.h index 6af19255701bc..3964e47b9e8af 100644 --- a/DataFormats/DTRecHit/interface/DTSLRecSegment2D.h +++ b/DataFormats/DTRecHit/interface/DTSLRecSegment2D.h @@ -15,7 +15,7 @@ class DTSLRecSegment2D : public DTRecSegment2D { public: /// Constructor - DTSLRecSegment2D(){}; + DTSLRecSegment2D() {} /// c'tor from hits DTSLRecSegment2D(const DTSuperLayerId id, const std::vector &hits); @@ -29,7 +29,7 @@ class DTSLRecSegment2D : public DTRecSegment2D { std::vector &hits1D); /// Destructor - ~DTSLRecSegment2D() override{}; + ~DTSLRecSegment2D() override {} // Operations diff --git a/DataFormats/DTRecHit/src/classes_def.xml b/DataFormats/DTRecHit/src/classes_def.xml index 18dbbd42c3364..7a65ea90b0d85 100644 --- a/DataFormats/DTRecHit/src/classes_def.xml +++ b/DataFormats/DTRecHit/src/classes_def.xml @@ -14,7 +14,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/DataFormats/EcalDetId/interface/EcalElectronicsId.h b/DataFormats/EcalDetId/interface/EcalElectronicsId.h index 6fc5ac5c8b106..d706273c5fe7b 100644 --- a/DataFormats/EcalDetId/interface/EcalElectronicsId.h +++ b/DataFormats/EcalDetId/interface/EcalElectronicsId.h @@ -43,7 +43,7 @@ class EcalElectronicsId { EcalSubdetector subdet() const; /// get a fast, compact, unique index for linear lookups (maximum value = 4194303) - int linearIndex() const { return (EcalElectronicsId_)&0x3FFFFF; } + int linearIndex() const { return (EcalElectronicsId_) & 0x3FFFFF; } /// so far for EndCap only : int channelId() const; // xtal id between 1 and 25 diff --git a/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h b/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h index b2672a9fe650d..1eac3400af281 100644 --- a/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h +++ b/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h @@ -36,7 +36,7 @@ class EcalTriggerElectronicsId { /// get the channel id int channelId() const { return (EcalTriggerElectronicsId_ & 0x7); } /// get a fast, compact, unique index for linear lookups (maximum value = 1048575) - int linearIndex() const { return (EcalTriggerElectronicsId_)&0xFFFFF; } + int linearIndex() const { return (EcalTriggerElectronicsId_) & 0xFFFFF; } /// get the zside() +1 / -1 int zside() const; diff --git a/DataFormats/EcalDetId/test/printEEDetId.cpp b/DataFormats/EcalDetId/test/printEEDetId.cpp index 9f985120b3a8f..1a5d8a0b6aa85 100644 --- a/DataFormats/EcalDetId/test/printEEDetId.cpp +++ b/DataFormats/EcalDetId/test/printEEDetId.cpp @@ -138,8 +138,8 @@ int main(int argc, char* argv[]) { COL << id.sc().zside() << " "; COL << "\n"; } //next iy - } //next ix - } //next iz + } //next ix + } //next iz } catch (exception& e) { cerr << e.what(); } diff --git a/DataFormats/EcalDigi/interface/EBSrFlag.h b/DataFormats/EcalDigi/interface/EBSrFlag.h index 7d534d4f62ee8..d08dab0e7c5f6 100644 --- a/DataFormats/EcalDigi/interface/EBSrFlag.h +++ b/DataFormats/EcalDigi/interface/EBSrFlag.h @@ -17,7 +17,7 @@ class EBSrFlag : public EcalSrFlag { public: /** Default constructor. */ - EBSrFlag(){}; + EBSrFlag() {} /** Constructor * @param tt trigger tower det id. diff --git a/DataFormats/EcalDigi/interface/EESrFlag.h b/DataFormats/EcalDigi/interface/EESrFlag.h index 97c05075b31e8..f2d59273f53a8 100644 --- a/DataFormats/EcalDigi/interface/EESrFlag.h +++ b/DataFormats/EcalDigi/interface/EESrFlag.h @@ -18,7 +18,7 @@ class EESrFlag : public EcalSrFlag { public: /** Default constructor. */ - EESrFlag(){}; + EESrFlag() {} /** Constructor * @param sc supercrystal det id diff --git a/DataFormats/EcalDigi/interface/EcalSrFlag.h b/DataFormats/EcalDigi/interface/EcalSrFlag.h index 13d0594fab82d..3f8dccbef74d1 100644 --- a/DataFormats/EcalDigi/interface/EcalSrFlag.h +++ b/DataFormats/EcalDigi/interface/EcalSrFlag.h @@ -31,7 +31,7 @@ class EcalSrFlag { public: /** Destructor */ - virtual ~EcalSrFlag(){}; + virtual ~EcalSrFlag() {} /** Gets the Det Id the flag is associated to. * @return the det id of the readout unit (a barrel TT or a SC). diff --git a/DataFormats/EcalDigi/interface/EcalTrigPrimCompactColl.h b/DataFormats/EcalDigi/interface/EcalTrigPrimCompactColl.h index 5ee42434548c8..05396c6d8dc19 100644 --- a/DataFormats/EcalDigi/interface/EcalTrigPrimCompactColl.h +++ b/DataFormats/EcalDigi/interface/EcalTrigPrimCompactColl.h @@ -40,7 +40,7 @@ class EcalTrigPrimCompactColl { } public: - EcalTrigPrimCompactColl() : formatVers_(0), data_(nBins){}; + EcalTrigPrimCompactColl() : formatVers_(0), data_(nBins) {} ///Set data void setValue(int ieta, int iphi, uint16_t sample) { data_[index(ieta, iphi)] = sample; } diff --git a/DataFormats/EgammaCandidates/interface/GsfElectron.h b/DataFormats/EgammaCandidates/interface/GsfElectron.h index 5a1044bb462e1..51fa837f2ef83 100644 --- a/DataFormats/EgammaCandidates/interface/GsfElectron.h +++ b/DataFormats/EgammaCandidates/interface/GsfElectron.h @@ -91,7 +91,7 @@ namespace reco { const TrackRef &closestCtfTrack, const TrackBaseRef &conversionPartner, const GsfTrackRefVector &ambiguousTracks) const; - ~GsfElectron() override{}; + ~GsfElectron() override {} private: void init(); @@ -512,7 +512,7 @@ namespace reco { struct SaturationInfo { int nSaturatedXtals; bool isSeedSaturated; - SaturationInfo() : nSaturatedXtals(0), isSeedSaturated(false){}; + SaturationInfo() : nSaturatedXtals(0), isSeedSaturated(false) {} }; // accessors @@ -680,7 +680,7 @@ namespace reco { sumPhotonEtHighThreshold(0), sumPUPt(0), sumEcalClusterEt(0), - sumHcalClusterEt(0){}; + sumHcalClusterEt(0) {} }; struct MvaInput { diff --git a/DataFormats/EgammaCandidates/interface/Photon.h b/DataFormats/EgammaCandidates/interface/Photon.h index d6e6e1da91fc2..7cddf80e5b98d 100644 --- a/DataFormats/EgammaCandidates/interface/Photon.h +++ b/DataFormats/EgammaCandidates/interface/Photon.h @@ -305,7 +305,7 @@ namespace reco { struct SaturationInfo { int nSaturatedXtals; bool isSeedSaturated; - SaturationInfo() : nSaturatedXtals(0), isSeedSaturated(false){}; + SaturationInfo() : nSaturatedXtals(0), isSeedSaturated(false) {} }; // accessors diff --git a/DataFormats/EgammaReco/interface/PreshowerCluster.h b/DataFormats/EgammaReco/interface/PreshowerCluster.h index 020f63b8839b3..59d7a6af3bddb 100644 --- a/DataFormats/EgammaReco/interface/PreshowerCluster.h +++ b/DataFormats/EgammaReco/interface/PreshowerCluster.h @@ -19,7 +19,7 @@ namespace reco { typedef math::XYZPoint Point; /// default constructor - PreshowerCluster() : CaloCluster(0., Point(0., 0., 0.)){}; + PreshowerCluster() : CaloCluster(0., Point(0., 0., 0.)) {} ~PreshowerCluster() override; diff --git a/DataFormats/EgammaReco/interface/PreshowerClusterShape.h b/DataFormats/EgammaReco/interface/PreshowerClusterShape.h index c7fc53e8813df..ef72ee0791d77 100644 --- a/DataFormats/EgammaReco/interface/PreshowerClusterShape.h +++ b/DataFormats/EgammaReco/interface/PreshowerClusterShape.h @@ -14,7 +14,7 @@ namespace reco { class PreshowerClusterShape { public: /// default constructor - PreshowerClusterShape(){}; + PreshowerClusterShape() {} virtual ~PreshowerClusterShape(); diff --git a/DataFormats/EgammaReco/src/SuperCluster.cc b/DataFormats/EgammaReco/src/SuperCluster.cc index 6930142221ced..0b0007b2f0cce 100644 --- a/DataFormats/EgammaReco/src/SuperCluster.cc +++ b/DataFormats/EgammaReco/src/SuperCluster.cc @@ -38,7 +38,7 @@ SuperCluster::SuperCluster(double energy, for (std::vector >::const_iterator diIt = v1.begin(); diIt != v1.end(); ++diIt) { hitsAndFractions_.push_back((*diIt)); } // loop over rechits - } // loop over basic clusters + } // loop over basic clusters computeRawEnergy(); } @@ -70,7 +70,7 @@ SuperCluster::SuperCluster(double energy, for (std::vector >::const_iterator diIt = v1.begin(); diIt != v1.end(); ++diIt) { hitsAndFractions_.push_back((*diIt)); } // loop over rechits - } // loop over basic clusters + } // loop over basic clusters // set references to preshower clusters for (CaloClusterPtrVector::const_iterator pcit = preshowerClusters.begin(); pcit != preshowerClusters.end(); ++pcit) { diff --git a/DataFormats/EgammaReco/src/classes_def.xml b/DataFormats/EgammaReco/src/classes_def.xml index 560917fe0521e..846fbc1f3b4e5 100644 --- a/DataFormats/EgammaReco/src/classes_def.xml +++ b/DataFormats/EgammaReco/src/classes_def.xml @@ -1,6 +1,6 @@ - + diff --git a/DataFormats/FWLite/interface/Event.h b/DataFormats/FWLite/interface/Event.h index efbda24c222e0..8ff14667ddfc8 100644 --- a/DataFormats/FWLite/interface/Event.h +++ b/DataFormats/FWLite/interface/Event.h @@ -100,8 +100,7 @@ namespace fwlite { // DataGetterHelper caching is enabled. When user sets useCache to // false no cache is created unless user attaches and controls it // himself. - Event( - TFile* iFile, bool useCache = true, std::function baFunc = [](TBranch const&) {}); + Event(TFile* iFile, bool useCache = true, std::function baFunc = [](TBranch const&) {}); Event(Event const&) = delete; // stop default diff --git a/DataFormats/FWLite/interface/OutputFiles.h b/DataFormats/FWLite/interface/OutputFiles.h index e701265c8af23..ee26c147176a9 100644 --- a/DataFormats/FWLite/interface/OutputFiles.h +++ b/DataFormats/FWLite/interface/OutputFiles.h @@ -22,7 +22,7 @@ namespace fwlite { OutputFiles() { throw cms::Exception("InvalidInput") << "Must specify a string fileName" << std::endl; } /// default constructor from parameter set OutputFiles(const edm::ParameterSet& cfg) - : file_(cfg.getParameterSet("fwliteOutput").getParameter("fileName")){}; + : file_(cfg.getParameterSet("fwliteOutput").getParameter("fileName")) {} /// return output fuke name std::string const& file() const { return file_; } diff --git a/DataFormats/FWLite/src/ChainEvent.cc b/DataFormats/FWLite/src/ChainEvent.cc index 2e316d027146b..88bd926c8f608 100644 --- a/DataFormats/FWLite/src/ChainEvent.cc +++ b/DataFormats/FWLite/src/ChainEvent.cc @@ -156,7 +156,7 @@ namespace fwlite { return true; } } // end ignore "first" file that we tried - } // end loop over files + } // end loop over files // did not find the event with id "id". return false; diff --git a/DataFormats/FWLite/src/Event.cc b/DataFormats/FWLite/src/Event.cc index d7c792a5c64ae..630d0025f99f9 100644 --- a/DataFormats/FWLite/src/Event.cc +++ b/DataFormats/FWLite/src/Event.cc @@ -108,9 +108,9 @@ namespace fwlite { Event const* event_; }; } // namespace internal - // - // constructors and destructor - // + // + // constructors and destructor + // Event::Event(TFile* iFile, bool useCache, std::function baFunc) : file_(iFile), // eventTree_(nullptr), diff --git a/DataFormats/GEMDigi/interface/GEMAMC.h b/DataFormats/GEMDigi/interface/GEMAMC.h index 55bbdf8424b87..6713f55405e1f 100644 --- a/DataFormats/GEMDigi/interface/GEMAMC.h +++ b/DataFormats/GEMDigi/interface/GEMAMC.h @@ -93,7 +93,7 @@ class GEMAMC { }; }; - GEMAMC() : amch1_(0), amch2_(0), amct_(0), eh_(0), et_(0){}; + GEMAMC() : amch1_(0), amch2_(0), amct_(0), eh_(0), et_(0) {} ~GEMAMC() { gebd_.clear(); } int status(); diff --git a/DataFormats/GEMDigi/interface/GEMOptoHybrid.h b/DataFormats/GEMDigi/interface/GEMOptoHybrid.h index b869fb04ade0c..499bbb2f4b65d 100644 --- a/DataFormats/GEMDigi/interface/GEMOptoHybrid.h +++ b/DataFormats/GEMDigi/interface/GEMOptoHybrid.h @@ -73,7 +73,7 @@ class GEMOptoHybrid { }; }; - GEMOptoHybrid() : ch_(0), ct_(0), existVFATs_(0){}; + GEMOptoHybrid() : ch_(0), ct_(0), existVFATs_(0) {} ~GEMOptoHybrid() { vfatd_.clear(); } void setVersion(uint8_t i) { ver_ = i; } diff --git a/DataFormats/GEMRecHit/src/classes_def.xml b/DataFormats/GEMRecHit/src/classes_def.xml index 12d88b1ebabfa..3c91da2628481 100644 --- a/DataFormats/GEMRecHit/src/classes_def.xml +++ b/DataFormats/GEMRecHit/src/classes_def.xml @@ -9,7 +9,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h b/DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h index 1a7186c88cb3f..a2dbc9c97ae2f 100644 --- a/DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h +++ b/DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h @@ -9,15 +9,15 @@ class AlignmentPositionError { public: - AlignmentPositionError(){}; + AlignmentPositionError() {} AlignmentPositionError(float xx, float yy, float zz, float phixphix = 0, float phiyphiy = 0, float phizphiz = 0); - AlignmentPositionError(const GlobalErrorExtended& ge) : theGlobalError(ge){}; + AlignmentPositionError(const GlobalErrorExtended& ge) : theGlobalError(ge) {} AlignmentPositionError(const GlobalError& ge); - ~AlignmentPositionError(){}; + ~AlignmentPositionError() {} bool valid() const { return (theGlobalError.cxx() > 0 || theGlobalError.cyy() > 0 || theGlobalError.czz() > 0); } diff --git a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h index 6598b9f3bbd19..44d799247e604 100644 --- a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h +++ b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h @@ -12,15 +12,15 @@ class Measurement1D { public: // construct - Measurement1D() : theValue(0.), theError(0.){}; + Measurement1D() : theValue(0.), theError(0.) {} - Measurement1D(const double& aValue) : theValue(aValue), theError(0.){}; + Measurement1D(const double& aValue) : theValue(aValue), theError(0.) {} - Measurement1D(const double& aValue, const double& aError) : theValue(aValue), theError(aError){}; + Measurement1D(const double& aValue, const double& aError) : theValue(aValue), theError(aError) {} //destruct - ~Measurement1D(){}; + ~Measurement1D() {} double value() const { return theValue; } diff --git a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h index 6408fdc8bd6cf..75540fffaf44e 100644 --- a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h +++ b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h @@ -18,7 +18,7 @@ class Measurement1DFloat { //destruct - ~Measurement1DFloat(){}; + ~Measurement1DFloat() {} float value() const { return theValue; } diff --git a/DataFormats/GeometryCommonDetAlgo/src/classes.h b/DataFormats/GeometryCommonDetAlgo/src/classes.h index 1916a600f5753..9fe8a38d1bc7d 100644 --- a/DataFormats/GeometryCommonDetAlgo/src/classes.h +++ b/DataFormats/GeometryCommonDetAlgo/src/classes.h @@ -1,4 +1,11 @@ +#include "DataFormats/GeometryCommonDetAlgo/interface/ErrorMatrixTag.h" +#include "DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBase.h" #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h" #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h" +#include "DataFormats/GeometryVector/interface/GlobalPoint.h" +#include "DataFormats/Common/interface/RefProd.h" #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/Common/interface/Wrapper.h" + +#include +#include diff --git a/DataFormats/GeometryCommonDetAlgo/src/classes_def.xml b/DataFormats/GeometryCommonDetAlgo/src/classes_def.xml index caccb7c61e5dd..a080d5dd2de03 100644 --- a/DataFormats/GeometryCommonDetAlgo/src/classes_def.xml +++ b/DataFormats/GeometryCommonDetAlgo/src/classes_def.xml @@ -8,4 +8,12 @@ + + + + + + + + diff --git a/DataFormats/GeometrySurface/interface/Line.h b/DataFormats/GeometrySurface/interface/Line.h index fa3a6d9a6d901..a2b32dc56a91e 100644 --- a/DataFormats/GeometrySurface/interface/Line.h +++ b/DataFormats/GeometrySurface/interface/Line.h @@ -17,7 +17,7 @@ class Line { //Line( const PositionType& pos, const DirectionType& dir) : Line(PositionType& pos, DirectionType& dir) : thePos(pos), theDir(dir.unit()) {} - ~Line(){}; + ~Line() {} //const PositionType& position() const { return thePos;} //const DirectionType& direction() const { return theDir;} diff --git a/DataFormats/GeometrySurface/interface/private/extTkRotation.h b/DataFormats/GeometrySurface/interface/private/extTkRotation.h index e171d5785074a..361c0029f8127 100644 --- a/DataFormats/GeometrySurface/interface/private/extTkRotation.h +++ b/DataFormats/GeometrySurface/interface/private/extTkRotation.h @@ -205,10 +205,10 @@ class TkRotation { }; template <> -std::ostream& operator<<(std::ostream& s, const TkRotation& r); +std::ostream& operator<< (std::ostream& s, const TkRotation& r); template <> -std::ostream& operator<<(std::ostream& s, const TkRotation& r); +std::ostream& operator<< (std::ostream& s, const TkRotation& r); template inline Basic3DVector operator*(const TkRotation& r, const Basic3DVector& v) { @@ -270,9 +270,9 @@ class TkRotation2D { }; template <> -std::ostream& operator<<(std::ostream& s, const TkRotation2D& r); +std::ostream& operator<< (std::ostream& s, const TkRotation2D& r); template <> -std::ostream& operator<<(std::ostream& s, const TkRotation2D& r); +std::ostream& operator<< (std::ostream& s, const TkRotation2D& r); #endif diff --git a/DataFormats/GeometryVector/interface/private/extBasic3DVector.h b/DataFormats/GeometryVector/interface/private/extBasic3DVector.h index 932e6fbf5cd91..f0ba88a8f09a3 100644 --- a/DataFormats/GeometryVector/interface/private/extBasic3DVector.h +++ b/DataFormats/GeometryVector/interface/private/extBasic3DVector.h @@ -20,8 +20,9 @@ namespace detailsBasic3DVector { double t(z / std::sqrt(x * x + y * y)); return ::asinh(t); } - inline long double __attribute__((always_inline)) __attribute__((pure)) - eta(long double x, long double y, long double z) { + inline long double __attribute__((always_inline)) __attribute__((pure)) eta(long double x, + long double y, + long double z) { long double t(z / std::sqrt(x * x + y * y)); return ::asinhl(t); } diff --git a/DataFormats/GeometryVector/src/classes.h b/DataFormats/GeometryVector/src/classes.h index 87a4718785891..6701ef183c261 100644 --- a/DataFormats/GeometryVector/src/classes.h +++ b/DataFormats/GeometryVector/src/classes.h @@ -1,15 +1,9 @@ #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/Common/interface/Wrapper.h" #include "DataFormats/GeometryVector/interface/Phi.h" -namespace { - Geom::Phi dummy; - Geom::Phi dummy1; -} // namespace - #include "DataFormats/GeometryVector/interface/Basic3DVector.h" -// - #include "DataFormats/GeometryVector/interface/LocalPoint.h" +#include "DataFormats/GeometryVector/interface/LocalVector.h" #include "DataFormats/GeometryVector/interface/Point2DBase.h" #include "DataFormats/GeometryVector/interface/Point3DBase.h" #include "DataFormats/GeometryVector/interface/LocalTag.h" diff --git a/DataFormats/GeometryVector/src/classes_def.xml b/DataFormats/GeometryVector/src/classes_def.xml index 454e562fa177b..e7b291b49fffc 100644 --- a/DataFormats/GeometryVector/src/classes_def.xml +++ b/DataFormats/GeometryVector/src/classes_def.xml @@ -126,4 +126,7 @@ + + + diff --git a/DataFormats/HGCalReco/interface/Trackster.h b/DataFormats/HGCalReco/interface/Trackster.h index 3bbdef6dcc595..2d976f85bc6ac 100644 --- a/DataFormats/HGCalReco/interface/Trackster.h +++ b/DataFormats/HGCalReco/interface/Trackster.h @@ -95,10 +95,10 @@ namespace ticl { removeDuplicates(); zeroProbabilities(); } - inline void fillPCAVariables(Eigen::Vector3d &eigenvalues, - Eigen::Matrix3d &eigenvectors, - Eigen::Vector3d &sigmas, - Eigen::Vector3d &sigmasEigen, + inline void fillPCAVariables(Eigen::Vector3f const &eigenvalues, + Eigen::Matrix3f const &eigenvectors, + Eigen::Vector3f const &sigmas, + Eigen::Vector3f const &sigmasEigen, size_t pcadimension, PCAOrdering order) { int original_index = 0; diff --git a/DataFormats/HcalDetId/interface/CastorElectronicsId.h b/DataFormats/HcalDetId/interface/CastorElectronicsId.h index f8454e3fccff8..1cd83598400c8 100644 --- a/DataFormats/HcalDetId/interface/CastorElectronicsId.h +++ b/DataFormats/HcalDetId/interface/CastorElectronicsId.h @@ -44,7 +44,7 @@ class CastorElectronicsId { int htrSlot() const { return (castorElectronicsId_ >> 14) & 0x1F; } int htrTopBottom() const { return (castorElectronicsId_ >> 19) & 0x1; } int readoutVMECrateId() const { return (castorElectronicsId_ >> 20) & 0x1F; } - int linearIndex() const { return (castorElectronicsId_)&0x3FFF; } + int linearIndex() const { return (castorElectronicsId_) & 0x3FFF; } static const int maxLinearIndex = 0x3FFF; static const int maxDCCId = 15; diff --git a/DataFormats/HcalDigi/src/HOTriggerPrimitiveDigi.cc b/DataFormats/HcalDigi/src/HOTriggerPrimitiveDigi.cc index c4ccd052c63b7..4031fe5cbec55 100644 --- a/DataFormats/HcalDigi/src/HOTriggerPrimitiveDigi.cc +++ b/DataFormats/HcalDigi/src/HOTriggerPrimitiveDigi.cc @@ -16,7 +16,7 @@ HOTriggerPrimitiveDigi::HOTriggerPrimitiveDigi( samples = HO_TP_SAMPLES_MAX; theHO_TP = (abs(ieta) & 0xf) | ((ieta < 0) ? (0x10) : (0x00)) | ((iphi & 0x7F) << 5) | ((samples & 0xF) << 12) | - (((whichSampleTriggered)&0xF) << 16) | ((databits & 0x3FF) << 20); + (((whichSampleTriggered) & 0xF) << 16) | ((databits & 0x3FF) << 20); } //Request the value of a given HO TP bit in the HO TP Digi. diff --git a/DataFormats/HcalDigi/src/HcalTriggerPrimitiveSample.cc b/DataFormats/HcalDigi/src/HcalTriggerPrimitiveSample.cc index 3b895e0a9fc92..f0f8f1abdf4f3 100644 --- a/DataFormats/HcalDigi/src/HcalTriggerPrimitiveSample.cc +++ b/DataFormats/HcalDigi/src/HcalTriggerPrimitiveSample.cc @@ -4,7 +4,7 @@ HcalTriggerPrimitiveSample::HcalTriggerPrimitiveSample() : theSample(0) {} HcalTriggerPrimitiveSample::HcalTriggerPrimitiveSample(uint16_t data) : theSample(data) {} HcalTriggerPrimitiveSample::HcalTriggerPrimitiveSample(int encodedEt, bool fineGrain, int slb, int slbchan) { - theSample = (((slb)&0x7) << 13) | ((slbchan & 0x3) << 11) | (encodedEt & 0xFF) | ((fineGrain) ? (0x100) : (0)); + theSample = (((slb) & 0x7) << 13) | ((slbchan & 0x3) << 11) | (encodedEt & 0xFF) | ((fineGrain) ? (0x100) : (0)); } HcalTriggerPrimitiveSample::HcalTriggerPrimitiveSample(int encodedEt, int fineGrainExt) { diff --git a/DataFormats/HcalRecHit/interface/ZDCRecHit.h b/DataFormats/HcalRecHit/interface/ZDCRecHit.h index 7b63892b2f644..7b6793c19b2aa 100644 --- a/DataFormats/HcalRecHit/interface/ZDCRecHit.h +++ b/DataFormats/HcalRecHit/interface/ZDCRecHit.h @@ -19,8 +19,25 @@ class ZDCRecHit : public CaloRecHit { // follow EcalRecHit method of adding variable flagBits_ to CaloRecHit float lowGainEnergy() const { return lowGainEnergy_; }; + constexpr inline void setEnergySOIp1(const float en) { energySOIp1_ = en; }; + constexpr inline float energySOIp1() const { return energySOIp1_; }; // energy of Slice of Interest plus 1 + constexpr inline void setRatioSOIp1(const float ratio) { ratioSOIp1_ = ratio; }; + constexpr inline float ratioSOIp1() const { + return ratioSOIp1_; + }; // ratio of Energy of (Slice of Interest)/ (Slice of Interest plus 1) + constexpr inline void setTDCtime(const float time) { TDCtime_ = time; }; + constexpr inline float TDCtime() const { return TDCtime_; }; + constexpr inline void setChargeWeightedTime(const float time) { + chargeWeightedTime_ = time; + }; // time of activity determined by charged weighted average + constexpr inline float chargeWeightedTime() const { return chargeWeightedTime_; }; + private: float lowGainEnergy_; + float energySOIp1_; + float ratioSOIp1_; + float TDCtime_; + float chargeWeightedTime_; }; std::ostream& operator<<(std::ostream& s, const ZDCRecHit& hit); diff --git a/DataFormats/HcalRecHit/src/ZDCRecHit.cc b/DataFormats/HcalRecHit/src/ZDCRecHit.cc index 9d0b69dc42ed7..1c20349a073f4 100644 --- a/DataFormats/HcalRecHit/src/ZDCRecHit.cc +++ b/DataFormats/HcalRecHit/src/ZDCRecHit.cc @@ -1,9 +1,15 @@ #include "DataFormats/HcalRecHit/interface/ZDCRecHit.h" -ZDCRecHit::ZDCRecHit() : CaloRecHit(), lowGainEnergy_() {} +ZDCRecHit::ZDCRecHit() + : CaloRecHit(), lowGainEnergy_(), energySOIp1_(-99), ratioSOIp1_(-99), TDCtime_(-99), chargeWeightedTime_(-99) {} ZDCRecHit::ZDCRecHit(const HcalZDCDetId& id, float energy, float time, float lowGainEnergy) - : CaloRecHit(id, energy, time), lowGainEnergy_(lowGainEnergy) {} + : CaloRecHit(id, energy, time), + lowGainEnergy_(lowGainEnergy), + energySOIp1_(-99), + ratioSOIp1_(-99), + TDCtime_(-99), + chargeWeightedTime_(-99) {} std::ostream& operator<<(std::ostream& s, const ZDCRecHit& hit) { return s << hit.id() << ": " << hit.energy() << " GeV, " << hit.time() << " ns"; diff --git a/DataFormats/HcalRecHit/src/classes_def.xml b/DataFormats/HcalRecHit/src/classes_def.xml index 4cfb4c2be84a6..b5520847e8d86 100644 --- a/DataFormats/HcalRecHit/src/classes_def.xml +++ b/DataFormats/HcalRecHit/src/classes_def.xml @@ -35,7 +35,8 @@ - + + diff --git a/DataFormats/Histograms/src/classes_def.xml b/DataFormats/Histograms/src/classes_def.xml index 8e4153781ff60..59009c2937fd5 100644 --- a/DataFormats/Histograms/src/classes_def.xml +++ b/DataFormats/Histograms/src/classes_def.xml @@ -33,21 +33,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/DataFormats/JetReco/interface/BasicJet.h b/DataFormats/JetReco/interface/BasicJet.h index e8dd175a17194..2ab1de643879a 100644 --- a/DataFormats/JetReco/interface/BasicJet.h +++ b/DataFormats/JetReco/interface/BasicJet.h @@ -25,7 +25,7 @@ namespace reco { BasicJet(const LorentzVector& fP4, const Point& fVertex); BasicJet(const LorentzVector& fP4, const Point& fVertex, const Jet::Constituents& fConstituents); - ~BasicJet() override{}; + ~BasicJet() override {} /// Polymorphic clone BasicJet* clone() const override; diff --git a/DataFormats/JetReco/interface/CaloJet.h b/DataFormats/JetReco/interface/CaloJet.h index 4b410c6e92c00..9445f205ce8b7 100644 --- a/DataFormats/JetReco/interface/CaloJet.h +++ b/DataFormats/JetReco/interface/CaloJet.h @@ -85,7 +85,7 @@ namespace reco { /** backward compatible, vertex=(0,0,0) */ CaloJet(const LorentzVector& fP4, const Specific& fSpecific, const Jet::Constituents& fConstituents); - ~CaloJet() override{}; + ~CaloJet() override {} /** Returns the maximum energy deposited in ECAL towers*/ float maxEInEmTowers() const { return m_specific.mMaxEInEmTowers; } diff --git a/DataFormats/JetReco/interface/GenJet.h b/DataFormats/JetReco/interface/GenJet.h index d429c93f3056c..24fd9609a30f6 100644 --- a/DataFormats/JetReco/interface/GenJet.h +++ b/DataFormats/JetReco/interface/GenJet.h @@ -81,7 +81,7 @@ namespace reco { /** backward compatible, vertex=(0,0,0) */ GenJet(const LorentzVector& fP4, const Specific& fSpecific, const Jet::Constituents& fConstituents); - ~GenJet() override{}; + ~GenJet() override {} /** Returns energy of electromagnetic particles*/ float emEnergy() const { return m_specific.m_EmEnergy; }; /** Returns energy of hadronic particles*/ diff --git a/DataFormats/JetReco/interface/JPTJet.h b/DataFormats/JetReco/interface/JPTJet.h index cdd4f7a9e8ed8..127c96e6af14a 100644 --- a/DataFormats/JetReco/interface/JPTJet.h +++ b/DataFormats/JetReco/interface/JPTJet.h @@ -81,7 +81,7 @@ namespace reco { /** backward compatible, vertex=(0,0,0) */ JPTJet(const LorentzVector& fP4, const Specific& fSpecific, const Jet::Constituents& fConstituents); - ~JPTJet() override{}; + ~JPTJet() override {} /// chargedHadronEnergy float chargedHadronEnergy() const { return mspecific.mChargedHadronEnergy; } /// chargedHadronEnergyFraction diff --git a/DataFormats/JetReco/interface/PFJet.h b/DataFormats/JetReco/interface/PFJet.h index 33870e251fb68..3d300767ef373 100644 --- a/DataFormats/JetReco/interface/PFJet.h +++ b/DataFormats/JetReco/interface/PFJet.h @@ -89,7 +89,7 @@ namespace reco { /** backward compatible, vertex=(0,0,0) */ PFJet(const LorentzVector& fP4, const Specific& fSpecific, const Jet::Constituents& fConstituents); - ~PFJet() override{}; + ~PFJet() override {} /// chargedHadronEnergy float chargedHadronEnergy() const { return m_specific.mChargedHadronEnergy; } diff --git a/DataFormats/JetReco/src/Jet.cc b/DataFormats/JetReco/src/Jet.cc index d9a8da5520c15..e2bc135a62ad5 100644 --- a/DataFormats/JetReco/src/Jet.cc +++ b/DataFormats/JetReco/src/Jet.cc @@ -82,7 +82,7 @@ namespace { double r() const { return mR; } private: - CaloPointZ(){}; + CaloPointZ() {} double mZ; double mR; }; diff --git a/DataFormats/JetReco/src/classes_def_3.xml b/DataFormats/JetReco/src/classes_def_3.xml index b94e17febafc5..e613ba75876ab 100644 --- a/DataFormats/JetReco/src/classes_def_3.xml +++ b/DataFormats/JetReco/src/classes_def_3.xml @@ -106,7 +106,7 @@ - + diff --git a/DataFormats/L1CSCTrackFinder/interface/L1CSCSPStatusDigi.h b/DataFormats/L1CSCTrackFinder/interface/L1CSCSPStatusDigi.h index e362615a42cee..83b7c25a1e5db 100644 --- a/DataFormats/L1CSCTrackFinder/interface/L1CSCSPStatusDigi.h +++ b/DataFormats/L1CSCTrackFinder/interface/L1CSCSPStatusDigi.h @@ -22,7 +22,7 @@ class L1CSCSPStatusDigi { NORMAL = 4, ERROR = 8, FIFO = 16 - }; // States of optical receivers + Alignment FIFO full OR empty status + }; // States of optical receivers + Alignment FIFO full OR empty status unsigned short link_status[15]; // Optical receiver status ORed for all tbins unsigned short mpc_link_id; // MPC_id and link# from MEx Data Record ORed for all tbins diff --git a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhDigi.h b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhDigi.h index 26fbe96082bc9..0364990377b19 100644 --- a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhDigi.h +++ b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtPhDigi.h @@ -58,7 +58,7 @@ class L1Phase2MuDTExtPhDigi : public L1Phase2MuDTPhDigi { L1Phase2MuDTExtPhDigi(const L1Phase2MuDTExtPhDigi &digi); - ~L1Phase2MuDTExtPhDigi() override{}; + ~L1Phase2MuDTExtPhDigi() override {} // Operations int xLocal() const; diff --git a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtThDigi.h b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtThDigi.h index ca96f645b3f1f..75fcc10478063 100644 --- a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtThDigi.h +++ b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTExtThDigi.h @@ -56,7 +56,7 @@ class L1Phase2MuDTExtThDigi : public L1Phase2MuDTThDigi { L1Phase2MuDTExtThDigi(const L1Phase2MuDTExtThDigi &digi); - ~L1Phase2MuDTExtThDigi() override{}; + ~L1Phase2MuDTExtThDigi() override {} // Operations int yLocal() const; diff --git a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigi.h b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigi.h index 650f98a90f8d1..24f1bf459d617 100644 --- a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigi.h +++ b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTPhDigi.h @@ -37,7 +37,7 @@ class L1Phase2MuDTPhDigi { L1Phase2MuDTPhDigi( int bx, int wh, int sc, int st, int sl, int phi, int phib, int qual, int idx, int t0, int chi2, int rpc = -10); - virtual ~L1Phase2MuDTPhDigi(){}; + virtual ~L1Phase2MuDTPhDigi() {} // Operations int bxNum() const; diff --git a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTThDigi.h b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTThDigi.h index ac1692b1f77c0..13c84d8813c90 100644 --- a/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTThDigi.h +++ b/DataFormats/L1DTTrackFinder/interface/L1Phase2MuDTThDigi.h @@ -8,7 +8,7 @@ class L1Phase2MuDTThDigi { L1Phase2MuDTThDigi(int bx, int wh, int sc, int st, int z, int k, int qual, int idx, int t0, int chi2, int rpc = -10); - virtual ~L1Phase2MuDTThDigi(){}; + virtual ~L1Phase2MuDTThDigi() {} // Operations int bxNum() const; diff --git a/DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h b/DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h index 439c002cd0dfe..5edccc1e1bbfa 100644 --- a/DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h +++ b/DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h @@ -38,10 +38,10 @@ class L1MuGMTReadoutCollection { public: - L1MuGMTReadoutCollection(){}; - L1MuGMTReadoutCollection(int nbx) { m_Records.reserve(nbx); }; + L1MuGMTReadoutCollection() {} + L1MuGMTReadoutCollection(int nbx) { m_Records.reserve(nbx); } - virtual ~L1MuGMTReadoutCollection(){}; + virtual ~L1MuGMTReadoutCollection() {} void reset() { for (unsigned int i = 0; i < m_Records.size(); i++) diff --git a/DataFormats/L1TCalorimeterPhase2/interface/CaloCrystalCluster.h b/DataFormats/L1TCalorimeterPhase2/interface/CaloCrystalCluster.h index de9d7996ffd51..aa4895fcdf008 100644 --- a/DataFormats/L1TCalorimeterPhase2/interface/CaloCrystalCluster.h +++ b/DataFormats/L1TCalorimeterPhase2/interface/CaloCrystalCluster.h @@ -29,7 +29,7 @@ namespace l1tp2 { photonWP80_(0.), electronWP90_(0.), looseL1TkMatchWP_(0.), - stage2effMatch_(0.){}; + stage2effMatch_(0.) {} CaloCrystalCluster(const PolarLorentzVector &p4, float calibratedPt, @@ -64,9 +64,9 @@ namespace l1tp2 { photonWP80_(photonWP80), electronWP90_(electronWP90), looseL1TkMatchWP_(looseL1TkMatchWP), - stage2effMatch_(stage2effMatch){}; + stage2effMatch_(stage2effMatch) {} - ~CaloCrystalCluster() override{}; + ~CaloCrystalCluster() override {} inline float calibratedPt() const { return calibratedPt_; }; inline float hovere() const { return hovere_; }; inline float isolation() const { return iso_; }; diff --git a/DataFormats/L1TCalorimeterPhase2/interface/CaloJet.h b/DataFormats/L1TCalorimeterPhase2/interface/CaloJet.h index 5be863ec51179..7a80f95bbadbf 100644 --- a/DataFormats/L1TCalorimeterPhase2/interface/CaloJet.h +++ b/DataFormats/L1TCalorimeterPhase2/interface/CaloJet.h @@ -11,10 +11,10 @@ namespace l1tp2 { class CaloJet : public l1t::L1Candidate { public: - CaloJet() : l1t::L1Candidate(), calibratedPt_(0.), hovere_(0.), iso_(0.), puCorrPt_(0.){}; + CaloJet() : l1t::L1Candidate(), calibratedPt_(0.), hovere_(0.), iso_(0.), puCorrPt_(0.) {} CaloJet(const PolarLorentzVector& p4, float calibratedPt, float hovere, float iso, float puCorrPt = 0.) - : l1t::L1Candidate(p4), calibratedPt_(calibratedPt), hovere_(hovere), iso_(iso), puCorrPt_(puCorrPt){}; + : l1t::L1Candidate(p4), calibratedPt_(calibratedPt), hovere_(hovere), iso_(iso), puCorrPt_(puCorrPt) {} inline float calibratedPt() const { return calibratedPt_; }; inline float hovere() const { return hovere_; }; diff --git a/DataFormats/L1TCalorimeterPhase2/interface/CaloPFCluster.h b/DataFormats/L1TCalorimeterPhase2/interface/CaloPFCluster.h index a72d184c3b645..6a242e3f54939 100644 --- a/DataFormats/L1TCalorimeterPhase2/interface/CaloPFCluster.h +++ b/DataFormats/L1TCalorimeterPhase2/interface/CaloPFCluster.h @@ -17,7 +17,7 @@ namespace l1tp2 { clusterIEta_(-99), clusterIPhi_(-99), clusterEta_(-99.), - clusterPhi_(-99.){}; + clusterPhi_(-99.) {} CaloPFCluster(const PolarLorentzVector& p4, float clusterEt, @@ -30,7 +30,7 @@ namespace l1tp2 { clusterIEta_(clusterIEta), clusterIPhi_(clusterIPhi), clusterEta_(clusterEta), - clusterPhi_(clusterPhi){}; + clusterPhi_(clusterPhi) {} inline float clusterEt() const { return clusterEt_; }; inline int clusterIEta() const { return clusterIEta_; }; diff --git a/DataFormats/L1TCalorimeterPhase2/interface/CaloTower.h b/DataFormats/L1TCalorimeterPhase2/interface/CaloTower.h index 41c94d4e12fae..531dcc9d2f593 100644 --- a/DataFormats/L1TCalorimeterPhase2/interface/CaloTower.h +++ b/DataFormats/L1TCalorimeterPhase2/interface/CaloTower.h @@ -29,7 +29,7 @@ namespace l1tp2 { l1egTrkIso_(0), l1egStandaloneSS_(0), l1egStandaloneIso_(0), - isBarrel_(false){}; + isBarrel_(false) {} public: inline float ecalTowerEt() const { return ecalTowerEt_; }; diff --git a/DataFormats/L1TCalorimeterPhase2/interface/Phase2L1CaloJet.h b/DataFormats/L1TCalorimeterPhase2/interface/Phase2L1CaloJet.h index bd0ca1a072be3..cdeb45467371c 100644 --- a/DataFormats/L1TCalorimeterPhase2/interface/Phase2L1CaloJet.h +++ b/DataFormats/L1TCalorimeterPhase2/interface/Phase2L1CaloJet.h @@ -24,7 +24,7 @@ namespace l1tp2 { towerIEta_(-99), towerIPhi_(-99), towerEta_(-99.), - towerPhi_(-99.){}; + towerPhi_(-99.) {} Phase2L1CaloJet(const PolarLorentzVector& p4, float jetEt, @@ -49,7 +49,7 @@ namespace l1tp2 { towerIEta_(towerIEta), towerIPhi_(towerIPhi), towerEta_(towerEta), - towerPhi_(towerPhi){}; + towerPhi_(towerPhi) {} inline float jetEt() const { return jetEt_; }; inline float tauEt() const { return tauEt_; }; diff --git a/DataFormats/L1TCorrelator/interface/TkTriplet.h b/DataFormats/L1TCorrelator/interface/TkTriplet.h index 20d4587ef1beb..2c2cc599432b6 100644 --- a/DataFormats/L1TCorrelator/interface/TkTriplet.h +++ b/DataFormats/L1TCorrelator/interface/TkTriplet.h @@ -32,7 +32,7 @@ namespace l1t { double pair_dz_min, std::vector> trkPtrList); - ~TkTriplet() override{}; + ~TkTriplet() override {} int getTripletCharge() const { return charge_; } double getPairMassMax() const { return pair_mass_max_; } diff --git a/DataFormats/L1THGCal/interface/HGCalClusterT.h b/DataFormats/L1THGCal/interface/HGCalClusterT.h index ebbaccbb2aaf5..5b7bc41546927 100644 --- a/DataFormats/L1THGCal/interface/HGCalClusterT.h +++ b/DataFormats/L1THGCal/interface/HGCalClusterT.h @@ -44,7 +44,7 @@ namespace l1t { addConstituent(c, true, fraction); } - ~HGCalClusterT() override{}; + ~HGCalClusterT() override {} const std::unordered_map>& constituents() const { return constituents_; } const_iterator constituents_begin() const { return constituents_.begin(); } diff --git a/DataFormats/L1TMuon/interface/CPPFDigi.h b/DataFormats/L1TMuon/interface/CPPFDigi.h index 70786efbb4a3b..6178503594c74 100644 --- a/DataFormats/L1TMuon/interface/CPPFDigi.h +++ b/DataFormats/L1TMuon/interface/CPPFDigi.h @@ -23,7 +23,7 @@ namespace l1t { first_strip_(-99), cluster_size_(-99), phi_glob_(-99), - theta_glob_(-99){}; + theta_glob_(-99) {} explicit CPPFDigi(const RPCDetId& rpcId0, int bx0, @@ -39,7 +39,7 @@ namespace l1t { float phi_glob0, float theta_glob0); - virtual ~CPPFDigi(){}; + virtual ~CPPFDigi() {} virtual CPPFDigi* clone() const; diff --git a/DataFormats/L1TMuon/interface/EMTF/AMC13Header.h b/DataFormats/L1TMuon/interface/EMTF/AMC13Header.h index f05a7ae88fdf6..212d1457229f2 100644 --- a/DataFormats/L1TMuon/interface/EMTF/AMC13Header.h +++ b/DataFormats/L1TMuon/interface/EMTF/AMC13Header.h @@ -26,7 +26,7 @@ namespace l1t { h(-99), x(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} // Fill constructor AMC13Header(int int_orn, @@ -52,9 +52,9 @@ namespace l1t { h(int_h), x(int_x), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~AMC13Header(){}; + virtual ~AMC13Header() {} void set_orn(int bits) { orn = bits; } void set_lv1_id(int bits) { lv1_id = bits; } @@ -100,7 +100,7 @@ namespace l1t { uint64_t dataword; }; // End class AMC13Header - } // End namespace emtf + } // End namespace emtf } // End namespace l1t #endif /* define __l1t_emtf_AMC13Header_h__ */ diff --git a/DataFormats/L1TMuon/interface/EMTF/AMC13Trailer.h b/DataFormats/L1TMuon/interface/EMTF/AMC13Trailer.h index 55e665e0ff5cf..ba378899d20ab 100644 --- a/DataFormats/L1TMuon/interface/EMTF/AMC13Trailer.h +++ b/DataFormats/L1TMuon/interface/EMTF/AMC13Trailer.h @@ -22,9 +22,9 @@ namespace l1t { t(-99), r(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~AMC13Trailer(){}; + virtual ~AMC13Trailer() {} void set_evt_lgth(int bits) { evt_lgth = bits; } void set_crc16(int bits) { crc16 = bits; } @@ -61,7 +61,7 @@ namespace l1t { uint64_t dataword; }; // End class AMC13Trailer - } // End namespace emtf + } // End namespace emtf } // End namespace l1t #endif /* define __l1t_emtf_AMC13Trailer_h__ */ diff --git a/DataFormats/L1TMuon/interface/EMTF/Counters.h b/DataFormats/L1TMuon/interface/EMTF/Counters.h index 8cc8c7a08f5e5..74ed0d1f67ef2 100644 --- a/DataFormats/L1TMuon/interface/EMTF/Counters.h +++ b/DataFormats/L1TMuon/interface/EMTF/Counters.h @@ -76,7 +76,7 @@ namespace l1t { meN_all(-99), me_all(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} Counters(int int_me1a_all, int int_me1b_all, @@ -92,9 +92,9 @@ namespace l1t { me4_all(int_me4_all), meN_all(int_meN_all), me_all(int_me_all), - dataword(-99){}; + dataword(-99) {} - virtual ~Counters(){}; + virtual ~Counters() {} void set_me1a_1(int bits) { me1a_1 = bits; } void set_me1a_2(int bits) { me1a_2 = bits; } diff --git a/DataFormats/L1TMuon/interface/EMTF/EventHeader.h b/DataFormats/L1TMuon/interface/EMTF/EventHeader.h index ba75ad5f97b99..f7998055a1e43 100644 --- a/DataFormats/L1TMuon/interface/EMTF/EventHeader.h +++ b/DataFormats/L1TMuon/interface/EMTF/EventHeader.h @@ -37,9 +37,9 @@ namespace l1t { gem(-99), gem_crc(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~EventHeader(){}; + virtual ~EventHeader() {} void set_l1a(int bits) { l1a = bits; } void set_l1a_BXN(int bits) { l1a_BXN = bits; } @@ -127,7 +127,7 @@ namespace l1t { uint64_t dataword; }; // End of class EventHeader - } // End of namespace emtf + } // End of namespace emtf } // End of namespace l1t #endif /* define __l1t_emtf_EventHeader_h__ */ diff --git a/DataFormats/L1TMuon/interface/EMTF/EventTrailer.h b/DataFormats/L1TMuon/interface/EMTF/EventTrailer.h index 9e342278e6549..234950dfd3531 100644 --- a/DataFormats/L1TMuon/interface/EMTF/EventTrailer.h +++ b/DataFormats/L1TMuon/interface/EMTF/EventTrailer.h @@ -27,9 +27,9 @@ namespace l1t { lfff(-99), bb(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~EventTrailer(){}; + virtual ~EventTrailer() {} void set_crc22(int bits) { crc22 = bits; } void set_lp(int bits) { lp = bits; } @@ -87,7 +87,7 @@ namespace l1t { uint64_t dataword; }; // End of class EventTrailer - } // End of namespace emtf + } // End of namespace emtf } // End of namespace l1t #endif /* define __l1t_emtf_EventTrailer_h__ */ diff --git a/DataFormats/L1TMuon/interface/EMTF/GEM.h b/DataFormats/L1TMuon/interface/EMTF/GEM.h index 432fbfcfc0902..3c799e6e67280 100644 --- a/DataFormats/L1TMuon/interface/EMTF/GEM.h +++ b/DataFormats/L1TMuon/interface/EMTF/GEM.h @@ -23,7 +23,7 @@ namespace l1t { tbin(-99), vp(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} virtual ~GEM() = default; diff --git a/DataFormats/L1TMuon/interface/EMTF/ME.h b/DataFormats/L1TMuon/interface/EMTF/ME.h index 9f26f93f4cb32..64a474a743fb7 100644 --- a/DataFormats/L1TMuon/interface/EMTF/ME.h +++ b/DataFormats/L1TMuon/interface/EMTF/ME.h @@ -46,9 +46,9 @@ namespace l1t { // metadata stub_num(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~ME(){}; + virtual ~ME() {} void set_wire(int bits) { wire = bits; } void set_quality(int bits) { quality = bits; } diff --git a/DataFormats/L1TMuon/interface/EMTF/MTF7Header.h b/DataFormats/L1TMuon/interface/EMTF/MTF7Header.h index 0cc60a624022e..efb8cc9ee123b 100644 --- a/DataFormats/L1TMuon/interface/EMTF/MTF7Header.h +++ b/DataFormats/L1TMuon/interface/EMTF/MTF7Header.h @@ -21,9 +21,9 @@ namespace l1t { data_length(-99), user_id(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~MTF7Header(){}; + virtual ~MTF7Header() {} void set_amc_number(int bits) { amc_number = bits; } void set_bx_id(int bits) { bx_id = bits; } @@ -57,7 +57,7 @@ namespace l1t { uint64_t dataword; }; // End class MTF7Header - } // End namespace emtf + } // End namespace emtf } // End namespace l1t #endif /* define __l1t_emtf_MTF7Header_h__ */ diff --git a/DataFormats/L1TMuon/interface/EMTF/MTF7Trailer.h b/DataFormats/L1TMuon/interface/EMTF/MTF7Trailer.h index f918152d9a3c1..ddffcac940822 100644 --- a/DataFormats/L1TMuon/interface/EMTF/MTF7Trailer.h +++ b/DataFormats/L1TMuon/interface/EMTF/MTF7Trailer.h @@ -12,9 +12,9 @@ namespace l1t { public: explicit MTF7Trailer(uint64_t dataword); - MTF7Trailer() : crc_32(-99), lv1_id(-99), data_length(-99), format_errors(0), dataword(-99){}; + MTF7Trailer() : crc_32(-99), lv1_id(-99), data_length(-99), format_errors(0), dataword(-99) {} - virtual ~MTF7Trailer(){}; + virtual ~MTF7Trailer() {} void set_crc_32(int bits) { crc_32 = bits; } void set_lv1_id(int bits) { lv1_id = bits; } @@ -36,7 +36,7 @@ namespace l1t { uint64_t dataword; }; // End class MTF7Trailer - } // End namespace emtf + } // End namespace emtf } // End namespace l1t #endif /* define __l1t_emtf_MTF7Trailer_h__ */ diff --git a/DataFormats/L1TMuon/interface/EMTF/RPC.h b/DataFormats/L1TMuon/interface/EMTF/RPC.h index b170fd442c235..6606b225a7485 100644 --- a/DataFormats/L1TMuon/interface/EMTF/RPC.h +++ b/DataFormats/L1TMuon/interface/EMTF/RPC.h @@ -23,9 +23,9 @@ namespace l1t { tbin(-99), vp(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~RPC(){}; + virtual ~RPC() {} void set_phi(int bits) { phi = bits; } void set_theta(int bits) { theta = bits; } diff --git a/DataFormats/L1TMuon/interface/EMTF/SP.h b/DataFormats/L1TMuon/interface/EMTF/SP.h index 0c73614ecf71b..8115751f1596d 100644 --- a/DataFormats/L1TMuon/interface/EMTF/SP.h +++ b/DataFormats/L1TMuon/interface/EMTF/SP.h @@ -46,9 +46,9 @@ namespace l1t { nn_pt_valid(-99), pt_LUT_addr(-99), format_errors(0), - dataword(-99){}; + dataword(-99) {} - virtual ~SP(){}; + virtual ~SP() {} void set_hl(int bits) { hl = bits; } void set_c(int bits) { c = bits; } diff --git a/DataFormats/L1TMuon/interface/EMTFDaqOut.h b/DataFormats/L1TMuon/interface/EMTFDaqOut.h index 45505b0a6477e..054b68b5f0747 100644 --- a/DataFormats/L1TMuon/interface/EMTFDaqOut.h +++ b/DataFormats/L1TMuon/interface/EMTFDaqOut.h @@ -39,14 +39,14 @@ namespace l1t { hasMTF7Trailer(false), hasAMC13Trailer(false), format_errors(0), - dataword(-99){}; + dataword(-99) {} /* // Fill constructor - should we included a copy constructor for classes and collections (vectors)? - AWB 28.01.16 */ /* EMTFDaqOut(emtf::AMC13Header class_AMC13Header, emtf::SPCollection coll_SPCollection) : */ /* AMC13Header(class_AMC13Header), SPCollection(coll_SPCollection), format_errors(0), dataword(-99) */ /* {}; */ - virtual ~EMTFDaqOut(){}; + virtual ~EMTFDaqOut() {} void set_AMC13Header(emtf::AMC13Header bits) { AMC13Header = bits; diff --git a/DataFormats/L1TMuon/interface/EMTFHit.h b/DataFormats/L1TMuon/interface/EMTFHit.h index b2f1d33247fc6..00a12df3f8643 100644 --- a/DataFormats/L1TMuon/interface/EMTFHit.h +++ b/DataFormats/L1TMuon/interface/EMTFHit.h @@ -88,9 +88,9 @@ namespace l1t { rho_sim(-99), z_sim(-99), alct_quality(-99), - clct_quality(-99){}; + clct_quality(-99) {} - virtual ~EMTFHit(){}; + virtual ~EMTFHit() {} CSCDetId CreateCSCDetId() const; RPCDetId CreateRPCDetId() const; diff --git a/DataFormats/L1TMuon/interface/EMTFRoad.h b/DataFormats/L1TMuon/interface/EMTFRoad.h index e3fc63bb64277..771702215f564 100644 --- a/DataFormats/L1TMuon/interface/EMTFRoad.h +++ b/DataFormats/L1TMuon/interface/EMTFRoad.h @@ -19,9 +19,9 @@ namespace l1t { straightness(-99), layer_code(-99), quality_code(-99), - winner(-99){}; + winner(-99) {} - virtual ~EMTFRoad(){}; + virtual ~EMTFRoad() {} void set_endcap(int bits) { endcap = bits; } void set_sector(int bits) { sector = bits; } diff --git a/DataFormats/L1TMuon/interface/EMTFTrack.h b/DataFormats/L1TMuon/interface/EMTFTrack.h index fe2dd799b9dd5..d96c4fcc41275 100644 --- a/DataFormats/L1TMuon/interface/EMTFTrack.h +++ b/DataFormats/L1TMuon/interface/EMTFTrack.h @@ -82,9 +82,9 @@ namespace l1t { gmt_charge(-99), gmt_charge_valid(-99), track_num(-99), - numHits(-99){}; + numHits(-99) {} - virtual ~EMTFTrack(){}; + virtual ~EMTFTrack() {} void ImportSP(const emtf::SP _SP, int _sector); // void ImportPtLUT( int _mode, unsigned long _address ); diff --git a/DataFormats/L1TMuon/interface/MuonCaloSum.h b/DataFormats/L1TMuon/interface/MuonCaloSum.h index 0904c32b053db..db66a4ff65c33 100644 --- a/DataFormats/L1TMuon/interface/MuonCaloSum.h +++ b/DataFormats/L1TMuon/interface/MuonCaloSum.h @@ -6,11 +6,11 @@ namespace l1t { class MuonCaloSum { public: - MuonCaloSum() : m_etBits(0), m_hwPhi(0), m_hwEta(0), m_index(0){}; + MuonCaloSum() : m_etBits(0), m_hwPhi(0), m_hwEta(0), m_index(0) {} - MuonCaloSum(int pt, int phi, int eta, int index) : m_etBits(pt), m_hwPhi(phi), m_hwEta(eta), m_index(index){}; + MuonCaloSum(int pt, int phi, int eta, int index) : m_etBits(pt), m_hwPhi(phi), m_hwEta(eta), m_index(index) {} - virtual ~MuonCaloSum(){}; + virtual ~MuonCaloSum() {} void setEtBits(int bits) { m_etBits = bits; }; void setPhiBits(int bits) { m_hwPhi = bits; }; diff --git a/DataFormats/L1TMuon/interface/RegionalMuonCand.h b/DataFormats/L1TMuon/interface/RegionalMuonCand.h index c25a5d70cf066..8aa26b1eee5b7 100644 --- a/DataFormats/L1TMuon/interface/RegionalMuonCand.h +++ b/DataFormats/L1TMuon/interface/RegionalMuonCand.h @@ -120,7 +120,7 @@ namespace l1t { setTFIdentifiers(processor, trackFinder); }; - virtual ~RegionalMuonCand(){}; + virtual ~RegionalMuonCand() {} /// Set compressed pT as transmitted by hardware LSB = 0.5 (9 bits) void setHwPt(int bits) { m_hwPt = bits; }; diff --git a/DataFormats/L1TrackTrigger/interface/TTStub.h b/DataFormats/L1TrackTrigger/interface/TTStub.h index 6ef8d1a0ef7b8..3605439090aeb 100644 --- a/DataFormats/L1TrackTrigger/interface/TTStub.h +++ b/DataFormats/L1TrackTrigger/interface/TTStub.h @@ -111,7 +111,7 @@ class TTStub { bool thePSModule; static constexpr float dummyBend = 999999; // Dumy value should be away from potential bends -}; /// Close class +}; /// Close class /*! \brief Implementation of methods * \details Here, in the header file, the methods which do not depend diff --git a/DataFormats/L1Trigger/interface/BxBlock.h b/DataFormats/L1Trigger/interface/BxBlock.h index e6dee18aa148f..291dc10ab50d0 100644 --- a/DataFormats/L1Trigger/interface/BxBlock.h +++ b/DataFormats/L1Trigger/interface/BxBlock.h @@ -9,14 +9,14 @@ namespace l1t { class BxBlockHeader { public: - BxBlockHeader() : id_(0), totalBx_(0), flags_(0){}; + BxBlockHeader() : id_(0), totalBx_(0), flags_(0) {} BxBlockHeader(unsigned int id, unsigned int totalBx, unsigned int flags = 0) - : id_(id), totalBx_(totalBx), flags_(flags){}; + : id_(id), totalBx_(totalBx), flags_(flags) {} // Create a BX header: everything is contained in the raw uint32 BxBlockHeader(const uint32_t raw) : id_(((raw >> id_shift) & id_mask) / n_words), totalBx_(((raw >> totalBx_shift) & totalBx_mask) / n_words), - flags_((raw >> flags_shift) & flags_mask){}; + flags_((raw >> flags_shift) & flags_mask) {} bool operator<(const BxBlockHeader& o) const { return getBx() < o.getBx(); }; @@ -49,20 +49,20 @@ namespace l1t { class BxBlock { public: BxBlock(std::vector::const_iterator bx_start, std::vector::const_iterator bx_end) - : header_(*bx_start), payload_(bx_start + 1, bx_end){}; + : header_(*bx_start), payload_(bx_start + 1, bx_end) {} BxBlock(const BxBlockHeader& h, std::vector::const_iterator payload_start, std::vector::const_iterator payload_end) - : header_(h), payload_(payload_start, payload_end){}; + : header_(h), payload_(payload_start, payload_end) {} BxBlock(unsigned int id, unsigned int totalBx, std::vector::const_iterator payload_start, std::vector::const_iterator payload_end, unsigned int flags = 0) - : header_(id, totalBx, flags), payload_(payload_start, payload_end){}; + : header_(id, totalBx, flags), payload_(payload_start, payload_end) {} BxBlock(unsigned int id, unsigned int totalBx, const std::vector& payload, unsigned int flags = 0) - : header_(id, totalBx, flags), payload_(payload){}; - ~BxBlock(){}; + : header_(id, totalBx, flags), payload_(payload) {} + ~BxBlock() {} bool operator<(const BxBlock& o) const { return header() < o.header(); }; diff --git a/DataFormats/L1Trigger/interface/P2GTCandidate.h b/DataFormats/L1Trigger/interface/P2GTCandidate.h index a0d8867f55554..a9c9e15420f33 100644 --- a/DataFormats/L1Trigger/interface/P2GTCandidate.h +++ b/DataFormats/L1Trigger/interface/P2GTCandidate.h @@ -32,7 +32,7 @@ namespace l1t { typedef ap_int<14> hwEta_t; typedef ap_int<18> hwZ0_t; typedef ap_uint<11> hwIsolationPT_t; - typedef ap_uint<4> hwQualityFlags_t; + typedef ap_uint<6> hwQualityFlags_t; typedef ap_uint<10> hwQualityScore_t; typedef ap_uint<1> hwCharge_t; typedef ap_int<12> hwD0_t; @@ -43,6 +43,7 @@ namespace l1t { typedef ap_int<10> hwSeed_z0_t; typedef ap_uint<16> hwScalarSumPT_t; typedef ap_uint<5> hwNumber_of_tracks_t; + typedef ap_uint<4> hwNumber_of_displaced_tracks_t; typedef ap_uint<12> hwSum_pT_pv_t; typedef ap_uint<2> hwType_t; typedef ap_uint<8> hwNumber_of_tracks_in_pv_t; @@ -117,6 +118,10 @@ namespace l1t { hwNumber_of_tracks_ = hwNumber_of_tracks.to_int(); } + void setHwNumber_of_displaced_tracks(hwNumber_of_displaced_tracks_t hwNumber_of_displaced_tracks) { + hwNumber_of_displaced_tracks_ = hwNumber_of_displaced_tracks.to_int(); + } + void setHwSum_pT_pv(hwSum_pT_pv_t hwSum_pT_pv) { hwSum_pT_pv_ = hwSum_pT_pv.to_int(); } void setHwType(hwType_t hwType) { hwType_ = hwType.to_int(); } void setHwNumber_of_tracks_in_pv(hwNumber_of_tracks_in_pv_t hwNumber_of_tracks_in_pv) { @@ -238,6 +243,13 @@ namespace l1t { return static_cast(hwNumber_of_tracks_); } + hwNumber_of_displaced_tracks_t hwNumber_of_displaced_tracks() const { + if (!hwNumber_of_displaced_tracks_) { + throw std::invalid_argument("Object doesn't have hwNumber_of_displaced_tracks"); + } + return static_cast(hwNumber_of_displaced_tracks_); + } + hwSum_pT_pv_t hwSum_pT_pv() const { if (!hwSum_pT_pv_) { throw std::invalid_argument("Object doesn't have sum_pT_pv"); @@ -285,6 +297,7 @@ namespace l1t { int hwSeed_z0_toInt() const { return hwSeed_z0().to_int(); } int hwScalarSumPT_toInt() const { return hwScalarSumPT().to_int(); } int hwNumber_of_tracks_toInt() const { return hwNumber_of_tracks().to_int(); } + int hwNumber_of_displaced_tracks_toInt() const { return hwNumber_of_displaced_tracks().to_int(); } int hwSum_pT_pv_toInt() const { return hwSum_pT_pv().to_int(); } int hwType_toInt() const { return hwType().to_int(); } int hwNumber_of_tracks_in_pv_toInt() const { return hwNumber_of_tracks_in_pv().to_int(); } @@ -329,6 +342,7 @@ namespace l1t { Optional hwSeed_z0_; Optional hwScalarSumPT_; Optional hwNumber_of_tracks_; + Optional hwNumber_of_displaced_tracks_; // TODO ? Optional hwSum_pT_pv_; diff --git a/DataFormats/L1Trigger/src/P2GTCandidate.cc b/DataFormats/L1Trigger/src/P2GTCandidate.cc index bdee357c39a3e..32480e715e596 100644 --- a/DataFormats/L1Trigger/src/P2GTCandidate.cc +++ b/DataFormats/L1Trigger/src/P2GTCandidate.cc @@ -8,7 +8,8 @@ namespace l1t { hwQualityFlags_ == rhs.hwQualityFlags_ && hwCharge_ == rhs.hwCharge_ && hwD0_ == rhs.hwD0_ && hwBeta_ == rhs.hwBeta_ && hwMass_ == rhs.hwMass_ && hwIndex_ == rhs.hwIndex_ && hwSeed_pT_ == rhs.hwSeed_pT_ && hwSeed_z0_ == rhs.hwSeed_z0_ && hwScalarSumPT_ == rhs.hwScalarSumPT_ && - hwNumber_of_tracks_ == rhs.hwNumber_of_tracks_ && hwSum_pT_pv_ == rhs.hwSum_pT_pv_ && + hwNumber_of_tracks_ == rhs.hwNumber_of_tracks_ && + hwNumber_of_displaced_tracks_ == rhs.hwNumber_of_displaced_tracks_ && hwSum_pT_pv_ == rhs.hwSum_pT_pv_ && hwType_ == rhs.hwType_ && hwNumber_of_tracks_in_pv_ == rhs.hwNumber_of_tracks_in_pv_ && hwNumber_of_tracks_not_in_pv_ == rhs.hwNumber_of_tracks_not_in_pv_; } diff --git a/DataFormats/L1Trigger/src/classes_def.xml b/DataFormats/L1Trigger/src/classes_def.xml index 3b76a6164b287..7afcc79dc8447 100644 --- a/DataFormats/L1Trigger/src/classes_def.xml +++ b/DataFormats/L1Trigger/src/classes_def.xml @@ -16,7 +16,8 @@ - + + @@ -59,7 +60,6 @@ - diff --git a/DataFormats/Math/interface/SSEVec.h b/DataFormats/Math/interface/SSEVec.h index d06cc7f4b07e4..6c6aaef980249 100644 --- a/DataFormats/Math/interface/SSEVec.h +++ b/DataFormats/Math/interface/SSEVec.h @@ -2,7 +2,7 @@ #define DataFormat_Math_SSEVec_H #if !defined(__arm__) && !defined(__aarch64__) && !defined(__MIC__) && !defined(__powerpc64__) && \ - !defined(__PPC64__) && !defined(__powerpc__) && !defined(__NVCC__) + !defined(__PPC64__) && !defined(__powerpc__) && !defined(__NVCC__) && !defined(__riscv) #if defined(__GNUC__) #include #define CMS_USE_SSE diff --git a/DataFormats/Math/interface/approx_math.h b/DataFormats/Math/interface/approx_math.h index ae13b9dabf123..186af772ff2e8 100644 --- a/DataFormats/Math/interface/approx_math.h +++ b/DataFormats/Math/interface/approx_math.h @@ -10,8 +10,8 @@ namespace approx_math { // not c++ compliant (only C compliant) // to be c++ compliaint one must use memcpy... union binary32 { - constexpr binary32() : ui32(0){}; - constexpr binary32(float ff) : f(ff){}; + constexpr binary32() : ui32(0) {} + constexpr binary32(float ff) : f(ff) {} constexpr binary32(int32_t ii) : i32(ii) {} constexpr binary32(uint32_t ui) : ui32(ui) {} diff --git a/DataFormats/Math/src/SSEVec.cc b/DataFormats/Math/src/SSEVec.cc index f92b206218d4a..f60e3298712cc 100644 --- a/DataFormats/Math/src/SSEVec.cc +++ b/DataFormats/Math/src/SSEVec.cc @@ -1,5 +1,5 @@ #if !defined(__arm__) && !defined(__aarch64__) && !defined(__MIC__) && !defined(__powerpc64__) && \ - !defined(__PPC64__) && !defined(__powerpc__) + !defined(__PPC64__) && !defined(__powerpc__) && !defined(__riscv) #include "DataFormats/Math/interface/SSEVec.h" #include "DataFormats/Math/interface/SSERot.h" using namespace mathSSE; diff --git a/DataFormats/Math/src/classes.h b/DataFormats/Math/src/classes.h index 35980108b56d6..6e46309aad385 100644 --- a/DataFormats/Math/src/classes.h +++ b/DataFormats/Math/src/classes.h @@ -1,7 +1,4 @@ -#define G__DICTIONARY - #define SMATRIX_USE_CONSTEXPR -#include #include #include "DataFormats/Math/interface/LorentzVector.h" @@ -9,224 +6,11 @@ #include "Math/PxPyPzE4D.h" #include "DataFormats/Math/interface/Vector3D.h" #include "Math/Cartesian3D.h" -#include "Math/Polar3D.h" -#include "Math/CylindricalEta3D.h" #include "DataFormats/Math/interface/Point3D.h" #include "DataFormats/Math/interface/Vector.h" #include "DataFormats/Math/interface/Error.h" #include "DataFormats/Math/interface/Matrix.h" #include "DataFormats/Math/interface/libminifloat.h" #include "DataFormats/Common/interface/Wrapper.h" -#include "DataFormats/Common/interface/RefVector.h" #include "DataFormats/Common/interface/ValueMap.h" #include - -namespace DataFormats_Math { - struct dictionary { - math::XYZVector v1; - math::XYZVectorD vd1; - math::XYZVectorF vf1; - math::RhoEtaPhiVector v2; - math::RhoEtaPhiVectorD vd2; - math::RhoEtaPhiVectorF vf2; - // math::RThetaPhiVector v3; - // math::RThetaPhiVectorD vd3; - // math::RThetaPhiVectorF vf3; - math::XYZPoint p1; - math::XYZPointD pd1; - math::XYZPointF pf1; - math::PtEtaPhiELorentzVector l1; - math::PtEtaPhiELorentzVectorD ld1; - math::PtEtaPhiELorentzVectorF lf1; - math::PtEtaPhiMLorentzVector l3; - math::PtEtaPhiMLorentzVectorD ld3; - math::PtEtaPhiMLorentzVectorF lf3; - math::XYZTLorentzVector l2; - math::XYZTLorentzVectorD ld2; - math::XYZTLorentzVectorF lf2; - - math::LocalPoint lp1; - math::GlobalPoint gp1; - math::LocalVector lv1; - math::GlobalVector gv1; - - std::vector vv1; - std::vector vvd1; - std::vector vvf1; - std::vector vv2; - std::vector vvd2; - std::vector vvf2; - // std::vector vv3; - // std::vector vvd3; - // std::vector vvf3; - std::vector vp1; - std::vector vpd1; - std::vector vpf1; - std::vector vl1; - std::vector vld1; - std::vector vlf1; - std::vector vl3; - std::vector vld3; - std::vector vlf3; - std::vector vl2; - std::vector vld2; - std::vector vlf2; - - edm::Wrapper wv1; - edm::Wrapper wvd1; - edm::Wrapper wvf1; - edm::Wrapper wv2; - edm::Wrapper wvd2; - edm::Wrapper wvf2; - // edm::Wrapper wv3; - // edm::Wrapper wvd3; - // edm::Wrapper wvf3; - edm::Wrapper wp1; - edm::Wrapper wpd1; - edm::Wrapper wpf1; - edm::Wrapper wl1; - edm::Wrapper wld1; - edm::Wrapper wlf1; - edm::Wrapper wl3; - edm::Wrapper wld3; - edm::Wrapper wlf3; - edm::Wrapper wl2; - edm::Wrapper wld2; - edm::Wrapper wlf2; - - edm::Wrapper > wvvv1; - edm::Wrapper > wvvd1; - edm::Wrapper > wvvf1; - edm::Wrapper > wvv2; - edm::Wrapper > wvvd2; - edm::Wrapper > wvvf2; - // edm::Wrapper > wvv3; - // edm::Wrapper > wvvd3; - // edm::Wrapper > wvvf3; - edm::Wrapper > wvp1; - edm::Wrapper > wvpd1; - edm::Wrapper > wvpf1; - edm::Wrapper > wvl1; - edm::Wrapper > wvld1; - edm::Wrapper > wvlf1; - edm::Wrapper > wvl3; - edm::Wrapper > wvld3; - edm::Wrapper > wvlf3; - edm::Wrapper > wvl2; - edm::Wrapper > wvld2; - edm::Wrapper > wvlf2; - - // math::Vector<1>::type vV1; - math::Vector<2>::type vV2; - math::Vector<3>::type vV3; - math::Vector<4>::type vV4; - math::Vector<5>::type vV5; - math::Vector<6>::type vV6; - // math::VectorD<1>::type vVd1; - math::VectorD<2>::type vVd2; - math::VectorD<3>::type vVd3; - math::VectorD<4>::type vVd4; - math::VectorD<5>::type vVd5; - math::VectorD<6>::type vVd6; - // math::VectorF<1>::type vVf1; - math::VectorF<2>::type vVf2; - math::VectorF<3>::type vVf3; - math::VectorF<4>::type vVf4; - math::VectorF<5>::type vVf5; - math::VectorF<6>::type vVf6; - math::VectorF<7>::type vVf7; - - // math::Error<1>::type e1; - math::Error<2>::type e2; - math::Error<3>::type e3; - math::Error<4>::type e4; - math::Error<5>::type e5; - math::Error<6>::type e6; - math::Error<7>::type e7; - - // math::ErrorD<1>::type ed1; - math::ErrorD<2>::type ed2; - math::ErrorD<3>::type ed3; - math::ErrorD<4>::type ed4; - math::ErrorD<5>::type ed5; - math::ErrorD<6>::type ed6; - // math::ErrorF<1>::type ef1; - math::ErrorF<2>::type ef2; - math::ErrorF<3>::type ef3; - math::ErrorF<4>::type ef4; - math::ErrorF<5>::type ef5; - math::ErrorF<6>::type ef6; - math::ErrorF<7>::type ef7; - - // std::vector::type> ve1; - std::vector::type> ve2; - std::vector::type> ve3; - std::vector::type> ve4; - std::vector::type> ve5; - std::vector::type> ve6; - std::vector::type> ve7; - - // edm::Wrapper::type> we1; - edm::Wrapper::type> we2; - edm::Wrapper::type> we3; - edm::Wrapper::type> we4; - edm::Wrapper::type> we5; - edm::Wrapper::type> we6; - edm::Wrapper::type> we7; - - // edm::Wrapper::type> > wve1; - edm::Wrapper::type> > wve2; - edm::Wrapper::type> > wve3; - edm::Wrapper::type> > wve4; - edm::Wrapper::type> > wve5; - edm::Wrapper::type> > wve6; - edm::Wrapper::type> > wve7; - - edm::RefVector > rvl2; - edm::RefVector > rvld2; - edm::RefVector > rvlf2; - - // ROOT::Math::MatRepSym sm1; - ROOT::Math::MatRepSym sm2; - ROOT::Math::MatRepSym sm3; - ROOT::Math::MatRepSym sm4; - ROOT::Math::MatRepSym sm5; - ROOT::Math::MatRepSym sm6; - ROOT::Math::MatRepSym sm7; - // ROOT::Math::MatRepSym smd1; - ROOT::Math::MatRepSym smd2; - ROOT::Math::MatRepSym smd3; - ROOT::Math::MatRepSym smd4; - ROOT::Math::MatRepSym smd5; - ROOT::Math::MatRepSym smd6; - ROOT::Math::MatRepSym smd7; - // ROOT::Math::MatRepSym smf1; - ROOT::Math::MatRepSym smf2; - ROOT::Math::MatRepSym smf3; - ROOT::Math::MatRepSym smf4; - ROOT::Math::MatRepSym smf5; - ROOT::Math::MatRepSym smf6; - ROOT::Math::MatRepSym smf7; - - //Used by ECAL Weights reconstruction - //Used by ECAL Weights reconstruction - math::Matrix<3, 10>::type mw; - math::Matrix<10, 10>::type mcw; - math::Matrix<2, 3>::type mw1; - ROOT::Math::MatRepStd smdw; - ROOT::Math::MatRepStd smdcw; - ROOT::Math::MatRepStd smdcw1; - - //Used by TauReco - // std::pair,ROOT::Math::DefaultCoordinateSystemTag>,float> calotti_ppf; - std::vector< - std::pair, ROOT::Math::DefaultCoordinateSystemTag>, - float> > - vcalotti_ppf; - - // Used by CommonTools/PileupModules - edm::ValueMap vmp4; - edm::Wrapper > wvmp4; - }; - MiniFloatConverter::ReduceMantissaToNbitsRounding red(12); -} // namespace DataFormats_Math diff --git a/DataFormats/Math/src/classes_def.xml b/DataFormats/Math/src/classes_def.xml index 6b3d3bc903796..8bcb6fc10fe0b 100755 --- a/DataFormats/Math/src/classes_def.xml +++ b/DataFormats/Math/src/classes_def.xml @@ -5,84 +5,35 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DataFormats/Math/test/rdtscp.h b/DataFormats/Math/test/rdtscp.h index 1191351bc7903..49c063bf90984 100644 --- a/DataFormats/Math/test/rdtscp.h +++ b/DataFormats/Math/test/rdtscp.h @@ -2,7 +2,7 @@ #define RDPSCP_H // performance test #if !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc64__) && !defined(__PPC64__) && \ - !defined(__powerpc__) + !defined(__powerpc__) && !defined(__riscv) #include #include #ifdef __clang__ diff --git a/DataFormats/MuonDetId/interface/CSCIndexer.h b/DataFormats/MuonDetId/interface/CSCIndexer.h index 1e75af13d7655..592a9d72ef481 100644 --- a/DataFormats/MuonDetId/interface/CSCIndexer.h +++ b/DataFormats/MuonDetId/interface/CSCIndexer.h @@ -48,8 +48,8 @@ class CSCIndexer { typedef uint16_t IndexType; typedef uint32_t LongIndexType; - CSCIndexer(){}; - ~CSCIndexer(){}; + CSCIndexer() {} + ~CSCIndexer() {} /** * Linear index to label each CSC in CSC system. diff --git a/DataFormats/MuonReco/interface/MuonIsolation.h b/DataFormats/MuonReco/interface/MuonIsolation.h index 7d88473a569f0..bc2a3d269bfa3 100644 --- a/DataFormats/MuonReco/interface/MuonIsolation.h +++ b/DataFormats/MuonReco/interface/MuonIsolation.h @@ -23,7 +23,7 @@ namespace reco { trackerVetoPt(0), emVetoEt(0), hadVetoEt(0), - hoVetoEt(0){}; + hoVetoEt(0) {} }; } // namespace reco #endif diff --git a/DataFormats/MuonReco/interface/MuonTrackLinks.h b/DataFormats/MuonReco/interface/MuonTrackLinks.h index aa0891ba536a8..4e2d08cd17320 100644 --- a/DataFormats/MuonReco/interface/MuonTrackLinks.h +++ b/DataFormats/MuonReco/interface/MuonTrackLinks.h @@ -23,7 +23,7 @@ namespace reco { : theTkTrack(tk), theStaTrack(sta), theGlbTrack(glb) {} /// Destructor - virtual ~MuonTrackLinks(){}; + virtual ~MuonTrackLinks() {} // Operations diff --git a/DataFormats/MuonReco/src/MuonSelectors.cc b/DataFormats/MuonReco/src/MuonSelectors.cc index 6037edb0ed2a5..6922816b1db9b 100644 --- a/DataFormats/MuonReco/src/MuonSelectors.cc +++ b/DataFormats/MuonReco/src/MuonSelectors.cc @@ -1002,10 +1002,10 @@ int muon::sharedSegments(const reco::Muon& mu, const reco::Muon& mu2, unsigned i (segmentMatch->dtSegmentRef.isNonnull() && segmentMatch->dtSegmentRef == segmentMatch2->dtSegmentRef)) { ++ret; } // is the same - } // segment of mu2 in chamber - } // segment of mu1 in chamber - } // chamber of mu2 - } // chamber of mu1 + } // segment of mu2 in chamber + } // segment of mu1 in chamber + } // chamber of mu2 + } // chamber of mu1 return ret; } diff --git a/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h b/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h index 860f20bdd2331..2dbc8622b6467 100644 --- a/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h +++ b/DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h @@ -32,7 +32,7 @@ class L2MuonTrajectorySeed : public TrajectorySeed { l1t::MuonRef l1Ref); /// Destructor - ~L2MuonTrajectorySeed() override{}; + ~L2MuonTrajectorySeed() override {} // Operations diff --git a/DataFormats/MuonSeed/interface/L3MuonTrajectorySeed.h b/DataFormats/MuonSeed/interface/L3MuonTrajectorySeed.h index 33a7082e38d0c..d85ef0d1b6fdd 100644 --- a/DataFormats/MuonSeed/interface/L3MuonTrajectorySeed.h +++ b/DataFormats/MuonSeed/interface/L3MuonTrajectorySeed.h @@ -31,7 +31,7 @@ class L3MuonTrajectorySeed : public TrajectorySeed { : TrajectorySeed(base), theL2Track(l2Ref) {} /// Destructor - ~L3MuonTrajectorySeed() override{}; + ~L3MuonTrajectorySeed() override {} //accessors diff --git a/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp b/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp index ccbb5241598de..45abddbb0c904 100644 --- a/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp +++ b/DataFormats/OnlineMetaData/test/onlineMetaDataRecord_t.cpp @@ -24,7 +24,7 @@ class TestOnlineMetaDataRecord : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE_END(); public: - void setUp() override{}; + void setUp() override {} void tearDown() override; void testDCSRecord_v1(); diff --git a/DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h b/DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h index 2cb1a0a27c4a7..2ddd6cc352b21 100644 --- a/DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h +++ b/DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h @@ -23,7 +23,7 @@ namespace reco { */ class GsfPFRecTrack : public PFRecTrack { public: - GsfPFRecTrack(){}; + GsfPFRecTrack() {} GsfPFRecTrack(double charge, AlgoType_t algoType, int trackId, diff --git a/DataFormats/ParticleFlowReco/interface/PFRecTrack.h b/DataFormats/ParticleFlowReco/interface/PFRecTrack.h index 50041402c942f..f54e4ffc8b392 100644 --- a/DataFormats/ParticleFlowReco/interface/PFRecTrack.h +++ b/DataFormats/ParticleFlowReco/interface/PFRecTrack.h @@ -28,7 +28,7 @@ namespace reco { }; PFRecTrack(); - ~PFRecTrack(){}; + ~PFRecTrack() {} PFRecTrack(double charge, AlgoType_t algoType, int trackId, const reco::TrackRef& trackref); PFRecTrack(double charge, AlgoType_t algoType); diff --git a/DataFormats/ParticleFlowReco/interface/PFV0.h b/DataFormats/ParticleFlowReco/interface/PFV0.h index e99719778086a..9253feb8bb67e 100644 --- a/DataFormats/ParticleFlowReco/interface/PFV0.h +++ b/DataFormats/ParticleFlowReco/interface/PFV0.h @@ -25,7 +25,7 @@ namespace reco { : originalV0_(V0), pfTracks_(pftr), tracks_(tr) {} /// destructor - ~PFV0(){}; + ~PFV0() {} /// Ref to the original V0 const reco::VertexCompositeCandidateRef& originalV0() const { return originalV0_; } diff --git a/DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h b/DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h index d08b4ffab7c76..f2de62cbb77e6 100644 --- a/DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h +++ b/DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h @@ -23,8 +23,8 @@ namespace pftools { */ class ParticleFiltrationDecision { public: - ParticleFiltrationDecision(){}; - virtual ~ParticleFiltrationDecision(){}; + ParticleFiltrationDecision() {} + virtual ~ParticleFiltrationDecision() {} /* Bit field to contain user-defined vetos */ char vetosPassed_; diff --git a/DataFormats/ParticleFlowReco/src/classes_def_2.xml b/DataFormats/ParticleFlowReco/src/classes_def_2.xml index 6c40541360768..c44815103465a 100644 --- a/DataFormats/ParticleFlowReco/src/classes_def_2.xml +++ b/DataFormats/ParticleFlowReco/src/classes_def_2.xml @@ -149,7 +149,7 @@ - + diff --git a/DataFormats/PatCandidates/interface/JetCorrFactors.h b/DataFormats/PatCandidates/interface/JetCorrFactors.h index 534ab7db844ff..81c325b6b84c9 100644 --- a/DataFormats/PatCandidates/interface/JetCorrFactors.h +++ b/DataFormats/PatCandidates/interface/JetCorrFactors.h @@ -49,7 +49,7 @@ namespace pat { public: // default Constructor - JetCorrFactors(){}; + JetCorrFactors() {} // constructor by value JetCorrFactors(const std::string& label, const std::vector& jec); // add correction factor diff --git a/DataFormats/PatCandidates/interface/ParametrizationHelper.h b/DataFormats/PatCandidates/interface/ParametrizationHelper.h index abe7a06dc80bb..c8dbe91ef6164 100644 --- a/DataFormats/PatCandidates/interface/ParametrizationHelper.h +++ b/DataFormats/PatCandidates/interface/ParametrizationHelper.h @@ -101,7 +101,7 @@ namespace pat { const AlgebraicVector4 &v4, const math::PtEtaPhiMLorentzVector &initialP4); } // namespace ParametrizationHelper - } // namespace helper + } // namespace helper } // namespace pat #endif diff --git a/DataFormats/PatCandidates/interface/ResolutionHelper.h b/DataFormats/PatCandidates/interface/ResolutionHelper.h index fb2bbccf7c8e1..8dd9fefd45a9f 100644 --- a/DataFormats/PatCandidates/interface/ResolutionHelper.h +++ b/DataFormats/PatCandidates/interface/ResolutionHelper.h @@ -46,7 +46,7 @@ namespace pat { const AlgebraicSymMatrix44 &covariance, const pat::CandKinResolution::LorentzVector &p4); } // namespace ResolutionHelper - } // namespace helper + } // namespace helper } // namespace pat #endif diff --git a/DataFormats/PatCandidates/interface/TauJetCorrFactors.h b/DataFormats/PatCandidates/interface/TauJetCorrFactors.h index bee2f50b86011..430bdebe75502 100644 --- a/DataFormats/PatCandidates/interface/TauJetCorrFactors.h +++ b/DataFormats/PatCandidates/interface/TauJetCorrFactors.h @@ -36,7 +36,7 @@ namespace pat { public: // default Constructor - TauJetCorrFactors(){}; + TauJetCorrFactors() {} // constructor by value TauJetCorrFactors(const std::string& label, const std::vector& jec); diff --git a/DataFormats/PatCandidates/interface/TriggerAlgorithm.h b/DataFormats/PatCandidates/interface/TriggerAlgorithm.h index 06d92b90cb228..4724c7a92a7e9 100644 --- a/DataFormats/PatCandidates/interface/TriggerAlgorithm.h +++ b/DataFormats/PatCandidates/interface/TriggerAlgorithm.h @@ -82,7 +82,7 @@ namespace pat { bool decisionAfterMask); /// Destructor - virtual ~TriggerAlgorithm(){}; + virtual ~TriggerAlgorithm() {} /// Methods diff --git a/DataFormats/PatCandidates/interface/TriggerCondition.h b/DataFormats/PatCandidates/interface/TriggerCondition.h index 84c0d1b0fa0fa..82a1c37334887 100644 --- a/DataFormats/PatCandidates/interface/TriggerCondition.h +++ b/DataFormats/PatCandidates/interface/TriggerCondition.h @@ -61,7 +61,7 @@ namespace pat { TriggerCondition(const std::string& name, bool accept); /// Destructor - virtual ~TriggerCondition(){}; + virtual ~TriggerCondition() {} /// Methods diff --git a/DataFormats/PatCandidates/interface/TriggerEvent.h b/DataFormats/PatCandidates/interface/TriggerEvent.h index 71af97f1e78ad..4518854967b6a 100644 --- a/DataFormats/PatCandidates/interface/TriggerEvent.h +++ b/DataFormats/PatCandidates/interface/TriggerEvent.h @@ -105,7 +105,7 @@ namespace pat { bool physDecl = true); /// Destructor - virtual ~TriggerEvent(){}; + virtual ~TriggerEvent() {} /// Methods diff --git a/DataFormats/PatCandidates/interface/TriggerFilter.h b/DataFormats/PatCandidates/interface/TriggerFilter.h index 0d635fe36378d..546a9e80a4ad2 100644 --- a/DataFormats/PatCandidates/interface/TriggerFilter.h +++ b/DataFormats/PatCandidates/interface/TriggerFilter.h @@ -61,7 +61,7 @@ namespace pat { TriggerFilter(const edm::InputTag& tag, int status = -1, bool saveTags = false); /// Destructor - virtual ~TriggerFilter(){}; + virtual ~TriggerFilter() {} /// Methods diff --git a/DataFormats/PatCandidates/interface/TriggerObject.h b/DataFormats/PatCandidates/interface/TriggerObject.h index 4ac711b365b6b..c165c8cc0af5e 100644 --- a/DataFormats/PatCandidates/interface/TriggerObject.h +++ b/DataFormats/PatCandidates/interface/TriggerObject.h @@ -71,7 +71,7 @@ namespace pat { TriggerObject(const reco::Particle::PolarLorentzVector& vec, int id = 0); /// Destructor - ~TriggerObject() override{}; + ~TriggerObject() override {} /// Methods diff --git a/DataFormats/PatCandidates/interface/TriggerObjectStandAlone.h b/DataFormats/PatCandidates/interface/TriggerObjectStandAlone.h index f2ec220468070..7935ae9e6e4eb 100644 --- a/DataFormats/PatCandidates/interface/TriggerObjectStandAlone.h +++ b/DataFormats/PatCandidates/interface/TriggerObjectStandAlone.h @@ -111,7 +111,7 @@ namespace pat { TriggerObjectStandAlone(const TriggerObjectStandAlone &) = default; /// Destructor - ~TriggerObjectStandAlone() override{}; + ~TriggerObjectStandAlone() override {} /// Methods diff --git a/DataFormats/PatCandidates/src/PATTauDiscriminator.cc b/DataFormats/PatCandidates/src/PATTauDiscriminator.cc index 1496aa94f7bdb..a57223071210e 100644 --- a/DataFormats/PatCandidates/src/PATTauDiscriminator.cc +++ b/DataFormats/PatCandidates/src/PATTauDiscriminator.cc @@ -1,3 +1,3 @@ #include "DataFormats/PatCandidates/interface/PATTauDiscriminator.h" -pat::PATTauDiscriminator::PATTauDiscriminator() : PATTauDiscriminatorBase(){}; +pat::PATTauDiscriminator::PATTauDiscriminator() : PATTauDiscriminatorBase() {} diff --git a/DataFormats/PatCandidates/src/classes_def_user.xml b/DataFormats/PatCandidates/src/classes_def_user.xml index 7c5a7797821a7..8d5ae8a978b59 100644 --- a/DataFormats/PatCandidates/src/classes_def_user.xml +++ b/DataFormats/PatCandidates/src/classes_def_user.xml @@ -6,7 +6,7 @@ - + diff --git a/DataFormats/Portable/interface/PortableDeviceCollection.h b/DataFormats/Portable/interface/PortableDeviceCollection.h index 38e1c90c9a37d..4634374cc2d22 100644 --- a/DataFormats/Portable/interface/PortableDeviceCollection.h +++ b/DataFormats/Portable/interface/PortableDeviceCollection.h @@ -70,6 +70,12 @@ class PortableDeviceCollection { ConstBuffer buffer() const { return *buffer_; } ConstBuffer const_buffer() const { return *buffer_; } + // erases the data in the Buffer by writing zeros (bytes containing '\0') to it + template >> + void zeroInitialise(TQueue&& queue) { + alpaka::memset(std::forward(queue), *buffer_, 0x00); + } + private: std::optional buffer_; //! Layout layout_; // @@ -275,7 +281,13 @@ class PortableDeviceMultiCollection { ConstBuffer buffer() const { return *buffer_; } ConstBuffer const_buffer() const { return *buffer_; } - // Extract the sizes array + // erases the data in the Buffer by writing zeros (bytes containing '\0') to it + template >> + void zeroInitialise(TQueue&& queue) { + alpaka::memset(std::forward(queue), *buffer_, 0x00); + } + + // extract the sizes array SizesArray sizes() const { SizesArray ret; portablecollection::constexpr_for<0, members_>([&](auto i) { ret[i] = get().layout_.metadata().size(); }); diff --git a/DataFormats/Portable/interface/PortableDeviceObject.h b/DataFormats/Portable/interface/PortableDeviceObject.h index 72e12bbdfe80c..9ae0dd529713b 100644 --- a/DataFormats/Portable/interface/PortableDeviceObject.h +++ b/DataFormats/Portable/interface/PortableDeviceObject.h @@ -50,9 +50,11 @@ class PortableDeviceObject { // access the product Product& value() { return *buffer_->data(); } Product const& value() const { return *buffer_->data(); } + Product const& const_value() const { return *buffer_->data(); } Product* data() { return buffer_->data(); } Product const* data() const { return buffer_->data(); } + Product const* const_data() const { return buffer_->data(); } Product& operator*() { return *buffer_->data(); } Product const& operator*() const { return *buffer_->data(); } @@ -65,6 +67,12 @@ class PortableDeviceObject { ConstBuffer buffer() const { return *buffer_; } ConstBuffer const_buffer() const { return *buffer_; } + // erases the data in the Buffer by writing zeros (bytes containing '\0') to it + template >> + void zeroInitialise(TQueue&& queue) { + alpaka::memset(std::forward(queue), *buffer_, 0x00); + } + private: std::optional buffer_; }; diff --git a/DataFormats/Portable/interface/PortableHostCollection.h b/DataFormats/Portable/interface/PortableHostCollection.h index 61dde4c58f425..647ddb8648281 100644 --- a/DataFormats/Portable/interface/PortableHostCollection.h +++ b/DataFormats/Portable/interface/PortableHostCollection.h @@ -69,6 +69,16 @@ class PortableHostCollection { ConstBuffer buffer() const { return *buffer_; } ConstBuffer const_buffer() const { return *buffer_; } + // erases the data in the Buffer by writing zeros (bytes containing '\0') to it + void zeroInitialise() { + std::memset(std::data(*buffer_), 0x00, alpaka::getExtentProduct(*buffer_) * sizeof(std::byte)); + } + + template >> + void zeroInitialise(TQueue&& queue) { + alpaka::memset(std::forward(queue), *buffer_, 0x00); + } + // part of the ROOT read streamer static void ROOTReadStreamer(PortableHostCollection* newObj, Layout& layout) { // destroy the default-constructed collection @@ -278,12 +288,23 @@ class PortableHostMultiCollection { ConstBuffer buffer() const { return *buffer_; } ConstBuffer const_buffer() const { return *buffer_; } - // Extract the sizes array + // erases the data in the Buffer by writing zeros (bytes containing '\0') to it + void zeroInitialise() { + std::memset(std::data(*buffer_), 0x00, alpaka::getExtentProduct(*buffer_) * sizeof(std::byte)); + } + + template >> + void zeroInitialise(TQueue&& queue) { + alpaka::memset(std::forward(queue), *buffer_, 0x00); + } + + // extract the sizes array SizesArray sizes() const { SizesArray ret; portablecollection::constexpr_for<0, members_>([&](auto i) { ret[i] = get().layout_.metadata().size(); }); return ret; } + // part of the ROOT read streamer static void ROOTReadStreamer(PortableHostMultiCollection* newObj, Implementation& onfileImpl) { newObj->~PortableHostMultiCollection(); diff --git a/DataFormats/Portable/interface/PortableHostObject.h b/DataFormats/Portable/interface/PortableHostObject.h index 348da4f8c505d..e120101fc1795 100644 --- a/DataFormats/Portable/interface/PortableHostObject.h +++ b/DataFormats/Portable/interface/PortableHostObject.h @@ -48,9 +48,11 @@ class PortableHostObject { // access the product Product& value() { return *product_; } Product const& value() const { return *product_; } + Product const& const_value() const { return *product_; } Product* data() { return product_; } Product const* data() const { return product_; } + Product const* const_data() const { return product_; } Product& operator*() { return *product_; } Product const& operator*() const { return *product_; } @@ -63,6 +65,16 @@ class PortableHostObject { ConstBuffer buffer() const { return *buffer_; } ConstBuffer const_buffer() const { return *buffer_; } + // erases the data in the Buffer by writing zeros (bytes containing '\0') to it + void zeroInitialise() { + std::memset(std::data(*buffer_), 0x00, alpaka::getExtentProduct(*buffer_) * sizeof(std::byte)); + } + + template >> + void zeroInitialise(TQueue&& queue) { + alpaka::memset(std::forward(queue), *buffer_, 0x00); + } + // part of the ROOT read streamer static void ROOTReadStreamer(PortableHostObject* newObj, Product& product) { // destroy the default-constructed object diff --git a/DataFormats/PortableTestObjects/interface/TestProductWithPtr.h b/DataFormats/PortableTestObjects/interface/TestProductWithPtr.h new file mode 100644 index 0000000000000..53a2544bd9702 --- /dev/null +++ b/DataFormats/PortableTestObjects/interface/TestProductWithPtr.h @@ -0,0 +1,48 @@ +#ifndef DataFormats_PortableTest_interface_TestProductWithPtr_h +#define DataFormats_PortableTest_interface_TestProductWithPtr_h + +#include "DataFormats/Portable/interface/PortableCollection.h" +#include "DataFormats/SoATemplate/interface/SoACommon.h" +#include "DataFormats/SoATemplate/interface/SoALayout.h" +#include "DataFormats/SoATemplate/interface/SoAView.h" +#include "HeterogeneousCore/AlpakaInterface/interface/CopyToHost.h" +#include "HeterogeneousCore/AlpakaInterface/interface/CopyToDevice.h" + +#include + +/** + * This data product is part of a test for CopyToHost::postCopy() + * (i.e. updating a data product after the device-to-host copy). For + * any practical purposes the indirection to 'buffer' array via the + * 'ptr' pointer scalar is completely unnecessary. Do not take this + * case as an example for good design of a data product. + */ +namespace portabletest { + GENERATE_SOA_LAYOUT(TestSoALayoutWithPtr, SOA_COLUMN(int, buffer), SOA_SCALAR(int*, ptr)); + using TestSoAWithPtr = TestSoALayoutWithPtr<>; + + template + using TestProductWithPtr = PortableCollection; + + ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE void setPtrInTestProductWithPtr(TestSoAWithPtr::View view) { + view.ptr() = &view.buffer(0); + } +} // namespace portabletest + +namespace cms::alpakatools { + template + struct CopyToHost> { + template + static auto copyAsync(TQueue& queue, PortableDeviceCollection const& src) { + PortableHostCollection dst(src->metadata().size(), queue); + alpaka::memcpy(queue, dst.buffer(), src.buffer()); + return dst; + } + + static void postCopy(PortableHostCollection& dst) { + portabletest::setPtrInTestProductWithPtr(dst.view()); + } + }; +} // namespace cms::alpakatools + +#endif diff --git a/DataFormats/PortableTestObjects/src/alpaka/classes_cuda.h b/DataFormats/PortableTestObjects/src/alpaka/classes_cuda.h index 07a7c0e2991d6..d59f0b52978c5 100644 --- a/DataFormats/PortableTestObjects/src/alpaka/classes_cuda.h +++ b/DataFormats/PortableTestObjects/src/alpaka/classes_cuda.h @@ -1,5 +1,10 @@ +// these first to make sure they get included before any SoA header +#include +#include + #include "DataFormats/Common/interface/DeviceProduct.h" #include "DataFormats/Common/interface/Wrapper.h" +#include "DataFormats/PortableTestObjects/interface/TestProductWithPtr.h" #include "DataFormats/PortableTestObjects/interface/TestSoA.h" #include "DataFormats/PortableTestObjects/interface/TestStruct.h" #include "DataFormats/PortableTestObjects/interface/alpaka/TestDeviceCollection.h" diff --git a/DataFormats/PortableTestObjects/src/alpaka/classes_cuda_def.xml b/DataFormats/PortableTestObjects/src/alpaka/classes_cuda_def.xml index 9e9cc36321fc7..f0eba998f349a 100644 --- a/DataFormats/PortableTestObjects/src/alpaka/classes_cuda_def.xml +++ b/DataFormats/PortableTestObjects/src/alpaka/classes_cuda_def.xml @@ -14,4 +14,8 @@ + + + + diff --git a/DataFormats/PortableTestObjects/src/alpaka/classes_rocm.h b/DataFormats/PortableTestObjects/src/alpaka/classes_rocm.h index 07a7c0e2991d6..d59f0b52978c5 100644 --- a/DataFormats/PortableTestObjects/src/alpaka/classes_rocm.h +++ b/DataFormats/PortableTestObjects/src/alpaka/classes_rocm.h @@ -1,5 +1,10 @@ +// these first to make sure they get included before any SoA header +#include +#include + #include "DataFormats/Common/interface/DeviceProduct.h" #include "DataFormats/Common/interface/Wrapper.h" +#include "DataFormats/PortableTestObjects/interface/TestProductWithPtr.h" #include "DataFormats/PortableTestObjects/interface/TestSoA.h" #include "DataFormats/PortableTestObjects/interface/TestStruct.h" #include "DataFormats/PortableTestObjects/interface/alpaka/TestDeviceCollection.h" diff --git a/DataFormats/PortableTestObjects/src/alpaka/classes_rocm_def.xml b/DataFormats/PortableTestObjects/src/alpaka/classes_rocm_def.xml index 8bc27b95ccb63..5a95874496616 100644 --- a/DataFormats/PortableTestObjects/src/alpaka/classes_rocm_def.xml +++ b/DataFormats/PortableTestObjects/src/alpaka/classes_rocm_def.xml @@ -14,4 +14,8 @@ + + + + diff --git a/DataFormats/PortableTestObjects/src/classes.h b/DataFormats/PortableTestObjects/src/classes.h index c3c2d77702a65..19120cf2ea4b9 100644 --- a/DataFormats/PortableTestObjects/src/classes.h +++ b/DataFormats/PortableTestObjects/src/classes.h @@ -1,5 +1,10 @@ +// these first to make sure they get included before any SoA header +#include +#include + #include "DataFormats/Common/interface/Wrapper.h" #include "DataFormats/PortableTestObjects/interface/TestHostCollection.h" #include "DataFormats/PortableTestObjects/interface/TestHostObject.h" +#include "DataFormats/PortableTestObjects/interface/TestProductWithPtr.h" #include "DataFormats/PortableTestObjects/interface/TestSoA.h" #include "DataFormats/PortableTestObjects/interface/TestStruct.h" diff --git a/DataFormats/PortableTestObjects/src/classes_def.xml b/DataFormats/PortableTestObjects/src/classes_def.xml index 87fbdfc447f80..caafb7f08ea21 100644 --- a/DataFormats/PortableTestObjects/src/classes_def.xml +++ b/DataFormats/PortableTestObjects/src/classes_def.xml @@ -39,4 +39,7 @@ + + + diff --git a/DataFormats/PortableTestObjects/test/TestSoA.cc b/DataFormats/PortableTestObjects/test/TestSoA.cc index ae870bbcfe148..2d3880d4c9bf6 100644 --- a/DataFormats/PortableTestObjects/test/TestSoA.cc +++ b/DataFormats/PortableTestObjects/test/TestSoA.cc @@ -1,6 +1,7 @@ // A minimal test to ensure that // - portabletest::TestSoA can be compiled // - portabletest::TestHostCollection can be allocated +// - portabletest::TestHostCollection can be erased // - view-based element access works #include "DataFormats/PortableTestObjects/interface/TestHostCollection.h" @@ -14,6 +15,8 @@ int main() { const portabletest::Matrix matrix{{1, 2, 3, 4, 5, 6}, {2, 4, 6, 8, 10, 12}, {3, 6, 9, 12, 15, 18}}; const portabletest::Array flags = {{6, 4, 2, 0}}; + collection.zeroInitialise(); + collection.view().r() = 1.; for (int i = 0; i < size; ++i) { diff --git a/DataFormats/RPCRecHit/src/classes_def.xml b/DataFormats/RPCRecHit/src/classes_def.xml index 622fffe7fad4d..aa864505eb83b 100644 --- a/DataFormats/RPCRecHit/src/classes_def.xml +++ b/DataFormats/RPCRecHit/src/classes_def.xml @@ -11,7 +11,7 @@ - + diff --git a/DataFormats/RecoCandidate/interface/IsoDeposit.h b/DataFormats/RecoCandidate/interface/IsoDeposit.h index 97d71fc22ea27..aa4c0d16f7506 100644 --- a/DataFormats/RecoCandidate/interface/IsoDeposit.h +++ b/DataFormats/RecoCandidate/interface/IsoDeposit.h @@ -69,7 +69,7 @@ namespace reco { IsoDeposit(const Direction& candDirection); //! Destructor - virtual ~IsoDeposit(){}; + virtual ~IsoDeposit() {} //! Get direction of isolation cone const Direction& direction() const { return theDirection; } diff --git a/DataFormats/RecoCandidate/src/classes_def.xml b/DataFormats/RecoCandidate/src/classes_def.xml index 4583ab537c2ad..7d2cb3d4e126b 100644 --- a/DataFormats/RecoCandidate/src/classes_def.xml +++ b/DataFormats/RecoCandidate/src/classes_def.xml @@ -114,7 +114,7 @@ - + diff --git a/DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h b/DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h index a5100bf7d7c6f..dd6969141031d 100644 --- a/DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h +++ b/DataFormats/SiPixelCluster/interface/SiPixelClusterShapeCache.h @@ -57,7 +57,7 @@ class SiPixelClusterShapeCache { unsigned filled : 1; }; - SiPixelClusterShapeCache(){}; + SiPixelClusterShapeCache() {} explicit SiPixelClusterShapeCache(const edm::HandleBase& handle) : productId_(handle.id()) {} explicit SiPixelClusterShapeCache(const edm::ProductID& id) : productId_(id) {} ~SiPixelClusterShapeCache(); diff --git a/DataFormats/SiPixelClusterSoA/interface/ClusteringConstants.h b/DataFormats/SiPixelClusterSoA/interface/ClusteringConstants.h index 6726c1d29d5c9..810b58042557f 100644 --- a/DataFormats/SiPixelClusterSoA/interface/ClusteringConstants.h +++ b/DataFormats/SiPixelClusterSoA/interface/ClusteringConstants.h @@ -23,7 +23,7 @@ namespace pixelClustering { constexpr uint16_t clusterThresholdPhase2OtherLayers = 4000; constexpr uint32_t maxNumDigis = 3 * 256 * 1024; // @PU=200 µ=530k σ=50k this is >4σ away - constexpr uint16_t maxNumModules = 4000; + constexpr uint16_t maxNumModules = 5000; // This is an upperlimit taking into account D110 has 4000 modules constexpr int32_t maxNumClustersPerModules = maxHitsInModule(); constexpr uint16_t invalidModuleId = std::numeric_limits::max() - 1; diff --git a/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc b/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc index 4752e0fd15591..cf9edd275ddf2 100644 --- a/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc +++ b/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc @@ -412,7 +412,7 @@ PXBDetId PixelBarrelNameUpgrade::getDetId() { ladder = tmpLadder + 11; else if (layer == 4) ladder = tmpLadder + 16; - } // outer + } // outer else { // inner if (layer == 1) { if (tmpLadder <= 3) @@ -438,7 +438,7 @@ PXBDetId PixelBarrelNameUpgrade::getDetId() { else if (tmpLadder <= 32) ladder = 81 - tmpLadder; } // layer 4 - } // inner + } // inner // translate the module number from naming convention to cmssw convention // numbering starts at positive z diff --git a/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc b/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc index 1c487d8253e1d..56b07be4c3cec 100644 --- a/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc +++ b/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc @@ -38,7 +38,7 @@ PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(const DetId& id) : PixelModuleNam theBlade = 38 - tmpBlade; //18...31-->20...7 } else if (tmpBlade >= 49 && tmpBlade <= 56) { theBlade = 77 - tmpBlade; //49...56-->28...21 - } // iasonas2-end + } // iasonas2-end if (side == 1 && outer) thePart = mO; diff --git a/DataFormats/SiPixelDigi/interface/SiPixelCalibDigi.h b/DataFormats/SiPixelDigi/interface/SiPixelCalibDigi.h index b220a60c8386a..d17472c7eab6c 100644 --- a/DataFormats/SiPixelDigi/interface/SiPixelCalibDigi.h +++ b/DataFormats/SiPixelDigi/interface/SiPixelCalibDigi.h @@ -30,7 +30,7 @@ class SiPixelCalibDigi { } // returns the sum of the squares of adc counts for the collected events at point ipoint uint32_t getnentries(uint32_t ipoint) const { return m_data[ipoint].nentries; - } // returns the number of entries made for calibration point ipoint + } // returns the number of entries made for calibration point ipoint std::vector getsum() const; // returns the sum of adc counts for the collected events for all points std::vector getsumsquares() const; // returns the sum of the squares of adc counts std::vector getnentries() const; // returns the number of entries made diff --git a/DataFormats/StdDictionaries/src/classes_def_map.xml b/DataFormats/StdDictionaries/src/classes_def_map.xml index 4bb23a88dd59b..393ddb8a4e307 100644 --- a/DataFormats/StdDictionaries/src/classes_def_map.xml +++ b/DataFormats/StdDictionaries/src/classes_def_map.xml @@ -9,6 +9,7 @@ + diff --git a/DataFormats/TauReco/interface/BaseTauTagInfo.h b/DataFormats/TauReco/interface/BaseTauTagInfo.h index d035f02a115de..f59271f730960 100644 --- a/DataFormats/TauReco/interface/BaseTauTagInfo.h +++ b/DataFormats/TauReco/interface/BaseTauTagInfo.h @@ -16,7 +16,7 @@ namespace reco { class BaseTauTagInfo { public: BaseTauTagInfo(); - virtual ~BaseTauTagInfo(){}; + virtual ~BaseTauTagInfo() {} // Tracks which are components of JetTracksAssociation object and which were filtered by RecoTauTag/TauTagTools/ TauTagTools::filteredTracks(.,...) function through RecoTauTag/RecoTauTag/ CaloRecoTauTagInfoProducer or PFRecoTauTagInfoProducer EDProducer const reco::TrackRefVector& Tracks() const; diff --git a/DataFormats/TauReco/interface/HLTTau.h b/DataFormats/TauReco/interface/HLTTau.h index 1f53481ec44a5..b6589e243e7bf 100644 --- a/DataFormats/TauReco/interface/HLTTau.h +++ b/DataFormats/TauReco/interface/HLTTau.h @@ -56,7 +56,7 @@ namespace reco { double getSeedEcalHitEt() const { return seedEcalHitEt_; } //Lead PF Cluster Et /or simple cluster/or crystal std::vector getEcalClusterShape() const { return ecalClusterShape_; - } //cluster shapes eta [0], Phi[0] DeltaR [1] + } //cluster shapes eta [0], Phi[0] DeltaR [1] int getNEcalHits() const { return nEcalHits_; } //N Ecal PF Clusters or simple clusters or crystals double getHcalIsolEt() const { return hcalIsolEt_; } diff --git a/DataFormats/TauReco/interface/PFTau.h b/DataFormats/TauReco/interface/PFTau.h index 48df909421bc1..48e8161de8bed 100644 --- a/DataFormats/TauReco/interface/PFTau.h +++ b/DataFormats/TauReco/interface/PFTau.h @@ -57,7 +57,7 @@ namespace reco { PFTau(); PFTau(Charge q, const LorentzVector&, const Point& = Point(0, 0, 0)); - ~PFTau() override{}; + ~PFTau() override {} PFTau* clone() const override; const JetBaseRef& jetRef() const; diff --git a/DataFormats/TauReco/interface/PFTau3ProngSummary.h b/DataFormats/TauReco/interface/PFTau3ProngSummary.h index dc658b1c7eeb8..43d4dcb155409 100644 --- a/DataFormats/TauReco/interface/PFTau3ProngSummary.h +++ b/DataFormats/TauReco/interface/PFTau3ProngSummary.h @@ -82,10 +82,8 @@ namespace reco { double Vertex_Prob() const { return TMath::Prob(vertex_chi2_, vertex_ndf_); } bool has3ProngSolution(unsigned int i) const { return has3ProngSolution_[i]; } double Solution_Chi2(unsigned int i) const { return solution_Chi2_[i]; } - double SignificanceOfThetaGJ(unsigned int i) const { - return thetaGJsig_[i]; - } // 0 or less means the theta_GF has - // a physical solution + double SignificanceOfThetaGJ(unsigned int i) const { return thetaGJsig_[i]; } // 0 or less means the theta_GF has + // a physical solution const TLorentzVector& Tau(unsigned int i) const { return tau_p4_[i]; } const std::vector& Daughter_PDGID(unsigned int i) const { return daughter_PDGID_[i]; } const std::vector& Daughter_Charge(unsigned int i) const { return daughter_charge_[i]; } diff --git a/DataFormats/TauReco/interface/PFTauTagInfo.h b/DataFormats/TauReco/interface/PFTauTagInfo.h index e9a4055cb2f7d..f5e113c311c6a 100644 --- a/DataFormats/TauReco/interface/PFTauTagInfo.h +++ b/DataFormats/TauReco/interface/PFTauTagInfo.h @@ -19,7 +19,7 @@ namespace reco { class PFTauTagInfo : public BaseTauTagInfo { public: PFTauTagInfo() {} - ~PFTauTagInfo() override{}; + ~PFTauTagInfo() override {} virtual PFTauTagInfo* clone() const; //get the PFCandidates which compose the PF jet and were filtered by RecoTauTag/TauTagTools/ TauTagTools::filteredPFChargedHadrCands(.,...), filteredPFNeutrHadrCands(.), filteredPFGammaCands(.) functions through RecoTauTag/RecoTauTag/ PFRecoTauTagInfoProducer EDProducer diff --git a/DataFormats/TauReco/interface/RecoTauPiZero.h b/DataFormats/TauReco/interface/RecoTauPiZero.h index 5390cba3baaab..610d147f48cb1 100644 --- a/DataFormats/TauReco/interface/RecoTauPiZero.h +++ b/DataFormats/TauReco/interface/RecoTauPiZero.h @@ -56,7 +56,7 @@ namespace reco { } /// destructor - ~RecoTauPiZero() override{}; + ~RecoTauPiZero() override {} /// Number of PFGamma constituents size_t numberOfGammas() const; diff --git a/DataFormats/TestObjects/interface/DeleteEarly.h b/DataFormats/TestObjects/interface/DeleteEarly.h index 6082a81eaae41..cb5efa2bc2f3d 100644 --- a/DataFormats/TestObjects/interface/DeleteEarly.h +++ b/DataFormats/TestObjects/interface/DeleteEarly.h @@ -26,7 +26,7 @@ namespace edmtest { class DeleteEarly { public: - DeleteEarly(){}; + DeleteEarly() {} ~DeleteEarly() { ++s_nDeletes; } // ---------- const member functions --------------------- diff --git a/DataFormats/TestObjects/src/classes_def.xml b/DataFormats/TestObjects/src/classes_def.xml index d66c97996fe6d..f6e6c9bd25b05 100644 --- a/DataFormats/TestObjects/src/classes_def.xml +++ b/DataFormats/TestObjects/src/classes_def.xml @@ -120,11 +120,11 @@ - + - - + + diff --git a/DataFormats/TrackReco/src/classes_def.xml b/DataFormats/TrackReco/src/classes_def.xml index e4fbf85b52503..98565edcd4fc4 100644 --- a/DataFormats/TrackReco/src/classes_def.xml +++ b/DataFormats/TrackReco/src/classes_def.xml @@ -439,7 +439,7 @@ - + diff --git a/DataFormats/TrackSoA/test/BuildFile.xml b/DataFormats/TrackSoA/test/BuildFile.xml index ce2b273d90577..f5cf50149d57e 100644 --- a/DataFormats/TrackSoA/test/BuildFile.xml +++ b/DataFormats/TrackSoA/test/BuildFile.xml @@ -1,6 +1,13 @@ + + + + + + + diff --git a/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.cc b/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.cc new file mode 100644 index 0000000000000..507d3dde5e120 --- /dev/null +++ b/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.cc @@ -0,0 +1,52 @@ +/* Simple test for the copyFromDense and copyToDense utilities from DataFormats/TrackSoA/interface/alpaka/TrackUtilities.h . + * + * Creates an instance of TracksSoACollection (automatically allocates memory on device), + * passes the view of the SoA data to the kernel that: + * - fill the SoA with covariance data; + * - copy the covariance data to the dense representation, and back to the matrix representation; + * - verify that the data is copied back and forth correctly. + */ + +#include +#include + +#include + +#include "DataFormats/TrackSoA/interface/TracksSoA.h" +#include "DataFormats/TrackSoA/interface/alpaka/TracksSoACollection.h" +#include "FWCore/Utilities/interface/stringize.h" +#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" +#include "HeterogeneousCore/AlpakaInterface/interface/config.h" +#include "HeterogeneousCore/AlpakaInterface/interface/devices.h" + +#include "TrajectoryStateSoA_t.h" + +// Each test binary is built for a single Alpaka backend. +using namespace ALPAKA_ACCELERATOR_NAMESPACE; + +int main() { + // Get the list of devices on the current platform. + auto const& devices = cms::alpakatools::devices(); + if (devices.empty()) { + std::cerr << "No devices available for the " EDM_STRINGIZE(ALPAKA_ACCELERATOR_NAMESPACE) " backend, " + "the test will be skipped.\n"; + exit(EXIT_FAILURE); + } + + // Run the test on each device. + for (const auto& device : devices) { + Queue queue(device); + + // Inner scope to deallocate memory before destroying the stream. + { + TracksSoACollection tracks_d(queue); + + test::testTrackSoA(queue, tracks_d.view()); + + // Wait for the tests to complete. + alpaka::wait(queue); + } + } + + return EXIT_SUCCESS; +} diff --git a/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.dev.cc b/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.dev.cc new file mode 100644 index 0000000000000..8a69df26e9d35 --- /dev/null +++ b/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.dev.cc @@ -0,0 +1,75 @@ +#include + +#include "DataFormats/TrackSoA/interface/TracksSoA.h" +#include "DataFormats/TrackSoA/interface/alpaka/TrackUtilities.h" +#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" +#include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h" + +#include "TrajectoryStateSoA_t.h" + +using Vector5d = Eigen::Matrix; +using Matrix5d = Eigen::Matrix; + +using namespace cms::alpakatools; + +namespace ALPAKA_ACCELERATOR_NAMESPACE::test { + + namespace { + + ALPAKA_FN_ACC Matrix5d buildCovariance(Vector5d const& e) { + Matrix5d cov; + for (int i = 0; i < 5; ++i) + cov(i, i) = e(i) * e(i); + for (int i = 0; i < 5; ++i) { + for (int j = 0; j < i; ++j) { + // this makes the matrix positive defined + double v = 0.3 * std::sqrt(cov(i, i) * cov(j, j)); + cov(i, j) = (i + j) % 2 ? -0.4 * v : 0.1 * v; + cov(j, i) = cov(i, j); + } + } + return cov; + } + + template + struct TestTrackSoA { + using Utils = TracksUtilities; + + ALPAKA_FN_ACC void operator()(Acc1D const& acc, reco::TrackSoAView tracks) const { + Vector5d par0; + par0 << 0.2, 0.1, 3.5, 0.8, 0.1; + Vector5d e0; + e0 << 0.01, 0.01, 0.035, -0.03, -0.01; + Matrix5d cov0 = buildCovariance(e0); + + for (auto i : uniform_elements(acc, tracks.metadata().size())) { + Utils::copyFromDense(tracks, par0, cov0, i); + Vector5d par1; + Matrix5d cov1; + Utils::copyToDense(tracks, par1, cov1, i); + Vector5d deltaV = par1 - par0; + Matrix5d deltaM = cov1 - cov0; + for (int j = 0; j < 5; ++j) { + ALPAKA_ASSERT(std::abs(deltaV(j)) < 1.e-5); + for (int k = j; k < 5; ++k) { + ALPAKA_ASSERT(cov0(k, j) == cov0(j, k)); + ALPAKA_ASSERT(cov1(k, j) == cov1(j, k)); + ALPAKA_ASSERT(std::abs(deltaM(k, j)) < 1.e-5); + } + } + } + } + }; + + } // namespace + + template + void testTrackSoA(Queue& queue, reco::TrackSoAView& tracks) { + auto grid = make_workdiv(1, 64); + alpaka::exec(queue, grid, TestTrackSoA{}, tracks); + } + + template void testTrackSoA(Queue& queue, reco::TrackSoAView& tracks); + template void testTrackSoA(Queue& queue, reco::TrackSoAView& tracks); + +} // namespace ALPAKA_ACCELERATOR_NAMESPACE::test diff --git a/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.h b/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.h new file mode 100644 index 0000000000000..a6d7688db3698 --- /dev/null +++ b/DataFormats/TrackSoA/test/alpaka/TrajectoryStateSoA_t.h @@ -0,0 +1,15 @@ +#ifndef DataFormats_TrackSoA_test_alpaka_TrajectoryStateSoA_t_h +#define DataFormats_TrackSoA_test_alpaka_TrajectoryStateSoA_t_h + +#include "DataFormats/TrackSoA/interface/TracksSoA.h" +#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" +#include "HeterogeneousCore/AlpakaInterface/interface/config.h" + +namespace ALPAKA_ACCELERATOR_NAMESPACE::test { + + template + void testTrackSoA(Queue& queue, reco::TrackSoAView& tracks); + +} // namespace ALPAKA_ACCELERATOR_NAMESPACE::test + +#endif // DataFormats_TrackSoA_test_alpaka_TrajectoryStateSoA_t_h diff --git a/DataFormats/TrackerCommon/interface/SiStripSubStructure.h b/DataFormats/TrackerCommon/interface/SiStripSubStructure.h index e15ed98460d3f..e1124327c89d5 100644 --- a/DataFormats/TrackerCommon/interface/SiStripSubStructure.h +++ b/DataFormats/TrackerCommon/interface/SiStripSubStructure.h @@ -58,5 +58,5 @@ namespace SiStripSubStructure { uint32_t petal = 0, // petal = 1..8, 0(ALL) uint32_t ring = 0, // ring = 1..7, 0(ALL) uint32_t ster = 0); // ster = 1(sterero), else(nonstereo), 0(ALL) -}; // namespace SiStripSubStructure +}; // namespace SiStripSubStructure #endif diff --git a/DataFormats/TrackerCommon/src/PixelBarrelName.cc b/DataFormats/TrackerCommon/src/PixelBarrelName.cc index f30bd0755a8a3..e7d28e304de62 100644 --- a/DataFormats/TrackerCommon/src/PixelBarrelName.cc +++ b/DataFormats/TrackerCommon/src/PixelBarrelName.cc @@ -762,7 +762,7 @@ DetId PixelBarrelName::getDetId(const TrackerTopology* tt) { ladder = tmpLadder + lL[ind][6]; else if (layer == 4) ladder = tmpLadder + lL[ind][9]; - } // outer + } // outer else { // inner if (layer == 1) { if (tmpLadder <= lL[ind][0]) @@ -785,7 +785,7 @@ DetId PixelBarrelName::getDetId(const TrackerTopology* tt) { else ladder = lL[ind][11] - tmpLadder; } // layer - } // inner + } // inner // translate the module number from naming convention to cmssw convention // numbering starts at positive z @@ -846,7 +846,7 @@ PXBDetId PixelBarrelName::getDetId() { else if (tmpLadder <= 32) ladder = 81 - tmpLadder; } // layer - } // inner + } // inner } else { // phase 0 if (outer) { // outer @@ -873,7 +873,7 @@ PXBDetId PixelBarrelName::getDetId() { else if (tmpLadder <= 22) ladder = 56 - tmpLadder; } // end layer - } // inner + } // inner } // phase diff --git a/DataFormats/TrackerRecHit2D/interface/FastMatchedTrackerRecHit.h b/DataFormats/TrackerRecHit2D/interface/FastMatchedTrackerRecHit.h index cb9b9232e8d0b..e852467113fba 100644 --- a/DataFormats/TrackerRecHit2D/interface/FastMatchedTrackerRecHit.h +++ b/DataFormats/TrackerRecHit2D/interface/FastMatchedTrackerRecHit.h @@ -19,7 +19,7 @@ class FastMatchedTrackerRecHit : public FastTrackerRecHit { : FastTrackerRecHit(pos, err, idet, fastTrackerRecHitType::siStripMatched2D), stereoHitFirst_(stereoHitFirst), componentMono_(rMono), - componentStereo_(rStereo){}; + componentStereo_(rStereo) {} FastMatchedTrackerRecHit* clone() const override { FastMatchedTrackerRecHit* p = new FastMatchedTrackerRecHit(*this); diff --git a/DataFormats/TrackerRecHit2D/interface/FastProjectedTrackerRecHit.h b/DataFormats/TrackerRecHit2D/interface/FastProjectedTrackerRecHit.h index 99f945820814f..8d384156c58b8 100644 --- a/DataFormats/TrackerRecHit2D/interface/FastProjectedTrackerRecHit.h +++ b/DataFormats/TrackerRecHit2D/interface/FastProjectedTrackerRecHit.h @@ -7,9 +7,9 @@ class FastProjectedTrackerRecHit : public FastTrackerRecHit { public: - FastProjectedTrackerRecHit(){}; + FastProjectedTrackerRecHit() {} - ~FastProjectedTrackerRecHit() override{}; + ~FastProjectedTrackerRecHit() override {} FastProjectedTrackerRecHit(const LocalPoint& pos, const LocalError& err, diff --git a/DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h b/DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h index 6e11ed2760fae..819cc1658e416 100644 --- a/DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h +++ b/DataFormats/TrackerRecHit2D/interface/FastTrackerRecHit.h @@ -105,7 +105,7 @@ class FastTrackerRecHit : public BaseTrackerRecHit { /* setters */ - virtual void setEventId(int32_t eventId){}; + virtual void setEventId(int32_t eventId) {} void set2D(bool is2D = true) { is2D_ = is2D; } diff --git a/DataFormats/TrackingRecHit/interface/RecSegment.h b/DataFormats/TrackingRecHit/interface/RecSegment.h index 0a3984a86aa4d..1c9071bb4613d 100644 --- a/DataFormats/TrackingRecHit/interface/RecSegment.h +++ b/DataFormats/TrackingRecHit/interface/RecSegment.h @@ -30,7 +30,7 @@ class RecSegment : public TrackingRecHit { RecSegment(TrackingRecHit::id_type id = 0) : TrackingRecHit(id) {} /// Destructor - ~RecSegment() override{}; + ~RecSegment() override {} /// Local direction virtual LocalVector localDirection() const = 0; diff --git a/DataFormats/TrackingRecHit/src/classes_def.xml b/DataFormats/TrackingRecHit/src/classes_def.xml index 4998db2f25bd4..d895836ee5393 100644 --- a/DataFormats/TrackingRecHit/src/classes_def.xml +++ b/DataFormats/TrackingRecHit/src/classes_def.xml @@ -27,7 +27,7 @@ - + diff --git a/DataFormats/TrackingRecHitSoA/interface/alpaka/TrackingRecHitsSoACollection.h b/DataFormats/TrackingRecHitSoA/interface/alpaka/TrackingRecHitsSoACollection.h index 14d0a2e1aa8f0..3374863ea1327 100644 --- a/DataFormats/TrackingRecHitSoA/interface/alpaka/TrackingRecHitsSoACollection.h +++ b/DataFormats/TrackingRecHitSoA/interface/alpaka/TrackingRecHitsSoACollection.h @@ -34,6 +34,16 @@ namespace cms::alpakatools { template static auto copyAsync(TQueue& queue, TrackingRecHitDevice const& deviceData) { TrackingRecHitHost hostData(queue, deviceData.view().metadata().size()); + + // Don't bother if zero hits + if (deviceData.view().metadata().size() == 0) { + std::memset(hostData.buffer().data(), + 0, + alpaka::getExtentProduct(hostData.buffer()) * + sizeof(alpaka::Elem::Buffer>)); + return hostData; + } + alpaka::memcpy(queue, hostData.buffer(), deviceData.buffer()); #ifdef GPU_DEBUG printf("TrackingRecHitsSoACollection: I'm copying to host.\n"); @@ -41,6 +51,16 @@ namespace cms::alpakatools { assert(deviceData.nHits() == hostData.nHits()); assert(deviceData.offsetBPIX2() == hostData.offsetBPIX2()); #endif + // Update the contents address of the phiBinner histo container after the copy from device happened + alpaka::wait(queue); + typename TrackingRecHitSoA::PhiBinnerView pbv; + pbv.assoc = &(hostData.view().phiBinner()); + pbv.offSize = -1; + pbv.offStorage = nullptr; + pbv.contentSize = hostData.nHits(); + pbv.contentStorage = hostData.view().phiBinnerStorage(); + hostData.view().phiBinner().initStorage(pbv); + return hostData; } }; diff --git a/DataFormats/TrajectorySeed/src/classes_def.xml b/DataFormats/TrajectorySeed/src/classes_def.xml index afea1a0ca62eb..c183a3558fc84 100644 --- a/DataFormats/TrajectorySeed/src/classes_def.xml +++ b/DataFormats/TrajectorySeed/src/classes_def.xml @@ -3,7 +3,7 @@ - + diff --git a/DataFormats/VertexReco/src/TrackTimeLifeInfo.cc b/DataFormats/VertexReco/src/TrackTimeLifeInfo.cc index 75228227dae21..81ee885363af8 100644 --- a/DataFormats/VertexReco/src/TrackTimeLifeInfo.cc +++ b/DataFormats/VertexReco/src/TrackTimeLifeInfo.cc @@ -13,4 +13,4 @@ TrackTimeLifeInfo::TrackTimeLifeInfo() flightLength_(Measurement1D()), ipLength_(Measurement1D()), track_(reco::Track()), - bField_z_(0.){}; + bField_z_(0.) {} diff --git a/DataFormats/VertexSoA/interface/ZVertexDefinitions.h b/DataFormats/VertexSoA/interface/ZVertexDefinitions.h index 028668d1ff52a..0645305f4fd7c 100644 --- a/DataFormats/VertexSoA/interface/ZVertexDefinitions.h +++ b/DataFormats/VertexSoA/interface/ZVertexDefinitions.h @@ -8,6 +8,21 @@ namespace zVertex { constexpr uint32_t MAXTRACKS = 32 * 1024; constexpr uint32_t MAXVTX = 1024; + // + // FIXME: MAXTRACKS is low for Phase2 pixel triplets with PU=200 + // and the txiplets wfs in those conditions will fail. + // + // Not rising it since to the needed 128*1024 since it causes + // a 4-5% jump in memory usage. + // + // The original sin is that, for the moment, the VertexSoA + // has a unique index for the tracks and the vertices and + // so it needs to be sized for the bigger of the two (the tracks, of course). + // This means we are wasting memory (this is true also for Phase1). + // We need to split the two indices (as is for CUDA, since we were not using + // the PortableCollection + Layout was not yet used). + // + } // namespace zVertex #endif diff --git a/DetectorDescription/Core/interface/DDBase.h b/DetectorDescription/Core/interface/DDBase.h index 05302fddd591a..0b5d0d0264984 100644 --- a/DetectorDescription/Core/interface/DDBase.h +++ b/DetectorDescription/Core/interface/DDBase.h @@ -53,8 +53,7 @@ class DDBase { static auto begin() { return StoreT::instance().begin(); } DDBase() : prep_(nullptr) {} - virtual ~DDBase() { /*never do this here: if (prep_) delete prep_;*/ - } + virtual ~DDBase() { /*never do this here: if (prep_) delete prep_;*/ } const N& name() const { return prep_->name(); } diff --git a/DetectorDescription/Core/src/DDExpandedView.cc b/DetectorDescription/Core/src/DDExpandedView.cc index 16f0ff929b86e..382a8be7a6e57 100644 --- a/DetectorDescription/Core/src/DDExpandedView.cc +++ b/DetectorDescription/Core/src/DDExpandedView.cc @@ -127,7 +127,7 @@ bool DDExpandedView::firstChild() { history_.emplace_back(expn); result = true; } // if firstChild - } // if depthNotReached + } // if depthNotReached return result; } diff --git a/DetectorDescription/Core/test/DDFilter.cppunit.cc b/DetectorDescription/Core/test/DDFilter.cppunit.cc index 8dfad341a452d..a8a52bed2fdd0 100644 --- a/DetectorDescription/Core/test/DDFilter.cppunit.cc +++ b/DetectorDescription/Core/test/DDFilter.cppunit.cc @@ -241,268 +241,269 @@ void testDDFilter::checkFilters() { std::vector const expectedNames = {"End"}; CPPUNIT_ASSERT(names == expectedNames); } - {//Test one LogicalPart with different Specifics - // based on placement - {DDValue tofind("Side", "-", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); - } - { - DDSpecificsMatchesValueFilter f{DDValue("Side", "-", 0)}; - DDFilteredView fv(cv, f); + { //Test one LogicalPart with different Specifics + // based on placement + { + DDValue tofind("Side", "-", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDSpecificsMatchesValueFilter f{DDValue("Side", "-", 0)}; + DDFilteredView fv(cv, f); - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); - } - { - DDValue tofind("Side", "+", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); - } - { - DDSpecificsMatchesValueFilter f{DDValue("Side", "+", 0)}; - DDFilteredView fv(cv, f); + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Side", "+", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDSpecificsMatchesValueFilter f{DDValue("Side", "+", 0)}; + DDFilteredView fv(cv, f); - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); - } -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::not_equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"Outer", "Middle", "Inner", "End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "DoesntExist", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDSpecificsMatchesValueFilter f{DDValue("Volume", "DoesntExist", 0)}; - DDFilteredView fv(cv, f); + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + } + { + DDValue tofind("Volume", "EMinus", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::not_equals); + DDFilteredView fv(cv, f); - auto const names = getNames(fv); - std::vector const expectedNames = {}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "DoesntExist", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::not_equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"Outer", "Middle", "Inner", "End", "End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDSpecificsHasNamedValueFilter f("Volume"); - DDFilteredView fv(cv, f); + auto const names = getNames(fv); + std::vector const expectedNames = {"Outer", "Middle", "Inner", "End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "DoesntExist", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + DDFilteredView fv(cv, f); - auto const names = getNames(fv); - std::vector const expectedNames = {"Outer", "Middle", "Inner", "End", "End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDSpecificsHasNamedValueFilter f("DoesntExist"); - DDFilteredView fv(cv, f); + auto const names = getNames(fv); + std::vector const expectedNames = {}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDSpecificsMatchesValueFilter f{DDValue("Volume", "DoesntExist", 0)}; + DDFilteredView fv(cv, f); - auto const names = getNames(fv); - std::vector const expectedNames = {}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Endcap", "", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End", "End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDSpecificsMatchesValueFilter f{DDValue("Endcap", "", 0)}; - DDFilteredView fv(cv, f); + auto const names = getNames(fv); + std::vector const expectedNames = {}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "DoesntExist", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::not_equals); + DDFilteredView fv(cv, f); - auto const names = getNames(fv); - std::vector const expectedNames = {"End", "End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Endcap", "", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::not_equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {}; - for (auto const& n : names) { - std::cout << n; - } - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Endcap", "DoesntExist", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::not_equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End", "End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDSpecificsHasNamedValueFilter f("Endcap"); - DDFilteredView fv(cv, f); + auto const names = getNames(fv); + std::vector const expectedNames = {"Outer", "Middle", "Inner", "End", "End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDSpecificsHasNamedValueFilter f("Volume"); + DDFilteredView fv(cv, f); - auto const names = getNames(fv); - std::vector const expectedNames = {"End", "End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDValue tofind2("Endcap", "", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - f.setCriteria(tofind2, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - auto f = make_and_ddfilter(DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}, - DDSpecificsMatchesValueFilter{DDValue("Endcap", "", 0)}); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDValue tofind2("Endcap", "", 0); - DDSpecificsFilter f; - f.setCriteria(tofind2, DDCompOp::equals); - f.setCriteria(tofind, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - auto f = make_and_ddfilter(DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}, - DDSpecificsMatchesValueFilter{DDValue("Endcap", "", 0)}); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDValue tofind2("Endcap", "any", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - f.setCriteria(tofind2, DDCompOp::not_equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - auto f = make_and_ddfilter(DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}, - DDSpecificsHasNamedValueFilter{"Endcap"}); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDValue tofind2("Endcap", "any", 0); - DDSpecificsFilter f; - f.setCriteria(tofind2, DDCompOp::not_equals); - f.setCriteria(tofind, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - auto f = make_and_ddfilter(DDSpecificsHasNamedValueFilter{"Endcap"}, - DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {"End"}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDValue tofind2("Endcap", "", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - f.setCriteria(tofind2, DDCompOp::not_equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDValue tofind2("Endcap", "", 0); - DDSpecificsFilter f; - f.setCriteria(tofind, DDCompOp::equals); - f.setCriteria(tofind2, DDCompOp::not_equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {}; - CPPUNIT_ASSERT(names == expectedNames); -} -{ - DDValue tofind("Volume", "EMinus", 0); - DDValue tofind2("Endcap", "", 0); - DDSpecificsFilter f; - f.setCriteria(tofind2, DDCompOp::not_equals); - f.setCriteria(tofind, DDCompOp::equals); - DDFilteredView fv(cv, f); - - auto const names = getNames(fv); - std::vector const expectedNames = {}; - CPPUNIT_ASSERT(names == expectedNames); -} -} + auto const names = getNames(fv); + std::vector const expectedNames = {"Outer", "Middle", "Inner", "End", "End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDSpecificsHasNamedValueFilter f("DoesntExist"); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Endcap", "", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End", "End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDSpecificsMatchesValueFilter f{DDValue("Endcap", "", 0)}; + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End", "End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Endcap", "", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::not_equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {}; + for (auto const& n : names) { + std::cout << n; + } + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Endcap", "DoesntExist", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::not_equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End", "End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDSpecificsHasNamedValueFilter f("Endcap"); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End", "End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "EMinus", 0); + DDValue tofind2("Endcap", "", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + f.setCriteria(tofind2, DDCompOp::equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + auto f = make_and_ddfilter(DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}, + DDSpecificsMatchesValueFilter{DDValue("Endcap", "", 0)}); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "EMinus", 0); + DDValue tofind2("Endcap", "", 0); + DDSpecificsFilter f; + f.setCriteria(tofind2, DDCompOp::equals); + f.setCriteria(tofind, DDCompOp::equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + auto f = make_and_ddfilter(DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}, + DDSpecificsMatchesValueFilter{DDValue("Endcap", "", 0)}); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "EMinus", 0); + DDValue tofind2("Endcap", "any", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + f.setCriteria(tofind2, DDCompOp::not_equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + auto f = make_and_ddfilter(DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}, + DDSpecificsHasNamedValueFilter{"Endcap"}); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "EMinus", 0); + DDValue tofind2("Endcap", "any", 0); + DDSpecificsFilter f; + f.setCriteria(tofind2, DDCompOp::not_equals); + f.setCriteria(tofind, DDCompOp::equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + auto f = make_and_ddfilter(DDSpecificsHasNamedValueFilter{"Endcap"}, + DDSpecificsMatchesValueFilter{DDValue("Volume", "EMinus", 0)}); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {"End"}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "EMinus", 0); + DDValue tofind2("Endcap", "", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + f.setCriteria(tofind2, DDCompOp::not_equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "EMinus", 0); + DDValue tofind2("Endcap", "", 0); + DDSpecificsFilter f; + f.setCriteria(tofind, DDCompOp::equals); + f.setCriteria(tofind2, DDCompOp::not_equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {}; + CPPUNIT_ASSERT(names == expectedNames); + } + { + DDValue tofind("Volume", "EMinus", 0); + DDValue tofind2("Endcap", "", 0); + DDSpecificsFilter f; + f.setCriteria(tofind2, DDCompOp::not_equals); + f.setCriteria(tofind, DDCompOp::equals); + DDFilteredView fv(cv, f); + + auto const names = getNames(fv); + std::vector const expectedNames = {}; + CPPUNIT_ASSERT(names == expectedNames); + } + } -//CPPUNIT_ASSERT (bad==0); + //CPPUNIT_ASSERT (bad==0); } diff --git a/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc b/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc index 6b146d7bd3622..831f2af7bdd79 100644 --- a/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc +++ b/DetectorDescription/OfflineDBLoader/plugins/OutputDDToDDL.cc @@ -168,8 +168,8 @@ void OutputDDToDDL::beginRun(const edm::Run&, edm::EventSetup const& es) { rotStore.insert(gra.edgeData(cit->second)->ddrot()); out.position(ddLP, ddcurLP, gra.edgeData(cit->second), m_rotNumSeed, *m_xos); } // iterate over children - } // if (children) - } // iterate over graph nodes + } // if (children) + } // iterate over graph nodes (*m_xos) << "" << std::endl; diff --git a/DetectorDescription/OfflineDBLoader/plugins/OutputMagneticFieldDDToDDL.cc b/DetectorDescription/OfflineDBLoader/plugins/OutputMagneticFieldDDToDDL.cc index d85d1fd2348e8..fd3b07e88b951 100644 --- a/DetectorDescription/OfflineDBLoader/plugins/OutputMagneticFieldDDToDDL.cc +++ b/DetectorDescription/OfflineDBLoader/plugins/OutputMagneticFieldDDToDDL.cc @@ -167,8 +167,8 @@ void OutputMagneticFieldDDToDDL::beginRun(const edm::Run&, edm::EventSetup const rotStore.insert(gra.edgeData(cit->second)->ddrot()); out.position(ddLP, ddcurLP, gra.edgeData(cit->second), m_rotNumSeed, *m_xos); } // iterate over children - } // if (children) - } // iterate over graph nodes + } // if (children) + } // iterate over graph nodes (*m_xos) << "\n"; diff --git a/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc b/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc index f63bb80f71d20..4ef2b7683a862 100644 --- a/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc +++ b/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc @@ -113,8 +113,8 @@ void GeometryInfoDump::dumpInfo( } lpStore.insert(ddcurLP); } // iterate over children - } // if (children) - } // iterate over graph nodes + } // if (children) + } // iterate over graph nodes dump.close(); } } diff --git a/DetectorDescription/RegressionTest/interface/DDErrorDetection.h b/DetectorDescription/RegressionTest/interface/DDErrorDetection.h index 9049887318bfc..d4115aefe2d62 100644 --- a/DetectorDescription/RegressionTest/interface/DDErrorDetection.h +++ b/DetectorDescription/RegressionTest/interface/DDErrorDetection.h @@ -131,7 +131,7 @@ class DDErrorDetection { bool noErrorsInTheReport(const DDCompactView& cpv); private: - DDErrorDetection(){}; + DDErrorDetection() {} }; #endif diff --git a/DetectorDescription/RegressionTest/interface/DDHtmlFormatter.h b/DetectorDescription/RegressionTest/interface/DDHtmlFormatter.h index 69b5df3ac1077..c51bd66a881a9 100644 --- a/DetectorDescription/RegressionTest/interface/DDHtmlFormatter.h +++ b/DetectorDescription/RegressionTest/interface/DDHtmlFormatter.h @@ -150,7 +150,7 @@ class DDHtmlDetails { DDHtmlDetails(const std::string &cat, const std::string &txt); virtual bool details(std::ostream &os, const DDName &) = 0; virtual ns_type &names() = 0; - virtual ~DDHtmlDetails(){}; + virtual ~DDHtmlDetails() {} const std::string &category() { return cat_; } const std::string &text() { return txt_; } diff --git a/DetectorDescription/RegressionTest/src/TagName.h b/DetectorDescription/RegressionTest/src/TagName.h index b29eaf750e43c..57511482d0e76 100644 --- a/DetectorDescription/RegressionTest/src/TagName.h +++ b/DetectorDescription/RegressionTest/src/TagName.h @@ -10,7 +10,7 @@ class TagName { public: TagName() : id_(count()) {} - explicit TagName(const std::string& name) : name_(regName(name)), id_(count()){}; + explicit TagName(const std::string& name) : name_(regName(name)), id_(count()) {} const std::string& str() const { return name_->first; } diff --git a/DetectorDescription/RegressionTest/test/tutorial.cc b/DetectorDescription/RegressionTest/test/tutorial.cc index a68c8e5686c52..8213bf776df81 100644 --- a/DetectorDescription/RegressionTest/test/tutorial.cc +++ b/DetectorDescription/RegressionTest/test/tutorial.cc @@ -356,7 +356,7 @@ void tutorial() { vecF.back()->setCriteria(ddval, cop[cs]); } //<- moreFilterCriteria - } //<- morFilters + } //<- morFilters std::string ans; ans = ""; diff --git a/EgammaAnalysis/ElectronTools/interface/EcalIsolationCorrector.h b/EgammaAnalysis/ElectronTools/interface/EcalIsolationCorrector.h index 11428f34c12c2..ae740468c26c7 100644 --- a/EgammaAnalysis/ElectronTools/interface/EcalIsolationCorrector.h +++ b/EgammaAnalysis/ElectronTools/interface/EcalIsolationCorrector.h @@ -19,7 +19,7 @@ class EcalIsolationCorrector { enum RunRange { RunAB, RunC, RunD }; EcalIsolationCorrector(bool forElectrons); - ~EcalIsolationCorrector(){}; + ~EcalIsolationCorrector() {} #ifndef STANDALONE_ECALCORR // Global correction for ABCD together diff --git a/EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h b/EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h index 3798b6e4e73ed..65ec6f6d2605c 100644 --- a/EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h +++ b/EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h @@ -125,7 +125,7 @@ class EnergyScaleCorrection_class { public: EnergyScaleCorrection_class(std::string correctionFileName, unsigned int genSeed = 0); - EnergyScaleCorrection_class(){}; ///< dummy constructor needed in ElectronEnergyCalibratorRun2 + EnergyScaleCorrection_class() {} ///< dummy constructor needed in ElectronEnergyCalibratorRun2 ~EnergyScaleCorrection_class(void); //------------------------------ scales diff --git a/EgammaAnalysis/ElectronTools/interface/SuperClusterHelper.h b/EgammaAnalysis/ElectronTools/interface/SuperClusterHelper.h index b7a505b4d97da..c1e6f264db5ad 100644 --- a/EgammaAnalysis/ElectronTools/interface/SuperClusterHelper.h +++ b/EgammaAnalysis/ElectronTools/interface/SuperClusterHelper.h @@ -19,7 +19,7 @@ class SuperClusterHelper { const EcalRecHitCollection* rechits, const CaloTopology*, const CaloGeometry*); - ~SuperClusterHelper(){}; + ~SuperClusterHelper() {} float rawEnergy() const { return theSuperCluster_->rawEnergy(); } float eta() const { return theSuperCluster_->eta(); } diff --git a/EgammaAnalysis/ElectronTools/plugins/PatElectronEAIsoCorrectionProducer.cc b/EgammaAnalysis/ElectronTools/plugins/PatElectronEAIsoCorrectionProducer.cc index e4c60c6965b06..69c568076d240 100644 --- a/EgammaAnalysis/ElectronTools/plugins/PatElectronEAIsoCorrectionProducer.cc +++ b/EgammaAnalysis/ElectronTools/plugins/PatElectronEAIsoCorrectionProducer.cc @@ -9,7 +9,7 @@ class PatElectronEAIsoCorrectionProducer : public edm::stream::EDProducer<> { public: explicit PatElectronEAIsoCorrectionProducer(const edm::ParameterSet& iConfig); - ~PatElectronEAIsoCorrectionProducer() override{}; + ~PatElectronEAIsoCorrectionProducer() override {} void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override; private: diff --git a/EgammaAnalysis/ElectronTools/src/EGammaMvaEleEstimator.cc b/EgammaAnalysis/ElectronTools/src/EGammaMvaEleEstimator.cc index 460e8a1c166cf..f101340d95583 100644 --- a/EgammaAnalysis/ElectronTools/src/EGammaMvaEleEstimator.cc +++ b/EgammaAnalysis/ElectronTools/src/EGammaMvaEleEstimator.cc @@ -1501,8 +1501,8 @@ Double_t EGammaMvaEleEstimator::isoMvaValue(const reco::GsfElectron& ele, tmpNeutralHadronIso_DR0p4To0p5 += iP->pt(); } } //not lepton footprint - } //in 1.0 dr cone - } //loop over PF candidates + } //in 1.0 dr cone + } //loop over PF candidates fMVAVar_ChargedIso_DR0p0To0p1 = TMath::Min((tmpChargedIso_DR0p0To0p1) / ele.pt(), 2.5); fMVAVar_ChargedIso_DR0p1To0p2 = TMath::Min((tmpChargedIso_DR0p1To0p2) / ele.pt(), 2.5); diff --git a/EgammaAnalysis/ElectronTools/test/ElectronTestAnalyzer.cc b/EgammaAnalysis/ElectronTools/test/ElectronTestAnalyzer.cc index 373230f593836..8c705b409598a 100644 --- a/EgammaAnalysis/ElectronTools/test/ElectronTestAnalyzer.cc +++ b/EgammaAnalysis/ElectronTools/test/ElectronTestAnalyzer.cc @@ -445,8 +445,8 @@ void ElectronTestAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSet << " MyMVA Method-2 " << mvaTrigMthd2 << std::endl; } } // End Loop on RECO electrons - } // End if MC electrons selection - } //End Loop Generator Particles + } // End if MC electrons selection + } //End Loop Generator Particles } // ------------ method called once each job just before starting event loop ------------ void ElectronTestAnalyzer::myVar(const reco::GsfElectron& ele, diff --git a/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h b/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h index 7937d2484db87..226f8f5399ccd 100644 --- a/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h +++ b/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h @@ -64,9 +64,7 @@ class CSCCFEBTimeSlice { CSCCFEBDataWord *timeSample(int layer, int channel, bool isDCFEB = false) const; /// whether we keep 8 or 16 time samples - bool sixteenSamples() const { /*return scaControllerWord(1).ts_flag;i*/ - return timeSample(95)->controllerData; - } + bool sixteenSamples() const { /*return scaControllerWord(1).ts_flag;i*/ return timeSample(95)->controllerData; } unsigned sizeInWords() const { return 100; } /// unpacked from the controller words for each channel in the layer diff --git a/EventFilter/CSCRawToDigi/interface/CSCTMBHeader2020_Run2.h b/EventFilter/CSCRawToDigi/interface/CSCTMBHeader2020_Run2.h index 163d5bf01349a..8c4982274450b 100644 --- a/EventFilter/CSCRawToDigi/interface/CSCTMBHeader2020_Run2.h +++ b/EventFilter/CSCRawToDigi/interface/CSCTMBHeader2020_Run2.h @@ -72,9 +72,9 @@ struct CSCTMBHeader2020_Run2 : public CSCVTMBHeaderFormat { void addALCT1(const CSCALCTDigi& digi) override; void addCorrelatedLCT0(const CSCCorrelatedLCTDigi& digi) override; void addCorrelatedLCT1(const CSCCorrelatedLCTDigi& digi) override; - void addShower(const CSCShowerDigi& digi) override{}; - void addAnodeShower(const CSCShowerDigi& digi) override{}; - void addCathodeShower(const CSCShowerDigi& digi) override{}; + void addShower(const CSCShowerDigi& digi) override {} + void addAnodeShower(const CSCShowerDigi& digi) override {} + void addCathodeShower(const CSCShowerDigi& digi) override {} void swapCLCTs(CSCCLCTDigi& digi1, CSCCLCTDigi& digi2); diff --git a/EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h b/EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h index bb303ec5cb9c8..96642af1d7ef0 100644 --- a/EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h +++ b/EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h @@ -7,7 +7,7 @@ class CSCVDMBHeaderFormat { public: - virtual ~CSCVDMBHeaderFormat(){}; + virtual ~CSCVDMBHeaderFormat() {} /* void init() { bzero(this, sizeInWords()*2); diff --git a/EventFilter/CSCRawToDigi/interface/CSCVDMBTrailerFormat.h b/EventFilter/CSCRawToDigi/interface/CSCVDMBTrailerFormat.h index a74107789532b..b0ace19367e8f 100644 --- a/EventFilter/CSCRawToDigi/interface/CSCVDMBTrailerFormat.h +++ b/EventFilter/CSCRawToDigi/interface/CSCVDMBTrailerFormat.h @@ -9,7 +9,7 @@ class CSCDMBHeader; class CSCVDMBTrailerFormat { public: - virtual ~CSCVDMBTrailerFormat(){}; + virtual ~CSCVDMBTrailerFormat() {} /* void init() { bzero(this, sizeInWords()*2); diff --git a/EventFilter/CSCRawToDigi/plugins/CSCDCCUnpacker.cc b/EventFilter/CSCRawToDigi/plugins/CSCDCCUnpacker.cc index 365f00c76e75e..889d3fe1e1cf0 100644 --- a/EventFilter/CSCRawToDigi/plugins/CSCDCCUnpacker.cc +++ b/EventFilter/CSCRawToDigi/plugins/CSCDCCUnpacker.cc @@ -706,10 +706,10 @@ void CSCDCCUnpacker::produce(edm::Event& e, const edm::EventSetup& c) { comparatorProduct->move(std::make_pair(comparatorDigis.begin(), comparatorDigis.end()), layer); } } // end of loop over cfebs - } // end of loop over layers - } // end of loop over chambers - } // endof loop over DDUs - } // end of good event + } // end of loop over layers + } // end of loop over chambers + } // endof loop over DDUs + } // end of good event else { LogTrace("CSCDCCUnpacker|CSCRawToDigi") << "ERROR! Examiner rejected FED #" << id; if (examiner) { @@ -730,7 +730,7 @@ void CSCDCCUnpacker::produce(edm::Event& e, const edm::EventSetup& c) { if (examiner != nullptr) delete examiner; } // end of if fed has data - } // end of loop over DCCs + } // end of loop over DCCs // put into the event e.put(std::move(wireProduct), "MuonCSCWireDigi"); e.put(std::move(stripProduct), "MuonCSCStripDigi"); diff --git a/EventFilter/CSCRawToDigi/src/CSCAnodeData2007.cc b/EventFilter/CSCRawToDigi/src/CSCAnodeData2007.cc index 04202068770a7..2825e3c0e3874 100644 --- a/EventFilter/CSCRawToDigi/src/CSCAnodeData2007.cc +++ b/EventFilter/CSCRawToDigi/src/CSCAnodeData2007.cc @@ -63,7 +63,7 @@ std::vector CSCAnodeData2007::wireDigis(int layer) const { tbinbits = 0; } } ///end of the loop over bits in the data frame - } ///end of the loop over layer parts + } ///end of the loop over layer parts return digis; } diff --git a/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc b/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc index 40f5b75492724..120a66988305b 100644 --- a/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc +++ b/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc @@ -308,8 +308,8 @@ void CTPPSPixelDataFormatter::formatRawData(const bool& isRun3, m_hasDetDigis++; } // range - } // for DetDigis - } // for Digis + } // for DetDigis + } // for Digis LogTrace(" allDetDigis/hasDetDigis : ") << m_allDetDigis << "/" << m_hasDetDigis; for (auto const& feddata : words) { diff --git a/EventFilter/CTPPSRawToDigi/src/CTPPSTotemDataFormatter.cc b/EventFilter/CTPPSRawToDigi/src/CTPPSTotemDataFormatter.cc index 0dd75374b4dc1..61d84be3b6257 100644 --- a/EventFilter/CTPPSRawToDigi/src/CTPPSTotemDataFormatter.cc +++ b/EventFilter/CTPPSRawToDigi/src/CTPPSTotemDataFormatter.cc @@ -92,8 +92,8 @@ void CTPPSTotemDataFormatter::formatRawData(unsigned int lvl1_ID, m_WordCounter++; words[fedId].push_back(buf); } // range - } // mapIdCh - } //digis + } // mapIdCh + } //digis typedef std::map>>::const_iterator RI; std::map> words16; diff --git a/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc b/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc index 8936e0086a8ab..173a6f0b0ece5 100644 --- a/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc +++ b/EventFilter/DTRawToDigi/plugins/DTROS25Unpacker.cc @@ -367,12 +367,12 @@ void DTROS25Unpacker::interpretRawData(const unsigned int* index, stationGroup++; } // if writeSC - } // if SC data + } // if SC data } while (DTROSWordType(word).type() != DTROSWordType::SCTrailer); } // end SC subheader - } // end if SC send more than only its own header! - } // end if first data following SCheader is not SCData + } // end if SC send more than only its own header! + } // end if first data following SCheader is not SCData if (DTROSWordType(word).type() == DTROSWordType::SCTrailer) { DTLocalTriggerTrailerWord scTrailerWord(word); diff --git a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc index 4f6ddfdca6825..3fe42c886bba6 100644 --- a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc +++ b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc @@ -319,7 +319,7 @@ void DTuROSRawToDigi::process(int DTuROSFED, if (selector2 == 0) { // TDC word - int tdcTime = (dataWord)&0x3FFF; // positions 0 -> 13 + int tdcTime = (dataWord) & 0x3FFF; // positions 0 -> 13 int tdcChannel = (dataWord >> posTDCChannelSel2Null) & 0x1F; int tdcId = (dataWord >> posTDCIdSel2Null) & 0x3; int link = (dataWord >> posLinkSel2Null) & 0x7F; // positions 21 -> 27 @@ -357,7 +357,7 @@ void DTuROSRawToDigi::process(int DTuROSFED, edm::LogWarning("dturos_unpacker") << "Error word [" << std::dec << k << "] : " << std::hex << dataWord << std::dec << " in slot " << slot << " in crate " << crate; - int error = (dataWord)&0x1FFFFFFF; // positions 0 -> 28 + int error = (dataWord) & 0x1FFFFFFF; // positions 0 -> 28 rwords.seterror(error); } } diff --git a/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc b/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc index bcffb5beef391..130e47c575506 100644 --- a/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc +++ b/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc @@ -232,7 +232,7 @@ void DTTFFEDReader::process(edm::Event &e) { } if (stationID != 3) { - ts2tag = (bitsID)&0x1; + ts2tag = (bitsID) & 0x1; tsqual = (~(*DTTFiterator) & 0x07) - 1; ba = (~(*DTTFiterator) & 0x1FF8) >> 3; if (ba > 0x1FF) @@ -241,7 +241,7 @@ void DTTFFEDReader::process(edm::Event &e) { if (ra > 0x7FF) ra -= 0x1000; } else { - ts2tag = (bitsID)&0x1; + ts2tag = (bitsID) & 0x1; tsqual = (~(*DTTFiterator) & 0x07) - 1; ra = (~(*DTTFiterator) & 0x7FF8) >> 3; if (ra > 0x7FF) diff --git a/EventFilter/ESDigiToRaw/interface/ESDataFormatter.h b/EventFilter/ESDigiToRaw/interface/ESDataFormatter.h index 369a1a82af7ff..37776b428e197 100644 --- a/EventFilter/ESDigiToRaw/interface/ESDataFormatter.h +++ b/EventFilter/ESDigiToRaw/interface/ESDataFormatter.h @@ -24,7 +24,7 @@ class ESDataFormatter { int kchip_ec = 0; Meta_Data() = default; Meta_Data(int r, int o, int b, int l, int k_bc, int k_ec) - : run_number(r), orbit_number(o), bx(b), lv1(l), kchip_bc(k_bc), kchip_ec(k_ec){}; + : run_number(r), orbit_number(o), bx(b), lv1(l), kchip_bc(k_bc), kchip_ec(k_ec) {} }; typedef std::vector DetDigis; @@ -39,8 +39,8 @@ class ESDataFormatter { : pset_(ps), trgtype_(0), debug_(pset_.getUntrackedParameter("debugMode", false)), - printInHex_(pset_.getUntrackedParameter("printInHex", false)){}; - virtual ~ESDataFormatter(){}; + printInHex_(pset_.getUntrackedParameter("printInHex", false)) {} + virtual ~ESDataFormatter() {} virtual void DigiToRaw(int fedId, Digis& digis, FEDRawData& fedRawData, const Meta_Data& meta_data) const = 0; diff --git a/EventFilter/EcalDigiToRaw/src/BlockFormatter.cc b/EventFilter/EcalDigiToRaw/src/BlockFormatter.cc index 68c4b0566a44b..cbd0a2495ed4d 100644 --- a/EventFilter/EcalDigiToRaw/src/BlockFormatter.cc +++ b/EventFilter/EcalDigiToRaw/src/BlockFormatter.cc @@ -83,7 +83,7 @@ void BlockFormatter::DigiToRaw(FEDRawDataCollection* productRawData) { } } // endif rawdatasize == 0 - } // loop on id + } // loop on id } void BlockFormatter::print(FEDRawData& rawdata) { diff --git a/EventFilter/EcalRawToDigi/interface/DCCDataBlockPrototype.h b/EventFilter/EcalRawToDigi/interface/DCCDataBlockPrototype.h index 195b867a71494..59ed276a627f9 100644 --- a/EventFilter/EcalRawToDigi/interface/DCCDataBlockPrototype.h +++ b/EventFilter/EcalRawToDigi/interface/DCCDataBlockPrototype.h @@ -35,11 +35,11 @@ class DCCDataBlockPrototype { DCCEventBlock* event, bool unpack = true); - virtual ~DCCDataBlockPrototype(){}; + virtual ~DCCDataBlockPrototype() {} virtual int unpack(const uint64_t** data, unsigned int* dwToEnd) { return BLOCK_UNPACKED; } - virtual void updateCollectors(){}; + virtual void updateCollectors() {} virtual void display(std::ostream& o) {} diff --git a/EventFilter/EcalRawToDigi/interface/DCCEventBlock.h b/EventFilter/EcalRawToDigi/interface/DCCEventBlock.h index 003d28d6d657b..cd51dbe1aea7b 100644 --- a/EventFilter/EcalRawToDigi/interface/DCCEventBlock.h +++ b/EventFilter/EcalRawToDigi/interface/DCCEventBlock.h @@ -39,7 +39,7 @@ class DCCEventBlock { virtual ~DCCEventBlock(); - virtual void unpack(const uint64_t* buffer, size_t bufferSize, unsigned int expFedId){}; + virtual void unpack(const uint64_t* buffer, size_t bufferSize, unsigned int expFedId) {} void reset(); diff --git a/EventFilter/EcalRawToDigi/interface/DCCFEBlock.h b/EventFilter/EcalRawToDigi/interface/DCCFEBlock.h index 70ab9228ce284..4c71a1499529c 100644 --- a/EventFilter/EcalRawToDigi/interface/DCCFEBlock.h +++ b/EventFilter/EcalRawToDigi/interface/DCCFEBlock.h @@ -39,7 +39,7 @@ class DCCFEBlock : public DCCDataBlockPrototype { protected: virtual int unpackXtalData(unsigned int stripID, unsigned int xtalID) { return BLOCK_UNPACKED; }; - virtual void fillEcalElectronicsError(std::unique_ptr*){}; + virtual void fillEcalElectronicsError(std::unique_ptr*) {} bool zs_; bool checkFeId_; diff --git a/EventFilter/EcalRawToDigi/interface/DCCSRPBlock.h b/EventFilter/EcalRawToDigi/interface/DCCSRPBlock.h index 816ec4b87eb53..f69a45b706446 100644 --- a/EventFilter/EcalRawToDigi/interface/DCCSRPBlock.h +++ b/EventFilter/EcalRawToDigi/interface/DCCSRPBlock.h @@ -38,7 +38,7 @@ class DCCSRPBlock : public DCCDataBlockPrototype { unsigned short srFlag(unsigned int feChannel) { return srFlags_[feChannel - 1]; } protected: - virtual void addSRFlagToCollection(){}; + virtual void addSRFlagToCollection() {} virtual bool checkSrpIdAndNumbSRFlags() { return true; }; diff --git a/EventFilter/EcalRawToDigi/interface/DCCTCCBlock.h b/EventFilter/EcalRawToDigi/interface/DCCTCCBlock.h index bac78ea4e17ed..f19591f9b981d 100644 --- a/EventFilter/EcalRawToDigi/interface/DCCTCCBlock.h +++ b/EventFilter/EcalRawToDigi/interface/DCCTCCBlock.h @@ -37,7 +37,7 @@ class DCCTCCBlock : public DCCDataBlockPrototype { */ DCCTCCBlock(DCCDataUnpacker* u, EcalElectronicsMapper* m, DCCEventBlock* e, bool unpack); - virtual void addTriggerPrimitivesToCollection(){}; + virtual void addTriggerPrimitivesToCollection() {} /** Unpacks TCC data diff --git a/EventFilter/EcalRawToDigi/plugins/EcalDumpRaw.cc b/EventFilter/EcalRawToDigi/plugins/EcalDumpRaw.cc index 965e1ef5a8340..527b75386ebd5 100644 --- a/EventFilter/EcalRawToDigi/plugins/EcalDumpRaw.cc +++ b/EventFilter/EcalRawToDigi/plugins/EcalDumpRaw.cc @@ -598,7 +598,7 @@ bool EcalDumpRaw::decode(const uint32_t* data, int iWord64, ostream& out) { << tpg_[iTcc_ - 1][0 + tpgOffset]; } } // else{ - // if(d) out << "ERROR"; + // if(d) out << "ERROR"; //} ++iTccWord64_; if (iTccWord64_ >= (unsigned)tccBlockLen64_) diff --git a/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc b/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc index ff5760c1287ac..7f3a84c383c1e 100644 --- a/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc +++ b/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc @@ -927,7 +927,7 @@ bool MatacqProducer::getMatacqFile(uint32_t runNumber, uint32_t orbitId, bool* f } //next iglob globfree(&g); } //next filenames - } //next itry + } //next itry if (found) { LogInfo("Matacq") << "Uses matacq data file: '" << fname << "'\n"; diff --git a/EventFilter/EcalRawToDigi/src/DCCEETCCBlock.cc b/EventFilter/EcalRawToDigi/src/DCCEETCCBlock.cc index 7684ec0c0bc99..bb883bbc13f85 100644 --- a/EventFilter/EcalRawToDigi/src/DCCEETCCBlock.cc +++ b/EventFilter/EcalRawToDigi/src/DCCEETCCBlock.cc @@ -182,7 +182,7 @@ void DCCEETCCBlock::addTriggerPrimitivesToCollection() { (*tps_)->push_back(*pTP_); } } // end if(processTPG2) - } // end FOV==1 or 2 + } // end FOV==1 or 2 } bool DCCEETCCBlock::checkTccIdAndNumbTTs() { diff --git a/EventFilter/EcalRawToDigi/src/DCCMemBlock.cc b/EventFilter/EcalRawToDigi/src/DCCMemBlock.cc index 5b5d669c89610..8f3c2dd345419 100644 --- a/EventFilter/EcalRawToDigi/src/DCCMemBlock.cc +++ b/EventFilter/EcalRawToDigi/src/DCCMemBlock.cc @@ -254,7 +254,7 @@ void DCCMemBlock::unpackMemTowerData() { data_ += numbDWInXtalBlock_; } //loop over xtals - } // loop over strips + } // loop over strips } void DCCMemBlock::fillPnDiodeDigisCollection() { diff --git a/EventFilter/EcalRawToDigi/src/DCCSCBlock.cc b/EventFilter/EcalRawToDigi/src/DCCSCBlock.cc index 6bb9775ee146d..cd2d68e09c482 100644 --- a/EventFilter/EcalRawToDigi/src/DCCSCBlock.cc +++ b/EventFilter/EcalRawToDigi/src/DCCSCBlock.cc @@ -124,7 +124,7 @@ int DCCSCBlock::unpackXtalData(unsigned int expStripID, unsigned int expXtalID) lastStripId_ = stripId; lastXtalId_ = xtalId; } // end else - } // end if(zs_) + } // end if(zs_) bool addedFrame = false; diff --git a/EventFilter/EcalRawToDigi/src/DCCTowerBlock.cc b/EventFilter/EcalRawToDigi/src/DCCTowerBlock.cc index d363ebe3ad472..e63b4bd2309d9 100644 --- a/EventFilter/EcalRawToDigi/src/DCCTowerBlock.cc +++ b/EventFilter/EcalRawToDigi/src/DCCTowerBlock.cc @@ -135,7 +135,7 @@ int DCCTowerBlock::unpackXtalData(unsigned int expStripID, unsigned int expXtalI lastStripId_ = stripId; lastXtalId_ = xtalId; } //end else - } // end if (zs_) + } // end if (zs_) bool addedFrame = false; @@ -215,7 +215,7 @@ int DCCTowerBlock::unpackXtalData(unsigned int expStripID, unsigned int expXtalI //make special collection for gain0 data frames when due to saturation return BLOCK_UNPACKED; errorOnXtal = true; //keep it here in case the return is to be dropped - } //end isSaturation + } //end isSaturation else { data_ += numbDWInXtalBlock_; return BLOCK_UNPACKED; diff --git a/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc b/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc index 70f247497a338..8f13ec8c81e26 100644 --- a/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc +++ b/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc @@ -472,7 +472,7 @@ void EcalElectronicsMapper::fillMaps() { xtalDetIds_[smId - 1][feChannel - 1][stripId - 1][xtalId - 1] = detId; } // close loop over xtals - } // close loop over strips + } // close loop over strips } // close loop over fechannels @@ -592,8 +592,8 @@ void EcalElectronicsMapper::fillMaps() { tTandPs_[tccId][psCounter][1] = ps + 1; psCounter++; } // loop on TCC's - } // loop on towers in TCC - } // loop in ps in tower + } // loop on towers in TCC + } // loop in ps in tower // for (int tccId=0; tccIdinterpretRawData(data, *productMatacq); } // endif - } //endfor + } //endfor // commit to the event e.put(std::move(productPN)); diff --git a/EventFilter/EcalTBRawToDigi/src/EcalDCCUnpackingModule.cc b/EventFilter/EcalTBRawToDigi/src/EcalDCCUnpackingModule.cc index b06ff9c8f2ee1..f4ef967e86a77 100644 --- a/EventFilter/EcalTBRawToDigi/src/EcalDCCUnpackingModule.cc +++ b/EventFilter/EcalTBRawToDigi/src/EcalDCCUnpackingModule.cc @@ -185,7 +185,7 @@ void EcalDCCTBUnpackingModule::produce(edm::Event& e, const edm::EventSetup& c) else if (id == MATACQ_FED_ID) matacqFormatter_->interpretRawData(data, *productMatacq); } // endif - } //endfor + } //endfor // commit to the event e.put(std::move(productPN)); diff --git a/EventFilter/EcalTBRawToDigi/src/EcalTB07DaqFormatter.cc b/EventFilter/EcalTBRawToDigi/src/EcalTB07DaqFormatter.cc index 662a9a4e126e6..7e294125e74a6 100644 --- a/EventFilter/EcalTBRawToDigi/src/EcalTB07DaqFormatter.cc +++ b/EventFilter/EcalTBRawToDigi/src/EcalTB07DaqFormatter.cc @@ -743,8 +743,8 @@ void EcalTB07DaqFormatter::DecodeMEM(DCCTBTowerBlock* towerblock, data_MEM[memStoreIndex] = new_data & 0x3fff; } // loop on samples - } // loop on strips - } // loop on channels + } // loop on strips + } // loop on channels for (int pnId = 0; pnId < kPnPerTowerBlock; pnId++) pnIsOkInBlock[pnId] = true; @@ -783,7 +783,7 @@ void EcalTB07DaqFormatter::DecodeMEM(DCCTBTowerBlock* towerblock, thePnDigi.setSize(kSamplesPerPn); for (int sample = 0; sample < kSamplesPerPn; sample++) { - EcalFEMSample thePnSample(data_MEM[(mem_id)*250 + (pnId - 1) * kSamplesPerPn + sample]); + EcalFEMSample thePnSample(data_MEM[(mem_id) * 250 + (pnId - 1) * kSamplesPerPn + sample]); thePnDigi.setSample(sample, thePnSample); } pndigicollection.push_back(thePnDigi); diff --git a/EventFilter/EcalTBRawToDigi/src/EcalTBDaqFormatter.cc b/EventFilter/EcalTBRawToDigi/src/EcalTBDaqFormatter.cc index 0686fcc580aa2..d86264d16ce23 100644 --- a/EventFilter/EcalTBRawToDigi/src/EcalTBDaqFormatter.cc +++ b/EventFilter/EcalTBRawToDigi/src/EcalTBDaqFormatter.cc @@ -673,8 +673,8 @@ void EcalTBDaqFormatter::DecodeMEM(DCCTBTowerBlock* towerblock, data_MEM[memStoreIndex] = new_data & 0x3fff; } // loop on samples - } // loop on strips - } // loop on channels + } // loop on strips + } // loop on channels for (int pnId = 0; pnId < kPnPerTowerBlock; pnId++) pnIsOkInBlock[pnId] = true; @@ -713,7 +713,7 @@ void EcalTBDaqFormatter::DecodeMEM(DCCTBTowerBlock* towerblock, thePnDigi.setSize(kSamplesPerPn); for (int sample = 0; sample < kSamplesPerPn; sample++) { - EcalFEMSample thePnSample(data_MEM[(mem_id)*250 + (pnId - 1) * kSamplesPerPn + sample]); + EcalFEMSample thePnSample(data_MEM[(mem_id) * 250 + (pnId - 1) * kSamplesPerPn + sample]); thePnDigi.setSample(sample, thePnSample); } pndigicollection.push_back(thePnDigi); diff --git a/EventFilter/EcalTBRawToDigi/src/MatacqDataFormatter.h b/EventFilter/EcalTBRawToDigi/src/MatacqDataFormatter.h index 75680b15cbf36..ee994aaab8dbd 100644 --- a/EventFilter/EcalTBRawToDigi/src/MatacqDataFormatter.h +++ b/EventFilter/EcalTBRawToDigi/src/MatacqDataFormatter.h @@ -13,7 +13,7 @@ class FEDRawData; class MatacqTBDataFormatter { public: - MatacqTBDataFormatter(){}; + MatacqTBDataFormatter() {} virtual ~MatacqTBDataFormatter() { LogDebug("EcalTBRawToDigi") << "@SUB=MatacqTBDataFormatter" << "\n"; diff --git a/EventFilter/EcalTBRawToDigi/test/stubs/EcalDigiDumperModule.cc b/EventFilter/EcalTBRawToDigi/test/stubs/EcalDigiDumperModule.cc index 8b0b4022601f2..63853a24eeb5e 100644 --- a/EventFilter/EcalTBRawToDigi/test/stubs/EcalDigiDumperModule.cc +++ b/EventFilter/EcalTBRawToDigi/test/stubs/EcalDigiDumperModule.cc @@ -130,7 +130,7 @@ class EcalDigiDumperModule : public edm::one::EDAnalyzer<> { std::cout << "channel: dccNum= " << id.dccId() << "\t tower= " << id.towerId() << "\t channelNum= " << id.channelId() << " has problems in the gain bits" << std::endl; } // end of loop on gain errors in the mem - } // end if + } // end if if (MemId->size() && memErrors) { std::cout << "\n\n^^^^^^^^^^^^^^^^^^ [EcalDigiDumperModule] Size of collection of mem tt_block_id errors is: " @@ -142,7 +142,7 @@ class EcalDigiDumperModule : public edm::one::EDAnalyzer<> { std::cout << "tower_block: dccNum= " << id.dccId() << "\t tower= " << id.towerId() << " has ID problems " << std::endl; } // end of loop tower_block_id errors in the mem - } // end if + } // end if short dumpCounter = 0; diff --git a/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.cc b/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.cc index 60c07219719fb..76f776bfd1265 100644 --- a/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.cc +++ b/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.cc @@ -33,7 +33,7 @@ class GEMDigiToRawModule : public edm::global::EDProducer globalBeginRun(edm::Run const&, edm::EventSetup const&) const override; void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override; - void globalEndRun(edm::Run const&, edm::EventSetup const&) const override{}; + void globalEndRun(edm::Run const&, edm::EventSetup const&) const override {} // Fill parameters descriptions static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); @@ -238,7 +238,7 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve amc13->setCDFTrailer(EvtLength); amc13s.emplace_back(std::move(amc13)); } // finished making amc13 data - } // end of FED loop + } // end of FED loop // read out amc13s into fedRawData for (const auto& amc13e : amc13s) { diff --git a/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc b/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc index 085db82b65c08..06af4660e16b9 100644 --- a/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc +++ b/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc @@ -36,7 +36,7 @@ class GEMRawToDigiModule : public edm::global::EDProducer globalBeginRun(edm::Run const&, edm::EventSetup const&) const override; void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override; - void globalEndRun(edm::Run const&, edm::EventSetup const&) const override{}; + void globalEndRun(edm::Run const&, edm::EventSetup const&) const override {} // Fill parameters descriptions static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/EventFilter/GctRawToDigi/src/GctBlockHeader.h b/EventFilter/GctRawToDigi/src/GctBlockHeader.h index b50e500f19c24..eb65a7616b17a 100644 --- a/EventFilter/GctRawToDigi/src/GctBlockHeader.h +++ b/EventFilter/GctRawToDigi/src/GctBlockHeader.h @@ -21,7 +21,7 @@ class GctBlockHeader { GctBlockHeader(uint32_t blockId, uint32_t blockLength, uint32_t nSamples, uint32_t bxId, uint32_t eventId, bool valid); /// Destructor. - ~GctBlockHeader(){}; + ~GctBlockHeader() {} /// Get the block ID uint32_t blockId() const { return m_blockId; } diff --git a/EventFilter/GctRawToDigi/src/GctFormatTranslateBase.h b/EventFilter/GctRawToDigi/src/GctFormatTranslateBase.h index 29fb49ab440b4..359530bf5ea05 100644 --- a/EventFilter/GctRawToDigi/src/GctFormatTranslateBase.h +++ b/EventFilter/GctRawToDigi/src/GctFormatTranslateBase.h @@ -96,14 +96,14 @@ class GctFormatTranslateBase { /* Data member access methods */ GctUnpackCollections* const colls() const { return m_collections; - } ///< Protected access to the GCT Unpack Collections. + } ///< Protected access to the GCT Unpack Collections. bool hltMode() const { return m_hltMode; } ///< Protected interface to get HLT optimisation mode flag. bool unpackSharedRegions() const { return m_unpackSharedRegions; } /// Protected interface to the unpackSharedRegions commissioning option. const SourceCardRouting& srcCardRouting() const { return m_srcCardRouting; - } ///< Protected access to SourceCardRouting. + } ///< Protected access to SourceCardRouting. const uint32_t packingBxId() const { return m_packingBxId; } ///< Get the BxId to be used when packing data. const uint32_t packingEventId() const { return m_packingEventId; } ///< Get the EventId to be used when packing data. diff --git a/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc b/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc index 787e9d6d9ae65..9b7b94a336405 100644 --- a/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc +++ b/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc @@ -617,7 +617,7 @@ void GctFormatTranslateMCLegacy::blockToRctEmCand(const unsigned char* d, const for (unsigned short cyc = 0; cyc < 2; ++cyc) { if (iSfp == 0) { sfp[cyc][iSfp] = 0; - } // muon bits + } // muon bits else { // EM candidate sfp[cyc][iSfp] = *p; ++p; diff --git a/EventFilter/GctRawToDigi/src/GctFormatTranslateV35.cc b/EventFilter/GctRawToDigi/src/GctFormatTranslateV35.cc index 7eed09b4f8814..06639a7927f19 100644 --- a/EventFilter/GctRawToDigi/src/GctFormatTranslateV35.cc +++ b/EventFilter/GctRawToDigi/src/GctFormatTranslateV35.cc @@ -822,7 +822,7 @@ void GctFormatTranslateV35::blockToRctEmCand(const unsigned char* d, const GctBl for (unsigned short cyc = 0; cyc < 2; ++cyc) { if (iSfp == 0) { sfp[cyc][iSfp] = 0; - } // muon bits + } // muon bits else { // EM candidate sfp[cyc][iSfp] = *p; ++p; diff --git a/EventFilter/GctRawToDigi/src/GctFormatTranslateV38.cc b/EventFilter/GctRawToDigi/src/GctFormatTranslateV38.cc index c9ba7b0056e16..c04c0307b764b 100644 --- a/EventFilter/GctRawToDigi/src/GctFormatTranslateV38.cc +++ b/EventFilter/GctRawToDigi/src/GctFormatTranslateV38.cc @@ -878,7 +878,7 @@ void GctFormatTranslateV38::blockToRctEmCand(const unsigned char* d, const GctBl for (unsigned short cyc = 0; cyc < 2; ++cyc) { if (iSfp == 0) { sfp[cyc][iSfp] = 0; - } // muon bits + } // muon bits else { // EM candidate sfp[cyc][iSfp] = *p; ++p; diff --git a/EventFilter/HcalRawToDigi/plugins/PackerHelp.h b/EventFilter/HcalRawToDigi/plugins/PackerHelp.h index b9d7dcd4803eb..1d01c463b1ff7 100644 --- a/EventFilter/HcalRawToDigi/plugins/PackerHelp.h +++ b/EventFilter/HcalRawToDigi/plugins/PackerHelp.h @@ -291,7 +291,7 @@ class HCalFED { fedData.push_back((uhtrs[iAMC][amcWord] >> 0) & 0xFF); // split 16-bit words into 8-bit fedData.push_back((uhtrs[iAMC][amcWord] >> 8) & 0xFF); } // end loop over uhtr words - } // end loop over uhtrs + } // end loop over uhtrs // fedData should be a integer number of 64 bit words while (fedData.size() % 8 != 0) diff --git a/EventFilter/HcalRawToDigi/src/HcalHTRData.cc b/EventFilter/HcalRawToDigi/src/HcalHTRData.cc index 298370fb565aa..18e8393eccbe9 100644 --- a/EventFilter/HcalRawToDigi/src/HcalHTRData.cc +++ b/EventFilter/HcalRawToDigi/src/HcalHTRData.cc @@ -457,7 +457,7 @@ bool HcalHTRData::unpack_per_channel_header( flav = (header >> 12) & 0x7; error_flags = (header >> 10) & 0x3; capid0 = (header >> 8) & 0x3; - channelid = (header)&0xFF; + channelid = (header) & 0xFF; return (header & 0x8000) != 0; } diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScBMTFRawToDigi.cc b/EventFilter/L1ScoutingRawToDigi/plugins/ScBMTFRawToDigi.cc index 68b89c7316908..492b659a42383 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/ScBMTFRawToDigi.cc +++ b/EventFilter/L1ScoutingRawToDigi/plugins/ScBMTFRawToDigi.cc @@ -17,7 +17,7 @@ ScBMTFRawToDigi::ScBMTFRawToDigi(const edm::ParameterSet& iConfig) { rawToken_ = consumes(srcInputTag_); } -ScBMTFRawToDigi::~ScBMTFRawToDigi(){}; +ScBMTFRawToDigi::~ScBMTFRawToDigi() {} void ScBMTFRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc b/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc index 61a6d26e26466..ccc999f4922b8 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc +++ b/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc @@ -25,7 +25,7 @@ ScCaloRawToDigi::ScCaloRawToDigi(const edm::ParameterSet& iConfig) { produces("EtSum").setBranchAlias("BxSumsOrbitCollection"); } -ScCaloRawToDigi::~ScCaloRawToDigi(){}; +ScCaloRawToDigi::~ScCaloRawToDigi() {} void ScCaloRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc b/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc index f7e48fa9aac1e..296db5f3e3319 100644 --- a/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc +++ b/EventFilter/L1ScoutingRawToDigi/plugins/ScGMTRawToDigi.cc @@ -17,7 +17,7 @@ ScGMTRawToDigi::ScGMTRawToDigi(const edm::ParameterSet& iConfig) { rawToken = consumes(srcInputTag); } -ScGMTRawToDigi::~ScGMTRawToDigi(){}; +ScGMTRawToDigi::~ScGMTRawToDigi() {} void ScGMTRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; diff --git a/EventFilter/L1TRawToDigi/interface/AMC13Spec.h b/EventFilter/L1TRawToDigi/interface/AMC13Spec.h index 5271e621a5cd4..cb77d7d1a46ca 100644 --- a/EventFilter/L1TRawToDigi/interface/AMC13Spec.h +++ b/EventFilter/L1TRawToDigi/interface/AMC13Spec.h @@ -14,8 +14,8 @@ namespace edm { namespace amc13 { class Header { public: - Header() : data_(0){}; - Header(const uint64_t *data) : data_(data[0]){}; + Header() : data_(0) {} + Header(const uint64_t *data) : data_(data[0]) {} Header(unsigned int namc, unsigned int orbit); inline uint64_t raw() const { return data_; }; @@ -41,7 +41,7 @@ namespace amc13 { class Trailer { public: - Trailer(const uint64_t *data) : data_(data[0]){}; + Trailer(const uint64_t *data) : data_(data[0]) {} Trailer(unsigned int blk, unsigned int lv1, unsigned int bx); inline unsigned int getCRC() const { return (data_ >> CRC_shift) & CRC_mask; }; @@ -68,7 +68,7 @@ namespace amc13 { class Packet { public: - Packet(){}; + Packet() {} unsigned int blocks() const; unsigned int size() const; diff --git a/EventFilter/L1TRawToDigi/interface/AMCSpec.h b/EventFilter/L1TRawToDigi/interface/AMCSpec.h index 673c64a7b2723..4b2206bfba9a7 100644 --- a/EventFilter/L1TRawToDigi/interface/AMCSpec.h +++ b/EventFilter/L1TRawToDigi/interface/AMCSpec.h @@ -12,8 +12,8 @@ namespace amc { // be used when packing/unpacking AMC payloads into AMC13 blocks. class BlockHeader { public: - BlockHeader() : data_(0){}; - BlockHeader(const uint64_t *data) : data_(data[0]){}; + BlockHeader() : data_(0) {} + BlockHeader(const uint64_t *data) : data_(data[0]) {} // size is the total size of the AMC payload, not just of the // block BlockHeader(unsigned int amc_no, unsigned int board_id, unsigned int size, unsigned int block = 0); @@ -58,8 +58,8 @@ namespace amc { // AMC payload of an AMC13 packet/block. class Header { public: - Header() : data0_(0), data1_(0){}; - Header(const uint64_t *data) : data0_(data[0]), data1_(data[1]){}; + Header() : data0_(0), data1_(0) {} + Header(const uint64_t *data) : data0_(data[0]), data1_(data[1]) {} Header(unsigned int amc_no, unsigned int lv1_id, unsigned int bx_id, @@ -101,8 +101,8 @@ namespace amc { class Trailer { public: - Trailer() : data_(0){}; - Trailer(const uint64_t *data) : data_(data[0]){}; + Trailer() : data_(0) {} + Trailer(const uint64_t *data) : data_(data[0]) {} Trailer(unsigned int crc, unsigned int lv1_id, unsigned int size); inline unsigned int getCRC() const { return (data_ >> CRC_shift) & CRC_mask; }; @@ -127,7 +127,7 @@ namespace amc { class Packet { public: - Packet(const uint64_t *d) : block_header_(d){}; + Packet(const uint64_t *d) : block_header_(d) {} Packet(unsigned int amc, unsigned int board, unsigned int lv1id, diff --git a/EventFilter/L1TRawToDigi/interface/Block.h b/EventFilter/L1TRawToDigi/interface/Block.h index 9e25d93f2b3ca..b91469d126368 100644 --- a/EventFilter/L1TRawToDigi/interface/Block.h +++ b/EventFilter/L1TRawToDigi/interface/Block.h @@ -29,14 +29,14 @@ namespace l1t { class BlockHeader { public: BlockHeader(unsigned int id, unsigned int size, unsigned int capID = 0, unsigned int flags = 0, block_t type = MP7) - : id_(id), size_(size), capID_(capID), flags_(flags), type_(type){}; + : id_(id), size_(size), capID_(capID), flags_(flags), type_(type) {} // Create a MP7 block header: everything is contained in the raw uint32 BlockHeader(const uint32_t* data) : id_((data[0] >> ID_shift) & ID_mask), size_((data[0] >> size_shift) & size_mask), capID_((data[0] >> capID_shift) & capID_mask), flags_((data[0] >> flags_shift) & flags_mask), - type_(MP7){}; + type_(MP7) {} bool operator<(const BlockHeader& o) const { return getID() < o.getID(); }; @@ -70,13 +70,13 @@ namespace l1t { class Block { public: Block(const BlockHeader& h, const uint32_t* payload_start, const uint32_t* payload_end) - : header_(h), payload_(payload_start, payload_end){}; + : header_(h), payload_(payload_start, payload_end) {} Block(unsigned int id, const std::vector& payload, unsigned int capID = 0, unsigned int flags = 0, block_t type = MP7) - : header_(id, payload.size(), capID, flags, type), payload_(payload){}; + : header_(id, payload.size(), capID, flags, type), payload_(payload) {} bool operator<(const Block& o) const { return header() < o.header(); }; @@ -100,8 +100,8 @@ namespace l1t { class Payload { public: - Payload(const uint32_t* data, const uint32_t* end) : data_(data), end_(end), algo_(0), infra_(0){}; - virtual ~Payload(){}; + Payload(const uint32_t* data, const uint32_t* end) : data_(data), end_(end), algo_(0), infra_(0) {} + virtual ~Payload() {} virtual unsigned getAlgorithmFWVersion() const { return algo_; }; virtual unsigned getInfrastructureFWVersion() const { return infra_; }; virtual unsigned getHeaderSize() const = 0; diff --git a/EventFilter/L1TRawToDigi/interface/PackingSetup.h b/EventFilter/L1TRawToDigi/interface/PackingSetup.h index ba51081f3bb8c..21bf667069157 100644 --- a/EventFilter/L1TRawToDigi/interface/PackingSetup.h +++ b/EventFilter/L1TRawToDigi/interface/PackingSetup.h @@ -26,8 +26,8 @@ namespace l1t { class PackingSetup { public: - PackingSetup(){}; - virtual ~PackingSetup(){}; + PackingSetup() {} + virtual ~PackingSetup() {} virtual std::unique_ptr registerConsumes(const edm::ParameterSet&, edm::ConsumesCollector&) = 0; virtual void registerProducts(edm::ProducesCollector) = 0; diff --git a/EventFilter/L1TRawToDigi/interface/Unpacker.h b/EventFilter/L1TRawToDigi/interface/Unpacker.h index 35bfbc78444e5..65a501ba0a825 100644 --- a/EventFilter/L1TRawToDigi/interface/Unpacker.h +++ b/EventFilter/L1TRawToDigi/interface/Unpacker.h @@ -10,7 +10,7 @@ namespace l1t { class Unpacker { public: - Unpacker() : algoVersion_(0){}; + Unpacker() : algoVersion_(0) {} virtual ~Unpacker() = default; virtual bool unpack(const Block& block, UnpackerCollections* coll) = 0; diff --git a/EventFilter/L1TRawToDigi/interface/UnpackerCollections.h b/EventFilter/L1TRawToDigi/interface/UnpackerCollections.h index 8efd842d62de0..dab23962ac65f 100644 --- a/EventFilter/L1TRawToDigi/interface/UnpackerCollections.h +++ b/EventFilter/L1TRawToDigi/interface/UnpackerCollections.h @@ -8,8 +8,8 @@ namespace edm { namespace l1t { class UnpackerCollections { public: - UnpackerCollections(edm::Event& e) : event_(e){}; - virtual ~UnpackerCollections(){}; + UnpackerCollections(edm::Event& e) : event_(e) {} + virtual ~UnpackerCollections() {} protected: edm::Event& event_; diff --git a/EventFilter/L1TRawToDigi/plugins/PackerFactory.h b/EventFilter/L1TRawToDigi/plugins/PackerFactory.h index 81503425c5413..bbb0eb7574c67 100644 --- a/EventFilter/L1TRawToDigi/plugins/PackerFactory.h +++ b/EventFilter/L1TRawToDigi/plugins/PackerFactory.h @@ -15,7 +15,7 @@ namespace l1t { std::shared_ptr make(const std::string&) const; private: - PackerFactory(){}; + PackerFactory() {} static const PackerFactory instance_; }; } // namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/PackingSetupFactory.h b/EventFilter/L1TRawToDigi/plugins/PackingSetupFactory.h index a4bb47ba3947a..b6b64bf892de3 100644 --- a/EventFilter/L1TRawToDigi/plugins/PackingSetupFactory.h +++ b/EventFilter/L1TRawToDigi/plugins/PackingSetupFactory.h @@ -16,7 +16,7 @@ namespace l1t { void fillDescription(edm::ParameterSetDescription&) const; private: - PackingSetupFactory(){}; + PackingSetupFactory() {} static const PackingSetupFactory instance_; }; } // namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h b/EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h index f44c2de9884df..799da96f4f01a 100644 --- a/EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h +++ b/EventFilter/L1TRawToDigi/plugins/UnpackerFactory.h @@ -15,7 +15,7 @@ namespace l1t { std::shared_ptr make(const std::string&) const; private: - UnpackerFactory(){}; + UnpackerFactory() {} static const UnpackerFactory instance_; }; } // namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloCollections.h index 83db609fafedd..b128268687ad9 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloCollections.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloCollections.h @@ -32,7 +32,7 @@ namespace l1t { calospareHFBitCounts_(new CaloSpareBxCollection()), calospareHFRingSums_(new CaloSpareBxCollection()), caloEmCands_(new L1CaloEmCollection()), - caloRegions_(new L1CaloRegionCollection()){}; + caloRegions_(new L1CaloRegionCollection()) {} ~CaloCollections() override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h index 851e2ebeb1d3e..9f45902745ffc 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/CaloSetup.h @@ -14,7 +14,7 @@ namespace l1t { namespace stage1 { class CaloSetup : public PackingSetup { public: - ~CaloSetup() override{}; + ~CaloSetup() override {} std::unique_ptr registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override; void fillDescription(edm::ParameterSetDescription& desc) override; PackerMap getPackers(int fed, unsigned int fw) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.cc index 6f8d01002735d..57ac2599d4d4f 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.cc @@ -72,7 +72,7 @@ namespace l1t { return true; } } // namespace legacy - } // namespace stage1 + } // namespace stage1 } // namespace l1t DEFINE_L1T_UNPACKER(l1t::stage1::legacy::EtSumUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.h index 12247d7c21e07..f635ee330a4a3 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyEtSumUnpacker.h @@ -11,7 +11,7 @@ namespace l1t { bool unpack(const Block& block, UnpackerCollections* coll) override; }; } // namespace legacy - } // namespace stage1 + } // namespace stage1 } // namespace l1t #endif diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.cc index 525a334d1534f..5b1c5946cf810 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.cc @@ -72,7 +72,7 @@ namespace l1t { return true; } } // namespace legacy - } // namespace stage1 + } // namespace stage1 } // namespace l1t DEFINE_L1T_UNPACKER(l1t::stage1::legacy::HFRingUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.h index 41365ea586527..84cb7e69619d6 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyHFRingUnpacker.h @@ -11,7 +11,7 @@ namespace l1t { bool unpack(const Block& block, UnpackerCollections* coll) override; }; } // namespace legacy - } // namespace stage1 + } // namespace stage1 } // namespace l1t #endif diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.cc index 78f8fc1f69478..02499263dbd71 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.cc @@ -101,7 +101,7 @@ namespace l1t { return process(block, res, [](const l1t::Tau& t) { return t; }); } } // namespace legacy - } // namespace stage1 + } // namespace stage1 } // namespace l1t DEFINE_L1T_UNPACKER(l1t::stage1::legacy::IsoEGammaUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.h index 7f4237272c612..5de1fca4668ab 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/LegacyPhysCandUnpacker.h @@ -36,7 +36,7 @@ namespace l1t { bool unpack(const Block& block, UnpackerCollections* coll) override; }; } // namespace legacy - } // namespace stage1 + } // namespace stage1 } // namespace l1t #endif diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/PhysCandUnpacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/PhysCandUnpacker.cc index 3b2d65e78ed47..05da85fc8daf2 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/PhysCandUnpacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/PhysCandUnpacker.cc @@ -87,14 +87,12 @@ namespace l1t { bool NonIsoEGammaUnpackerLeft::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getEGammas(); - return process( - block, res, [](const l1t::EGamma& eg) { return eg; }, true, false, false); + return process(block, res, [](const l1t::EGamma& eg) { return eg; }, true, false, false); } bool CentralJetUnpackerLeft::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getJets(); - return process( - block, res, [](const l1t::Jet& j) { return j; }, true, true, false); + return process(block, res, [](const l1t::Jet& j) { return j; }, true, true, false); } bool ForwardJetUnpackerLeft::unpack(const Block& block, UnpackerCollections* coll) { @@ -113,14 +111,12 @@ namespace l1t { bool TauUnpackerLeft::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getTaus(); - return process( - block, res, [](const l1t::Tau& t) { return t; }, true, true, true); + return process(block, res, [](const l1t::Tau& t) { return t; }, true, true, true); } bool IsoTauUnpackerLeft::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getIsoTaus(); - return process( - block, res, [](const l1t::Tau& t) { return t; }, true, true, true); + return process(block, res, [](const l1t::Tau& t) { return t; }, true, true, true); } bool IsoEGammaUnpackerRight::unpack(const Block& block, UnpackerCollections* coll) { @@ -139,14 +135,12 @@ namespace l1t { bool NonIsoEGammaUnpackerRight::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getEGammas(); - return process( - block, res, [](const l1t::EGamma& eg) { return eg; }, false, false, false); + return process(block, res, [](const l1t::EGamma& eg) { return eg; }, false, false, false); } bool CentralJetUnpackerRight::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getJets(); - return process( - block, res, [](const l1t::Jet& j) { return j; }, false, true, false); + return process(block, res, [](const l1t::Jet& j) { return j; }, false, true, false); } bool ForwardJetUnpackerRight::unpack(const Block& block, UnpackerCollections* coll) { @@ -165,14 +159,12 @@ namespace l1t { bool TauUnpackerRight::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getTaus(); - return process( - block, res, [](const l1t::Tau& t) { return t; }, false, true, true); + return process(block, res, [](const l1t::Tau& t) { return t; }, false, true, true); } bool IsoTauUnpackerRight::unpack(const Block& block, UnpackerCollections* coll) { auto res = static_cast(coll)->getIsoTaus(); - return process( - block, res, [](const l1t::Tau& t) { return t; }, false, true, true); + return process(block, res, [](const l1t::Tau& t) { return t; }, false, true, true); } } // namespace stage1 } // namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionUnpacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionUnpacker.cc index c8cf458c7aacf..5d0c3447aa6f2 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionUnpacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionUnpacker.cc @@ -82,7 +82,7 @@ namespace l1t { resRCTEMCands_->push_back(em); } } // end if odd - } // end of loop over BX + } // end of loop over BX } void unpack_region(const Block& block, UnpackerCollections* coll) { @@ -154,7 +154,7 @@ namespace l1t { } } } // end if even - } // end of loop over BX + } // end of loop over BX } bool RCTEmRegionUnpacker::unpack(const Block& block, UnpackerCollections* coll) { diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/rctDataBase.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/rctDataBase.h index 6d2a7339b620c..08286c31c5cf5 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/rctDataBase.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/rctDataBase.h @@ -33,7 +33,7 @@ namespace l1t { public: rctDataBase(); - ~rctDataBase(){}; + ~rctDataBase() {} int GetLength(rctObjectType t) { return length[t]; } diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFCollections.h index c90a5699f32fc..6ef20f75103ad 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFCollections.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFCollections.h @@ -16,7 +16,7 @@ namespace l1t { outputMuons_(new RegionalMuonCandBxCollection()), outputMuons2_(new RegionalMuonCandBxCollection()), inputMuonsPh_(new L1MuDTChambPhContainer), - inputMuonsTh_(new L1MuDTChambThContainer){}; + inputMuonsTh_(new L1MuDTChambThContainer) {} ~BMTFCollections() override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.cc index 0cefc8e4082b0..3bbdca73a62b2 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFSetup.cc @@ -12,7 +12,7 @@ namespace l1t { return std::unique_ptr(new BMTFTokens(cfg, cc)); } - void BMTFSetup::fillDescription(edm::ParameterSetDescription& desc){}; + void BMTFSetup::fillDescription(edm::ParameterSetDescription& desc) {} PackerMap BMTFSetup::getPackers(int fed, unsigned int fw) { PackerMap res; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerInputs.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerInputs.cc index a199a1e29b7de..bc427b421b3f5 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerInputs.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerInputs.cc @@ -172,7 +172,7 @@ namespace l1t { bool BMTFUnpackerInputsNewQual::unpack(const Block& block, UnpackerCollections* coll) { return unpacking_bmtf(block, coll, linkAndQual_, true); } //unpack new quality - } // namespace stage2 + } // namespace stage2 } // namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::BMTFUnpackerInputsOldQual); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.cc index 9486ec686f16d..95d60f9cb5ef4 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.cc @@ -83,7 +83,7 @@ namespace l1t { res->push_back(ibx, muCand); } //for iw - } //for ibx + } //for ibx return true; } //unpack diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.h index f250c1e26a81f..dca27c3d734a8 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/BMTFUnpackerOutput.h @@ -18,7 +18,7 @@ namespace l1t { isKalman = false; isTriggeringAlgo = isTriggering_; } - ~BMTFUnpackerOutput() override{}; + ~BMTFUnpackerOutput() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; void setKalmanAlgoTrue() { isKalman = true; } diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloCollections.h index ae5325d8bee7b..aa97629918203 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloCollections.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloCollections.h @@ -24,7 +24,7 @@ namespace l1t { mp_etsums_(new EtSumBxCollection()), mp_jets_(new JetBxCollection()), mp_egammas_(new EGammaBxCollection()), - mp_taus_(new TauBxCollection()){}; + mp_taus_(new TauBxCollection()) {} ~CaloCollections() override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h index 543d284d16ec7..162254b4c827e 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloSummaryCollections.h @@ -10,7 +10,7 @@ namespace l1t { class CaloSummaryCollections : public UnpackerCollections { public: CaloSummaryCollections(edm::Event& e) - : UnpackerCollections(e), cicadaDigis_(std::make_unique()){}; + : UnpackerCollections(e), cicadaDigis_(std::make_unique()) {} ~CaloSummaryCollections() override; inline CICADABxCollection* getCICADABxCollection() { return cicadaDigis_.get(); }; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EGammaUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EGammaUnpacker.h index 96650694ea0ae..8dca0e33f05c3 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EGammaUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EGammaUnpacker.h @@ -8,7 +8,7 @@ namespace l1t { class EGammaUnpacker : public Unpacker { public: EGammaUnpacker(); - ~EGammaUnpacker() override{}; + ~EGammaUnpacker() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockCounters.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockCounters.cc index 5e4b79e52b598..94f1bffb46846 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockCounters.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockCounters.cc @@ -24,7 +24,7 @@ namespace l1t { // }; } // namespace emtf - } // namespace stage2 + } // namespace stage2 } // namespace l1t namespace l1t { @@ -207,7 +207,7 @@ namespace l1t { // } // End bool CountersBlockPacker::pack } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::emtf::CountersBlockUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc index c335728f21841..b2e618956e6f6 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockGEM.cc @@ -23,7 +23,7 @@ namespace l1t { // }; } // namespace emtf - } // namespace stage2 + } // namespace stage2 } // namespace l1t namespace l1t { @@ -300,7 +300,7 @@ namespace l1t { // } // End bool GEMBlockPacker::pack } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::emtf::GEMBlockUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockHeaders.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockHeaders.cc index 2f34a133845a3..79d1245c092a7 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockHeaders.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockHeaders.cc @@ -24,7 +24,7 @@ namespace l1t { // }; } // namespace emtf - } // namespace stage2 + } // namespace stage2 } // namespace l1t namespace l1t { @@ -303,7 +303,7 @@ namespace l1t { // } // End bool HeadersBlockPacker::pack } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::emtf::HeadersBlockUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockME.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockME.cc index 63f1f82c66546..44d9d62a41826 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockME.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockME.cc @@ -24,7 +24,7 @@ namespace l1t { // }; } // namespace emtf - } // namespace stage2 + } // namespace stage2 } // namespace l1t namespace l1t { @@ -370,7 +370,7 @@ namespace l1t { // } // End bool MEBlockPacker::pack } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::emtf::MEBlockUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc index be30688d08c9a..e123c7f853592 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockRPC.cc @@ -25,7 +25,7 @@ namespace l1t { // }; } // namespace emtf - } // namespace stage2 + } // namespace stage2 } // namespace l1t namespace l1t { @@ -301,7 +301,7 @@ namespace l1t { // } // End bool RPCBlockPacker::pack } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::emtf::RPCBlockUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockSP.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockSP.cc index 86c0452bae1b7..17315d71b5d8e 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockSP.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockSP.cc @@ -24,7 +24,7 @@ namespace l1t { // }; } // namespace emtf - } // namespace stage2 + } // namespace stage2 } // namespace l1t namespace l1t { @@ -400,7 +400,7 @@ namespace l1t { L1TMuonEndCap::calc_uGMT_chamber(conv_vals_SP.at(0), conv_vals_SP.at(2), conv_vals_SP.at(3), 1)); } St_hits.at(0) += 1; // Count the total number of matches for debugging purposes - } // End conditional: if ( Hit.Station() == 1 + } // End conditional: if ( Hit.Station() == 1 // Match hit in station 2 conv_vals_SP = convert_SP_location(SP_.ME2_CSC_ID(), (res->at(iOut)).PtrEventHeader()->Sector(), -99, 2); @@ -621,7 +621,7 @@ namespace l1t { // } // End bool SPBlockPacker::pack } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::emtf::SPBlockUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockTrailers.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockTrailers.cc index 7748ef7e6f127..047ce57317a4e 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockTrailers.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockTrailers.cc @@ -24,7 +24,7 @@ namespace l1t { // }; } // namespace emtf - } // namespace stage2 + } // namespace stage2 } // namespace l1t namespace l1t { @@ -240,7 +240,7 @@ namespace l1t { // } // End bool TrailersBlockPacker::pack } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_UNPACKER(l1t::stage2::emtf::TrailersBlockUnpacker); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h index 1b5466505115b..0efe03a63283e 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h @@ -39,7 +39,7 @@ namespace l1t { EMTFCPPFs_(new CPPFDigiCollection()), EMTFCPPFs_ZS_(new CPPFDigiCollection()), EMTFGEMPadClusters_(std::make_unique()), - EMTFGEMPadClusters_ZS_(std::make_unique()){}; + EMTFGEMPadClusters_ZS_(std::make_unique()) {} ~EMTFCollections() override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc index 3f3f16ac48a81..2f1e4f98ddf5e 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc @@ -89,7 +89,7 @@ namespace l1t { return res; } // End virtual UnpackerMap getUnpackers - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t DEFINE_L1T_PACKING_SETUP(l1t::stage2::EMTFSetup); diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.cc index 442927e9de371..ed509dc5c78c6 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.cc @@ -133,5 +133,5 @@ namespace l1t { } // End ImportSP } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.h index b38c9ec6197ff..1f074bdac71ed 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFUnpackerTools.h @@ -60,7 +60,7 @@ namespace l1t { } } // End namespace emtf - } // End namespace stage2 + } // End namespace stage2 } // End namespace l1t #endif /* define EventFilter_L1TRawToDigi_EMTFUnpackerTools_h */ diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker.h index 7468b417f8156..f704be2f73539 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker.h @@ -8,7 +8,7 @@ namespace l1t { class EtSumUnpacker : public Unpacker { public: EtSumUnpacker(); - ~EtSumUnpacker() override{}; + ~EtSumUnpacker() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker_0x10010057.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker_0x10010057.h index 963b7bf60d1d6..40531d96507a6 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker_0x10010057.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/EtSumUnpacker_0x10010057.h @@ -8,7 +8,7 @@ namespace l1t { class EtSumUnpacker_0x10010057 : public EtSumUnpacker { public: EtSumUnpacker_0x10010057(); - ~EtSumUnpacker_0x10010057() override{}; + ~EtSumUnpacker_0x10010057() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h index a0f6b9cb97d83..177e40c8e5dee 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.h @@ -19,7 +19,7 @@ namespace l1t { class GTSetup : public PackingSetup { public: - ~GTSetup() override{}; + ~GTSetup() override {} std::unique_ptr registerConsumes(const edm::ParameterSet& cfg, edm::ConsumesCollector& cc) override; void fillDescription(edm::ParameterSetDescription& desc) override; PackerMap getPackers(int fed, unsigned int fw) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GlobalExtBlkPacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GlobalExtBlkPacker.cc index f2dc99c0fcde2..bfe98df8abdd8 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GlobalExtBlkPacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GlobalExtBlkPacker.cc @@ -34,7 +34,7 @@ namespace l1t { word |= (0x1 << bt); } //end loop over bits - } //endif wrd < 2 + } //endif wrd < 2 load.push_back(word); } //loop over words diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h index 77df03fcb7de5..c6885acec754b 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h @@ -10,7 +10,7 @@ namespace l1t { class IntermediateMuonUnpacker : public Unpacker { public: IntermediateMuonUnpacker(); - ~IntermediateMuonUnpacker() override{}; + ~IntermediateMuonUnpacker() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/JetUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/JetUnpacker.h index ed9677a0d18f0..7d5793b454567 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/JetUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/JetUnpacker.h @@ -8,7 +8,7 @@ namespace l1t { class JetUnpacker : public Unpacker { public: JetUnpacker(); - ~JetUnpacker() override{}; + ~JetUnpacker() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/L1TObjectCollections.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/L1TObjectCollections.h index 40ed4d5b244b2..d3f7a99207eb1 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/L1TObjectCollections.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/L1TObjectCollections.h @@ -17,7 +17,7 @@ namespace l1t { namespace stage2 { class L1TObjectCollections : public UnpackerCollections { public: - L1TObjectCollections(edm::Event& e) : UnpackerCollections(e){}; + L1TObjectCollections(edm::Event& e) : UnpackerCollections(e) {} ~L1TObjectCollections() override; virtual MuonBxCollection* getMuons(const unsigned int copy) { return nullptr; } diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.cc index a4fd88dcb1f6a..72323f6de857b 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.cc @@ -9,7 +9,7 @@ namespace l1t { GMTOutputObjectMap gmtObjMap; std::pair muonBx = getMuons(gmtObjMap, event, static_cast(toks)->getMuonToken()); std::pair muonShowerBx{0, 0}; - if ((fedId_ == 1402 && fwId_ >= 0x7000000) || (fedId_ == 1404 && fwId_ >= 0x00010f01)) { + if (MuonRawDigiTranslator::isFwVersionWithShowers(fedId_, fwId_)) { muonShowerBx = getMuonShowers(gmtObjMap, event, static_cast(toks)->getMuonShowerToken()); } diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonUnpacker.h index f3fe08696b497..4d7615d86fc6b 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonUnpacker.h @@ -10,7 +10,7 @@ namespace l1t { class MuonUnpacker : public Unpacker { public: MuonUnpacker(); - ~MuonUnpacker() override{}; + ~MuonUnpacker() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/TauUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/TauUnpacker.h index c7d94500982d5..928c53d8587fb 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/TauUnpacker.h +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/TauUnpacker.h @@ -8,7 +8,7 @@ namespace l1t { class TauUnpacker : public Unpacker { public: TauUnpacker(); - ~TauUnpacker() override{}; + ~TauUnpacker() override {} bool unpack(const Block& block, UnpackerCollections* coll) override; diff --git a/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py b/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py index e99e0f08ff43d..ba238ce334b93 100644 --- a/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py +++ b/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py @@ -12,7 +12,7 @@ TauInputTag = cms.InputTag("simCaloStage2Digis"), JetInputTag = cms.InputTag("simCaloStage2Digis"), EtSumInputTag = cms.InputTag("simCaloStage2Digis"), - EtSumZDCInputTag = cms.InputTag("simCaloStage2Digis"), + EtSumZDCInputTag = cms.InputTag("l1tZDCEtSums"), FedId = cms.int32(1404), FWId = cms.uint32(0x1150), # FW w/ 2loose hadronic showers. lenSlinkHeader = cms.untracked.int32(8), diff --git a/EventFilter/RawDataCollector/interface/RawDataFEDSelector.h b/EventFilter/RawDataCollector/interface/RawDataFEDSelector.h index 6b447cef7b88b..c119332f9b17f 100644 --- a/EventFilter/RawDataCollector/interface/RawDataFEDSelector.h +++ b/EventFilter/RawDataCollector/interface/RawDataFEDSelector.h @@ -17,10 +17,10 @@ class FEDRawDataCollection; class RawDataFEDSelector { public: /// Constructor - RawDataFEDSelector(){}; + RawDataFEDSelector() {} /// Destructor - virtual ~RawDataFEDSelector(){}; + virtual ~RawDataFEDSelector() {} inline void setRange(const std::pair& range) { fedRange = range; }; inline void setRange(const std::vector& list) { fedList = list; }; diff --git a/EventFilter/RctRawToDigi/src/RctDataDecoder.hh b/EventFilter/RctRawToDigi/src/RctDataDecoder.hh index 9d90288d9f731..d9952c2d66b4c 100644 --- a/EventFilter/RctRawToDigi/src/RctDataDecoder.hh +++ b/EventFilter/RctRawToDigi/src/RctDataDecoder.hh @@ -122,7 +122,7 @@ public: crateNumber = 0xFF; //if linkNumber not valid set to 0xFF - linkNumber = (inputValue)&0xFF; + linkNumber = (inputValue) & 0xFF; if (linkNumber > 12) linkNumber = 0xFF; diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc index 99bf3382453f3..00717efd6602c 100644 --- a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc +++ b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc @@ -252,7 +252,7 @@ void SiPixelRawToDigi::produce(edm::Event& ev, const edm::EventSetup& es) { disabled_channelcollection, nodeterrors); } // if errors to be included in the event - } // loop on FED data to be unpacked + } // loop on FED data to be unpacked if (includeErrors_) { edm::DetSet& errorDetSet = errorcollection.find_or_insert(dummydetid); diff --git a/EventFilter/SiPixelRawToDigi/src/ErrorChecker.cc b/EventFilter/SiPixelRawToDigi/src/ErrorChecker.cc index 678b6a24195c6..ba090becc119f 100644 --- a/EventFilter/SiPixelRawToDigi/src/ErrorChecker.cc +++ b/EventFilter/SiPixelRawToDigi/src/ErrorChecker.cc @@ -18,7 +18,7 @@ using namespace edm; using namespace sipixelobjects; using namespace sipixelconstants; -ErrorChecker::ErrorChecker() : ErrorCheckerBase(){}; +ErrorChecker::ErrorChecker() : ErrorCheckerBase() {} bool ErrorChecker::checkROC(bool& errorsInEvent, int fedId, diff --git a/EventFilter/SiPixelRawToDigi/src/ErrorCheckerPhase0.cc b/EventFilter/SiPixelRawToDigi/src/ErrorCheckerPhase0.cc index 25e4c5c5b1834..ea2521c1e5d42 100644 --- a/EventFilter/SiPixelRawToDigi/src/ErrorCheckerPhase0.cc +++ b/EventFilter/SiPixelRawToDigi/src/ErrorCheckerPhase0.cc @@ -18,7 +18,7 @@ using namespace edm; using namespace sipixelobjects; using namespace sipixelconstants; -ErrorCheckerPhase0::ErrorCheckerPhase0() : ErrorCheckerBase(){}; +ErrorCheckerPhase0::ErrorCheckerPhase0() : ErrorCheckerBase() {} bool ErrorCheckerPhase0::checkROC(bool& errorsInEvent, int fedId, diff --git a/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc b/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc index c489f6e198bff..a4c4f1a04a8b1 100644 --- a/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc +++ b/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc @@ -266,8 +266,8 @@ void PixelDataFormatter::formatRawData(unsigned int lvl1_ID, << print(digi) << endl; } } // if (fedId) - } // for (DetDigis - } // for (Digis + } // for (DetDigis + } // for (Digis LogTrace(" allDetDigis_/hasDetDigis_ : ") << allDetDigis_ << "/" << hasDetDigis_; // fill FED error 25 words @@ -446,5 +446,5 @@ void PixelDataFormatter::unpackFEDErrors(PixelDataFormatter::Errors const& error } } // if error assigned to a real DetId - } // loop on errors in event for this FED + } // loop on errors in event for this FED } diff --git a/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRaw.cc b/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRaw.cc index 67c436a45a5c9..e2c179cb33551 100644 --- a/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRaw.cc +++ b/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRaw.cc @@ -224,7 +224,7 @@ namespace sistrip { (bufferGenerator_.feHeader()) .setChannelStatus(iFE, iFEUnitChannel, fedFeHeader->getChannelStatus(iFE, iFEUnitChannel)); } //loop on channels - } //loop on fe units + } //loop on fe units bufferGenerator_.setFEUnitEnables(feEnabledVec); if (edm::isDebugEnabled()) { @@ -431,8 +431,8 @@ namespace sistrip { << debugStream.str(); } } //loop on feds - } //end if-else for copying header - } //try + } //end if-else for copying header + } //try catch (const std::exception& e) { if (edm::isDebugEnabled()) { edm::LogWarning("DigiToRaw") << "DigiToRaw::createFedBuffers] " diff --git a/EventFilter/SiStripRawToDigi/plugins/SiStripRawToDigiUnpacker.cc b/EventFilter/SiStripRawToDigi/plugins/SiStripRawToDigiUnpacker.cc index 699e221042501..e914d689d699d 100644 --- a/EventFilter/SiStripRawToDigi/plugins/SiStripRawToDigiUnpacker.cc +++ b/EventFilter/SiStripRawToDigi/plugins/SiStripRawToDigiUnpacker.cc @@ -376,7 +376,7 @@ namespace sistrip { } } } // channel loop - } // fed loop + } // fed loop // bad channels warning unsigned int detIdsSize = detids.size(); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc index 5dbca003803ce..405e06ad0c52e 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc @@ -295,7 +295,7 @@ void SiStripDigiAnalyzer::analyze(const edm::Event& event, const edm::EventSetup } } } // channel loop - } // fed loop + } // fed loop } #include "FWCore/PluginManager/interface/ModuleDef.h" diff --git a/EventFilter/Utilities/interface/DAQSourceModelsFRD.h b/EventFilter/Utilities/interface/DAQSourceModelsFRD.h index 15a45c23c37f4..c49fd8280b5b5 100644 --- a/EventFilter/Utilities/interface/DAQSourceModelsFRD.h +++ b/EventFilter/Utilities/interface/DAQSourceModelsFRD.h @@ -10,7 +10,7 @@ class FEDRawDataCollection; class DataModeFRD : public DataMode { public: DataModeFRD(DAQSource* daqSource) : DataMode(daqSource) {} - ~DataModeFRD() override{}; + ~DataModeFRD() override {} std::vector>& makeDaqProvenanceHelpers() override; void readEvent(edm::EventPrincipal& eventPrincipal) override; @@ -57,7 +57,7 @@ class DataModeFRD : public DataMode { bool fitToBuffer() const override { return false; } bool dataBlockInitialized() const override { return true; } - void setDataBlockInitialized(bool) override{}; + void setDataBlockInitialized(bool) override {} void setTCDSSearchRange(uint16_t MINTCDSuTCAFEDID, uint16_t MAXTCDSuTCAFEDID) override { MINTCDSuTCAFEDID_ = MINTCDSuTCAFEDID; @@ -94,7 +94,7 @@ class DataModeFRD : public DataMode { class DataModeFRDStriped : public DataMode { public: DataModeFRDStriped(DAQSource* daqSource) : DataMode(daqSource) {} - ~DataModeFRDStriped() override{}; + ~DataModeFRDStriped() override {} std::vector>& makeDaqProvenanceHelpers() override; void readEvent(edm::EventPrincipal& eventPrincipal) override; @@ -166,7 +166,7 @@ class DataModeFRDStriped : public DataMode { bool dataBlockInitialized() const override { return dataBlockInitialized_; } - void setDataBlockInitialized(bool val) override { dataBlockInitialized_ = val; }; + void setDataBlockInitialized(bool val) override { dataBlockInitialized_ = val; } void setTCDSSearchRange(uint16_t MINTCDSuTCAFEDID, uint16_t MAXTCDSuTCAFEDID) override { MINTCDSuTCAFEDID_ = MINTCDSuTCAFEDID; diff --git a/EventFilter/Utilities/interface/DAQSourceModelsScoutingRun3.h b/EventFilter/Utilities/interface/DAQSourceModelsScoutingRun3.h index 1eff0fdb1bada..82da922ec6a86 100644 --- a/EventFilter/Utilities/interface/DAQSourceModelsScoutingRun3.h +++ b/EventFilter/Utilities/interface/DAQSourceModelsScoutingRun3.h @@ -20,7 +20,7 @@ class DataModeScoutingRun3 : public DataMode { public: DataModeScoutingRun3(DAQSource* daqSource) : DataMode(daqSource) {} - ~DataModeScoutingRun3() override{}; + ~DataModeScoutingRun3() override {} std::vector>& makeDaqProvenanceHelpers() override; void readEvent(edm::EventPrincipal& eventPrincipal) override; diff --git a/EventFilter/Utilities/interface/JsonSerializable.h b/EventFilter/Utilities/interface/JsonSerializable.h index 74950bed41826..39ca185b31604 100644 --- a/EventFilter/Utilities/interface/JsonSerializable.h +++ b/EventFilter/Utilities/interface/JsonSerializable.h @@ -13,7 +13,7 @@ namespace jsoncollector { class JsonSerializable { public: - virtual ~JsonSerializable(){}; + virtual ~JsonSerializable() {} virtual void serialize(Json::Value& root) const = 0; virtual void deserialize(Json::Value& root) = 0; }; diff --git a/EventFilter/Utilities/plugins/FRDStreamSource.h b/EventFilter/Utilities/plugins/FRDStreamSource.h index 7a52810acea2d..cbf704bbe3659 100644 --- a/EventFilter/Utilities/plugins/FRDStreamSource.h +++ b/EventFilter/Utilities/plugins/FRDStreamSource.h @@ -21,7 +21,7 @@ class FRDStreamSource : public edm::ProducerSourceFromFiles { public: // construction/destruction FRDStreamSource(edm::ParameterSet const& pset, edm::InputSourceDescription const& desc); - ~FRDStreamSource() override{}; + ~FRDStreamSource() override {} private: // member functions diff --git a/FWCore/Concurrency/interface/WaitingTask.h b/FWCore/Concurrency/interface/WaitingTask.h index 4895b01ab9c0d..cc60e060f3598 100644 --- a/FWCore/Concurrency/interface/WaitingTask.h +++ b/FWCore/Concurrency/interface/WaitingTask.h @@ -41,7 +41,7 @@ namespace edm { ///Constructor WaitingTask() noexcept : m_ptr{} {} - ~WaitingTask() noexcept override{}; + ~WaitingTask() noexcept override {} // ---------- const member functions --------------------------- diff --git a/FWCore/Concurrency/test/test_catch2_Async.cc b/FWCore/Concurrency/test/test_catch2_Async.cc index b42a276a6d541..0c02282a2fe10 100644 --- a/FWCore/Concurrency/test/test_catch2_Async.cc +++ b/FWCore/Concurrency/test/test_catch2_Async.cc @@ -48,15 +48,13 @@ TEST_CASE("Test Async", "[edm::Async") { using namespace edm::waiting_task::chain; auto h1 = first([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); auto h2 = first([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h2.doneWaiting(std::exception_ptr()); @@ -79,14 +77,12 @@ TEST_CASE("Test Async", "[edm::Async") { using namespace edm::waiting_task::chain; auto h = first([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); service.setAllowed(false); }) | then([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); diff --git a/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc b/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc index 063b00761a615..c6ad896ce79ba 100644 --- a/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc +++ b/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc @@ -28,8 +28,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { using namespace edm::waiting_task::chain; auto h = first([&pool, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - pool.runAsync( - std::move(h2), [&count]() { ++count; }, errorContext); + pool.runAsync(std::move(h2), [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); @@ -62,8 +61,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { ++count; }, errorContext); - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); @@ -90,8 +88,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { while (mayContinue != 2) { hardware_pause(); } - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); @@ -101,8 +98,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { while (mayContinue != 2) { hardware_pause(); } - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h2.doneWaiting(std::exception_ptr()); @@ -125,8 +121,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { using namespace edm::waiting_task::chain; auto h = first([&pool](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - pool.runAsync( - std::move(h2), []() { throw std::runtime_error("error"); }, errorContext); + pool.runAsync(std::move(h2), []() { throw std::runtime_error("error"); }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); @@ -265,8 +260,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { auto h2 = first([&pool, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h2.doneWaiting(std::exception_ptr()); diff --git a/FWCore/FWLite/interface/BareRootProductGetterBase.h b/FWCore/FWLite/interface/BareRootProductGetterBase.h new file mode 100644 index 0000000000000..60f3bc16c1427 --- /dev/null +++ b/FWCore/FWLite/interface/BareRootProductGetterBase.h @@ -0,0 +1,123 @@ +#ifndef FWCore_FWLite_BareRootProductGetterBase_h +#define FWCore_FWLite_BareRootProductGetterBase_h +// -*- C++ -*- +// +// Package: FWLite +// Class : BareRootProductGetterBase +// +/**\class BareRootProductGetterBase BareRootProductGetterBase.h FWCore/FWLite/interface/BareRootProductGetterBase.h + + Description: + + This file was originally FWCore/FWLite/src/BareRootProductGetter.h, + and was copied to the interface/BareRootProductGetterBase.h in order + to refactor it a little bit to make it usable for FireworksWeb. + + Usage: + + +*/ +// +// Original Author: Chris Jones +// Created: Tue May 23 11:03:27 EDT 2006 +// + +// user include files +#include "DataFormats/Common/interface/WrapperBase.h" +#include "DataFormats/Common/interface/EDProductGetter.h" +#include "FWCore/FWLite/interface/BranchMapReader.h" +#include "FWCore/Utilities/interface/propagate_const.h" + +// system include files +#include "Rtypes.h" +#include +#include +#include + +// forward declarations +class TBranch; +class TClass; + +namespace edm { + class BranchID; + class ProductID; + class ThinnedAssociation; +} // namespace edm + +class BareRootProductGetterBase : public edm::EDProductGetter { +public: + BareRootProductGetterBase(); + ~BareRootProductGetterBase() override; + BareRootProductGetterBase(BareRootProductGetterBase const&) = delete; // stop default + BareRootProductGetterBase const& operator=(BareRootProductGetterBase const&) = delete; // stop default + + // ---------- const member functions --------------------- + edm::WrapperBase const* getIt(edm::ProductID const&) const override; + + // getThinnedProduct assumes getIt was already called and failed to find + // the product. The input key is the index of the desired element in the + // container identified by ProductID (which cannot be found). + // If the return value is not null, then the desired element was + // found in a thinned container. If the desired element is not + // found, then an optional without a value is returned. + std::optional> getThinnedProduct(edm::ProductID const&, + unsigned int key) const override; + + // getThinnedProducts assumes getIt was already called and failed to find + // the product. The input keys are the indexes into the container identified + // by ProductID (which cannot be found). On input the WrapperBase pointers + // must all be set to nullptr (except when the function calls itself + // recursively where non-null pointers mark already found elements). + // Thinned containers derived from the product are searched to see + // if they contain the desired elements. For each that is + // found, the corresponding WrapperBase pointer is set and the key + // is modified to be the key into the container where the element + // was found. The WrapperBase pointers might or might not all point + // to the same thinned container. + void getThinnedProducts(edm::ProductID const&, + std::vector& foundContainers, + std::vector& keys) const override; + + // This overload is allowed to be called also without getIt() + // being called first, but the thinned ProductID must come from an + // existing RefCore. The input key is the index of the desired + // element in the container identified by the parent ProductID. + // If the return value is not null, then the desired element was found + // in a thinned container. If the desired element is not found, then + // an optional without a value is returned. + edm::OptionalThinnedKey getThinnedKeyFrom(edm::ProductID const& parent, + unsigned int key, + edm::ProductID const& thinned) const override; + +private: + // ---------- static member functions -------------------- + + // ---------- member functions --------------------------- + unsigned int transitionIndex_() const override { return 0u; } + + edm::WrapperBase const* getIt(edm::BranchID const&, Long_t eventEntry) const; + // This customization point was created for FireworksWeb + virtual TFile* currentFile() const = 0; + + struct Buffer { + Buffer(edm::WrapperBase const* iProd, TBranch* iBranch, void* iAddress, TClass* iClass) + : product_(iProd), branch_(iBranch), address_(iAddress), eventEntry_(-1), class_(iClass) {} + Buffer() : product_(), branch_(), address_(), eventEntry_(-1), class_(nullptr) {} + + std::shared_ptr product_; + edm::propagate_const branch_; + void* address_; //the address to pass to Root since as of 5.13 they cache that info + Long_t eventEntry_; //the event Entry used with the last GetEntry call + edm::propagate_const class_; + }; + + Buffer* createNewBuffer(edm::BranchID const&) const; + edm::ThinnedAssociation const* getThinnedAssociation(edm::BranchID const& branchID, Long_t eventEntry) const; + + // ---------- member data -------------------------------- + + typedef std::map IdToBuffers; + mutable IdToBuffers idToBuffers_; + mutable fwlite::BranchMapReader branchMap_; +}; +#endif diff --git a/FWCore/FWLite/src/BareRootProductGetter.cc b/FWCore/FWLite/src/BareRootProductGetter.cc index eefd68c5053f7..2c477a8d005f8 100644 --- a/FWCore/FWLite/src/BareRootProductGetter.cc +++ b/FWCore/FWLite/src/BareRootProductGetter.cc @@ -1,284 +1,16 @@ -// -*- C++ -*- -// -// Package: FWLite -// Class : BareRootProductGetter -// -// Implementation: -// -// -// Original Author: Chris Jones -// Created: Tue May 23 11:03:31 EDT 2006 -// - -// user include files -#include "FWCore/FWLite/src/BareRootProductGetter.h" -#include "DataFormats/Common/interface/ThinnedAssociation.h" -#include "DataFormats/Common/interface/Wrapper.h" -#include "DataFormats/Common/interface/getThinned_implementation.h" -#include "DataFormats/Provenance/interface/BranchDescription.h" -#include "DataFormats/Provenance/interface/BranchID.h" -#include "DataFormats/Provenance/interface/BranchType.h" -#include "DataFormats/Provenance/interface/ThinnedAssociationsHelper.h" #include "FWCore/Utilities/interface/Exception.h" -#include "FWCore/Reflection/interface/TypeWithDict.h" -#include "FWCore/Utilities/interface/WrappedClassName.h" -// system include files +#include "BareRootProductGetter.h" #include "TROOT.h" -#include "TBranch.h" -#include "TClass.h" #include "TFile.h" -#include "TTree.h" - -// -// constants, enums and typedefs -// - -// -// static data member definitions -// - -// -// constructors and destructor -// -BareRootProductGetter::BareRootProductGetter() {} - -// BareRootProductGetter::BareRootProductGetter(BareRootProductGetter const& rhs) { -// // do actual copying here; -// } - -BareRootProductGetter::~BareRootProductGetter() {} - -// -// assignment operators -// -// BareRootProductGetter const& BareRootProductGetter::operator=(BareRootProductGetter const& rhs) { -// //An exception safe implementation is -// BareRootProductGetter temp(rhs); -// swap(rhs); -// -// return *this; -// } -// -// member functions -// - -// -// const member functions -// -edm::WrapperBase const* BareRootProductGetter::getIt(edm::ProductID const& pid) const { - // std::cout << "getIt called " << pid << std::endl; - TFile* currentFile = dynamic_cast(gROOT->GetListOfFiles()->Last()); - if (nullptr == currentFile) { +TFile* BareRootProductGetter::currentFile() const { + TFile* file = dynamic_cast(gROOT->GetListOfFiles()->Last()); + if (nullptr == file) { throw cms::Exception("FileNotFound") << "unable to find the TFile '" << gROOT->GetListOfFiles()->Last() << "'\n" << "retrieved by calling 'gROOT->GetListOfFiles()->Last()'\n" << "Please check the list of files."; } - if (branchMap_.updateFile(currentFile)) { - idToBuffers_.clear(); - } - TTree* eventTree = branchMap_.getEventTree(); - // std::cout << "eventTree " << eventTree << std::endl; - if (nullptr == eventTree) { - throw cms::Exception("NoEventsTree") - << "unable to find the TTree '" << edm::poolNames::eventTreeName() << "' in the last open file, \n" - << "file: '" << branchMap_.getFile()->GetName() - << "'\n Please check that the file is a standard CMS ROOT format.\n" - << "If the above is not the file you expect then please open your data file after all other files."; - } - Long_t eventEntry = eventTree->GetReadEntry(); - // std::cout << "eventEntry " << eventEntry << std::endl; - branchMap_.updateEvent(eventEntry); - if (eventEntry < 0) { - throw cms::Exception("GetEntryNotCalled") - << "please call GetEntry for the 'Events' TTree for each event in order to make edm::Ref's work." - << "\n Also be sure to call 'SetAddress' for all Branches after calling the GetEntry."; - } - - edm::BranchID branchID = branchMap_.productToBranchID(pid); - - return getIt(branchID, eventEntry); -} - -edm::WrapperBase const* BareRootProductGetter::getIt(edm::BranchID const& branchID, Long_t eventEntry) const { - Buffer* buffer = nullptr; - IdToBuffers::iterator itBuffer = idToBuffers_.find(branchID); - - // std::cout << "Buffers" << std::endl; - if (itBuffer == idToBuffers_.end()) { - buffer = createNewBuffer(branchID); - // std::cout << "buffer " << buffer << std::endl; - if (nullptr == buffer) { - return nullptr; - } - } else { - buffer = &(itBuffer->second); - } - if (nullptr == buffer) { - throw cms::Exception("NullBuffer") << "Found a null buffer which is supposed to hold the data item." - << "\n Please contact developers since this message should not happen."; - } - if (nullptr == buffer->branch_) { - throw cms::Exception("NullBranch") << "The TBranch which should hold the data item is null." - << "\n Please contact the developers since this message should not happen."; - } - if (buffer->eventEntry_ != eventEntry) { - //NOTE: Need to reset address because user could have set the address themselves - //std::cout << "new event" << std::endl; - - //ROOT WORKAROUND: Create new objects so any internal data cache will get cleared - void* address = buffer->class_->New(); - - static TClass const* edproductTClass = TClass::GetClass(typeid(edm::WrapperBase)); - edm::WrapperBase const* prod = - static_cast(buffer->class_->DynamicCast(edproductTClass, address, true)); - - if (nullptr == prod) { - cms::Exception("FailedConversion") << "failed to convert a '" << buffer->class_->GetName() - << "' to a edm::WrapperBase." - << "Please contact developers since something is very wrong."; - } - buffer->address_ = address; - buffer->product_ = std::shared_ptr(prod); - //END WORKAROUND - - address = &(buffer->address_); - buffer->branch_->SetAddress(address); - - buffer->branch_->GetEntry(eventEntry); - buffer->eventEntry_ = eventEntry; - } - if (!buffer->product_) { - throw cms::Exception("BranchGetEntryFailed") - << "Calling GetEntry with index " << eventEntry << "for branch " << buffer->branch_->GetName() << " failed."; - } - - return buffer->product_.get(); -} - -std::optional> BareRootProductGetter::getThinnedProduct( - edm::ProductID const& pid, unsigned int key) const { - Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry(); - return edm::detail::getThinnedProduct( - pid, - key, - branchMap_.thinnedAssociationsHelper(), - [this](edm::ProductID const& p) { return branchMap_.productToBranchID(p); }, - [this, eventEntry](edm::BranchID const& b) { return getThinnedAssociation(b, eventEntry); }, - [this](edm::ProductID const& p) { return getIt(p); }); -} - -void BareRootProductGetter::getThinnedProducts(edm::ProductID const& pid, - std::vector& foundContainers, - std::vector& keys) const { - Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry(); - edm::detail::getThinnedProducts( - pid, - branchMap_.thinnedAssociationsHelper(), - [this](edm::ProductID const& p) { return branchMap_.productToBranchID(p); }, - [this, eventEntry](edm::BranchID const& b) { return getThinnedAssociation(b, eventEntry); }, - [this](edm::ProductID const& p) { return getIt(p); }, - foundContainers, - keys); -} - -edm::OptionalThinnedKey BareRootProductGetter::getThinnedKeyFrom(edm::ProductID const& parentID, - unsigned int key, - edm::ProductID const& thinnedID) const { - Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry(); - edm::BranchID parent = branchMap_.productToBranchID(parentID); - if (!parent.isValid()) - return std::monostate{}; - edm::BranchID thinned = branchMap_.productToBranchID(thinnedID); - if (!thinned.isValid()) - return std::monostate{}; - try { - auto ret = edm::detail::getThinnedKeyFrom_implementation( - parentID, - parent, - key, - thinnedID, - thinned, - branchMap_.thinnedAssociationsHelper(), - [this, eventEntry](edm::BranchID const& branchID) { return getThinnedAssociation(branchID, eventEntry); }); - if (auto factory = std::get_if(&ret)) { - return [func = *factory]() { - auto ex = func(); - ex.addContext("Calling BareRootProductGetter::getThinnedKeyFrom()"); - return ex; - }; - } else { - return ret; - } - } catch (edm::Exception& ex) { - ex.addContext("Calling BareRootProductGetter::getThinnedKeyFrom()"); - throw ex; - } -} - -BareRootProductGetter::Buffer* BareRootProductGetter::createNewBuffer(edm::BranchID const& branchID) const { - //find the branch - edm::BranchDescription const& bdesc = branchMap_.branchIDToBranch(branchID); - - TBranch* branch = branchMap_.getEventTree()->GetBranch(bdesc.branchName().c_str()); - if (nullptr == branch) { - //we do not thrown on missing branches since 'getIt' should not throw under that condition - return nullptr; - } - //find the class type - std::string const fullName = edm::wrappedClassName(bdesc.className()); - edm::TypeWithDict classType(edm::TypeWithDict::byName(fullName)); - if (!bool(classType)) { - throw cms::Exception("MissingDictionary") << "could not find dictionary for type '" << fullName << "'" - << "\n Please make sure all the necessary libraries are available."; - return nullptr; - } - - TClass* rootClassType = TClass::GetClass(classType.typeInfo()); - if (nullptr == rootClassType) { - throw cms::Exception("MissingRootDictionary") << "could not find a ROOT dictionary for type '" << fullName << "'" - << "\n Please make sure all the necessary libraries are available."; - return nullptr; - } - void* address = rootClassType->New(); - - static TClass const* edproductTClass = TClass::GetClass(typeid(edm::WrapperBase)); - edm::WrapperBase const* prod = - static_cast(rootClassType->DynamicCast(edproductTClass, address, true)); - if (nullptr == prod) { - throw cms::Exception("FailedConversion") << "failed to convert a '" << fullName << "' to a edm::WrapperBase." - << "Please contact developers since something is very wrong."; - } - - //connect the instance to the branch - //void* address = wrapperObj.Address(); - Buffer b(prod, branch, address, rootClassType); - idToBuffers_[branchID] = std::move(b); - - //As of 5.13 ROOT expects the memory address held by the pointer passed to - // SetAddress to be valid forever - address = &(idToBuffers_[branchID].address_); - branch->SetAddress(address); - - return &(idToBuffers_[branchID]); -} - -edm::ThinnedAssociation const* BareRootProductGetter::getThinnedAssociation(edm::BranchID const& branchID, - Long_t eventEntry) const { - edm::WrapperBase const* wrapperBase = getIt(branchID, eventEntry); - if (wrapperBase == nullptr) { - throw edm::Exception(edm::errors::LogicError) - << "BareRootProductGetter::getThinnedAssociation, product ThinnedAssociation not found.\n"; - } - if (!(typeid(edm::ThinnedAssociation) == wrapperBase->dynamicTypeInfo())) { - throw edm::Exception(edm::errors::LogicError) - << "BareRootProductGetter::getThinnedAssociation, product has wrong type, not a ThinnedAssociation.\n"; - } - edm::Wrapper const* wrapper = - static_cast const*>(wrapperBase); - - edm::ThinnedAssociation const* thinnedAssociation = wrapper->product(); - return thinnedAssociation; + return file; } diff --git a/FWCore/FWLite/src/BareRootProductGetter.h b/FWCore/FWLite/src/BareRootProductGetter.h index b8c9d310a3e55..73c7c1dc03002 100644 --- a/FWCore/FWLite/src/BareRootProductGetter.h +++ b/FWCore/FWLite/src/BareRootProductGetter.h @@ -1,117 +1,14 @@ -#ifndef FWLite_BareRootProductGetter_h -#define FWLite_BareRootProductGetter_h -// -*- C++ -*- -// -// Package: FWLite -// Class : BareRootProductGetter -// -/**\class BareRootProductGetter BareRootProductGetter.h FWCore/FWLite/interface/BareRootProductGetter.h +#ifndef FWCore_FWLite_BareRootProductGetter_h +#define FWCore_FWLite_BareRootProductGetter_h - Description: +#include "FWCore/FWLite/interface/BareRootProductGetterBase.h" - Usage: - - -*/ -// -// Original Author: Chris Jones -// Created: Tue May 23 11:03:27 EDT 2006 -// - -// user include files -#include "DataFormats/Common/interface/WrapperBase.h" -#include "DataFormats/Common/interface/EDProductGetter.h" -#include "FWCore/FWLite/interface/BranchMapReader.h" -#include "FWCore/Utilities/interface/propagate_const.h" - -// system include files -#include "Rtypes.h" -#include -#include -#include - -// forward declarations -class TBranch; -class TClass; - -namespace edm { - class BranchID; - class ProductID; - class ThinnedAssociation; -} // namespace edm - -class BareRootProductGetter : public edm::EDProductGetter { +class BareRootProductGetter : public BareRootProductGetterBase { public: - BareRootProductGetter(); - ~BareRootProductGetter() override; - BareRootProductGetter(BareRootProductGetter const&) = delete; // stop default - BareRootProductGetter const& operator=(BareRootProductGetter const&) = delete; // stop default - - // ---------- const member functions --------------------- - edm::WrapperBase const* getIt(edm::ProductID const&) const override; - - // getThinnedProduct assumes getIt was already called and failed to find - // the product. The input key is the index of the desired element in the - // container identified by ProductID (which cannot be found). - // If the return value is not null, then the desired element was - // found in a thinned container. If the desired element is not - // found, then an optional without a value is returned. - std::optional> getThinnedProduct(edm::ProductID const&, - unsigned int key) const override; - - // getThinnedProducts assumes getIt was already called and failed to find - // the product. The input keys are the indexes into the container identified - // by ProductID (which cannot be found). On input the WrapperBase pointers - // must all be set to nullptr (except when the function calls itself - // recursively where non-null pointers mark already found elements). - // Thinned containers derived from the product are searched to see - // if they contain the desired elements. For each that is - // found, the corresponding WrapperBase pointer is set and the key - // is modified to be the key into the container where the element - // was found. The WrapperBase pointers might or might not all point - // to the same thinned container. - void getThinnedProducts(edm::ProductID const&, - std::vector& foundContainers, - std::vector& keys) const override; - - // This overload is allowed to be called also without getIt() - // being called first, but the thinned ProductID must come from an - // existing RefCore. The input key is the index of the desired - // element in the container identified by the parent ProductID. - // If the return value is not null, then the desired element was found - // in a thinned container. If the desired element is not found, then - // an optional without a value is returned. - edm::OptionalThinnedKey getThinnedKeyFrom(edm::ProductID const& parent, - unsigned int key, - edm::ProductID const& thinned) const override; + BareRootProductGetter() = default; private: - // ---------- static member functions -------------------- - - // ---------- member functions --------------------------- - unsigned int transitionIndex_() const override { return 0u; } - - edm::WrapperBase const* getIt(edm::BranchID const&, Long_t eventEntry) const; - - struct Buffer { - Buffer(edm::WrapperBase const* iProd, TBranch* iBranch, void* iAddress, TClass* iClass) - : product_(iProd), branch_(iBranch), address_(iAddress), eventEntry_(-1), class_(iClass) {} - Buffer() : product_(), branch_(), address_(), eventEntry_(-1), class_(nullptr) {} - - std::shared_ptr product_; - edm::propagate_const branch_; - void* address_; //the address to pass to Root since as of 5.13 they cache that info - Long_t eventEntry_; //the event Entry used with the last GetEntry call - edm::propagate_const class_; - }; - - Buffer* createNewBuffer(edm::BranchID const&) const; - edm::ThinnedAssociation const* getThinnedAssociation(edm::BranchID const& branchID, Long_t eventEntry) const; - - // ---------- member data -------------------------------- - - typedef std::map IdToBuffers; - mutable IdToBuffers idToBuffers_; - mutable fwlite::BranchMapReader branchMap_; + TFile* currentFile() const override; }; + #endif diff --git a/FWCore/FWLite/src/BareRootProductGetterBase.cc b/FWCore/FWLite/src/BareRootProductGetterBase.cc new file mode 100644 index 0000000000000..1a74e56f28c4a --- /dev/null +++ b/FWCore/FWLite/src/BareRootProductGetterBase.cc @@ -0,0 +1,253 @@ +// -*- C++ -*- +// +// Package: FWLite +// Class : BareRootProductGetterBase +// +// Implementation: +// +// +// Description: This file was originally BareRootProductGetter.cc. +// It was copied to BareRootProductGetterBase.cc in order to refactor +// it a little bit to make it usable for FireworksWeb. +// +// Original Author: Chris Jones +// Created: Tue May 23 11:03:31 EDT 2006 +// + +// user include files +#include "FWCore/FWLite/interface/BareRootProductGetterBase.h" +#include "DataFormats/Common/interface/ThinnedAssociation.h" +#include "DataFormats/Common/interface/Wrapper.h" +#include "DataFormats/Common/interface/getThinned_implementation.h" +#include "DataFormats/Provenance/interface/BranchDescription.h" +#include "DataFormats/Provenance/interface/BranchID.h" +#include "DataFormats/Provenance/interface/BranchType.h" +#include "DataFormats/Provenance/interface/ThinnedAssociationsHelper.h" +#include "FWCore/Utilities/interface/Exception.h" +#include "FWCore/Reflection/interface/TypeWithDict.h" +#include "FWCore/Utilities/interface/WrappedClassName.h" + +// system include files + +#include "TBranch.h" +#include "TClass.h" +#include "TFile.h" +#include "TTree.h" + +// +// constructors and destructor +// +BareRootProductGetterBase::BareRootProductGetterBase() = default; +BareRootProductGetterBase::~BareRootProductGetterBase() = default; + +// +// const member functions +// +edm::WrapperBase const* BareRootProductGetterBase::getIt(edm::ProductID const& pid) const { + // std::cout << "getIt called " << pid << std::endl; + if (branchMap_.updateFile(currentFile())) { + idToBuffers_.clear(); + } + TTree* eventTree = branchMap_.getEventTree(); + // std::cout << "eventTree " << eventTree << std::endl; + if (nullptr == eventTree) { + throw cms::Exception("NoEventsTree") + << "unable to find the TTree '" << edm::poolNames::eventTreeName() << "' in the last open file, \n" + << "file: '" << branchMap_.getFile()->GetName() + << "'\n Please check that the file is a standard CMS ROOT format.\n" + << "If the above is not the file you expect then please open your data file after all other files."; + } + Long_t eventEntry = eventTree->GetReadEntry(); + // std::cout << "eventEntry " << eventEntry << std::endl; + branchMap_.updateEvent(eventEntry); + if (eventEntry < 0) { + throw cms::Exception("GetEntryNotCalled") + << "please call GetEntry for the 'Events' TTree for each event in order to make edm::Ref's work." + << "\n Also be sure to call 'SetAddress' for all Branches after calling the GetEntry."; + } + + edm::BranchID branchID = branchMap_.productToBranchID(pid); + + return getIt(branchID, eventEntry); +} + +edm::WrapperBase const* BareRootProductGetterBase::getIt(edm::BranchID const& branchID, Long_t eventEntry) const { + Buffer* buffer = nullptr; + IdToBuffers::iterator itBuffer = idToBuffers_.find(branchID); + + // std::cout << "Buffers" << std::endl; + if (itBuffer == idToBuffers_.end()) { + buffer = createNewBuffer(branchID); + // std::cout << "buffer " << buffer << std::endl; + if (nullptr == buffer) { + return nullptr; + } + } else { + buffer = &(itBuffer->second); + } + if (nullptr == buffer) { + throw cms::Exception("NullBuffer") << "Found a null buffer which is supposed to hold the data item." + << "\n Please contact developers since this message should not happen."; + } + if (nullptr == buffer->branch_) { + throw cms::Exception("NullBranch") << "The TBranch which should hold the data item is null." + << "\n Please contact the developers since this message should not happen."; + } + if (buffer->eventEntry_ != eventEntry) { + //NOTE: Need to reset address because user could have set the address themselves + //std::cout << "new event" << std::endl; + + //ROOT WORKAROUND: Create new objects so any internal data cache will get cleared + void* address = buffer->class_->New(); + + static TClass const* edproductTClass = TClass::GetClass(typeid(edm::WrapperBase)); + edm::WrapperBase const* prod = + static_cast(buffer->class_->DynamicCast(edproductTClass, address, true)); + + if (nullptr == prod) { + cms::Exception("FailedConversion") << "failed to convert a '" << buffer->class_->GetName() + << "' to a edm::WrapperBase." + << "Please contact developers since something is very wrong."; + } + buffer->address_ = address; + buffer->product_ = std::shared_ptr(prod); + //END WORKAROUND + + address = &(buffer->address_); + buffer->branch_->SetAddress(address); + + buffer->branch_->GetEntry(eventEntry); + buffer->eventEntry_ = eventEntry; + } + if (!buffer->product_) { + throw cms::Exception("BranchGetEntryFailed") + << "Calling GetEntry with index " << eventEntry << "for branch " << buffer->branch_->GetName() << " failed."; + } + + return buffer->product_.get(); +} + +std::optional> BareRootProductGetterBase::getThinnedProduct( + edm::ProductID const& pid, unsigned int key) const { + Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry(); + return edm::detail::getThinnedProduct( + pid, + key, + branchMap_.thinnedAssociationsHelper(), + [this](edm::ProductID const& p) { return branchMap_.productToBranchID(p); }, + [this, eventEntry](edm::BranchID const& b) { return getThinnedAssociation(b, eventEntry); }, + [this](edm::ProductID const& p) { return getIt(p); }); +} + +void BareRootProductGetterBase::getThinnedProducts(edm::ProductID const& pid, + std::vector& foundContainers, + std::vector& keys) const { + Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry(); + edm::detail::getThinnedProducts( + pid, + branchMap_.thinnedAssociationsHelper(), + [this](edm::ProductID const& p) { return branchMap_.productToBranchID(p); }, + [this, eventEntry](edm::BranchID const& b) { return getThinnedAssociation(b, eventEntry); }, + [this](edm::ProductID const& p) { return getIt(p); }, + foundContainers, + keys); +} + +edm::OptionalThinnedKey BareRootProductGetterBase::getThinnedKeyFrom(edm::ProductID const& parentID, + unsigned int key, + edm::ProductID const& thinnedID) const { + Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry(); + edm::BranchID parent = branchMap_.productToBranchID(parentID); + if (!parent.isValid()) + return std::monostate{}; + edm::BranchID thinned = branchMap_.productToBranchID(thinnedID); + if (!thinned.isValid()) + return std::monostate{}; + try { + auto ret = edm::detail::getThinnedKeyFrom_implementation( + parentID, + parent, + key, + thinnedID, + thinned, + branchMap_.thinnedAssociationsHelper(), + [this, eventEntry](edm::BranchID const& branchID) { return getThinnedAssociation(branchID, eventEntry); }); + if (auto factory = std::get_if(&ret)) { + return [func = *factory]() { + auto ex = func(); + ex.addContext("Calling BareRootProductGetterBase::getThinnedKeyFrom()"); + return ex; + }; + } else { + return ret; + } + } catch (edm::Exception& ex) { + ex.addContext("Calling BareRootProductGetterBase::getThinnedKeyFrom()"); + throw ex; + } +} + +BareRootProductGetterBase::Buffer* BareRootProductGetterBase::createNewBuffer(edm::BranchID const& branchID) const { + //find the branch + edm::BranchDescription const& bdesc = branchMap_.branchIDToBranch(branchID); + + TBranch* branch = branchMap_.getEventTree()->GetBranch(bdesc.branchName().c_str()); + if (nullptr == branch) { + //we do not thrown on missing branches since 'getIt' should not throw under that condition + return nullptr; + } + //find the class type + std::string const fullName = edm::wrappedClassName(bdesc.className()); + edm::TypeWithDict classType(edm::TypeWithDict::byName(fullName)); + if (!bool(classType)) { + throw cms::Exception("MissingDictionary") << "could not find dictionary for type '" << fullName << "'" + << "\n Please make sure all the necessary libraries are available."; + return nullptr; + } + + TClass* rootClassType = TClass::GetClass(classType.typeInfo()); + if (nullptr == rootClassType) { + throw cms::Exception("MissingRootDictionary") << "could not find a ROOT dictionary for type '" << fullName << "'" + << "\n Please make sure all the necessary libraries are available."; + return nullptr; + } + void* address = rootClassType->New(); + + static TClass const* edproductTClass = TClass::GetClass(typeid(edm::WrapperBase)); + edm::WrapperBase const* prod = + static_cast(rootClassType->DynamicCast(edproductTClass, address, true)); + if (nullptr == prod) { + throw cms::Exception("FailedConversion") << "failed to convert a '" << fullName << "' to a edm::WrapperBase." + << "Please contact developers since something is very wrong."; + } + + //connect the instance to the branch + //void* address = wrapperObj.Address(); + Buffer b(prod, branch, address, rootClassType); + idToBuffers_[branchID] = std::move(b); + + //As of 5.13 ROOT expects the memory address held by the pointer passed to + // SetAddress to be valid forever + address = &(idToBuffers_[branchID].address_); + branch->SetAddress(address); + + return &(idToBuffers_[branchID]); +} + +edm::ThinnedAssociation const* BareRootProductGetterBase::getThinnedAssociation(edm::BranchID const& branchID, + Long_t eventEntry) const { + edm::WrapperBase const* wrapperBase = getIt(branchID, eventEntry); + if (wrapperBase == nullptr) { + throw edm::Exception(edm::errors::LogicError) + << "BareRootProductGetterBase::getThinnedAssociation, product ThinnedAssociation not found.\n"; + } + if (!(typeid(edm::ThinnedAssociation) == wrapperBase->dynamicTypeInfo())) { + throw edm::Exception(edm::errors::LogicError) + << "BareRootProductGetterBase::getThinnedAssociation, product has wrong type, not a ThinnedAssociation.\n"; + } + edm::Wrapper const* wrapper = + static_cast const*>(wrapperBase); + + edm::ThinnedAssociation const* thinnedAssociation = wrapper->product(); + return thinnedAssociation; +} diff --git a/FWCore/Framework/interface/EDConsumerBase.h b/FWCore/Framework/interface/EDConsumerBase.h index 315b570f1a9f8..cb36a70bc0de1 100644 --- a/FWCore/Framework/interface/EDConsumerBase.h +++ b/FWCore/Framework/interface/EDConsumerBase.h @@ -25,6 +25,7 @@ #include #include #include +#include // user include files #include "DataFormats/Provenance/interface/BranchType.h" @@ -196,14 +197,15 @@ namespace edm { template auto esConsumes(ESInputTag const& tag) { - auto index = recordESConsumes(Tr, - eventsetup::EventSetupRecordKey::makeKey< - std::conditional_t, - eventsetup::default_record_t>, - ESRecord>>(), - eventsetup::heterocontainer::HCTypeTag::make(), - tag); - return ESGetToken{static_cast(Tr), index, labelFor(index)}; + auto [index, productLabel] = + recordESConsumes(Tr, + eventsetup::EventSetupRecordKey::makeKey< + std::conditional_t, + eventsetup::default_record_t>, + ESRecord>>(), + eventsetup::heterocontainer::HCTypeTag::make(), + tag); + return ESGetToken{static_cast(Tr), index, productLabel}; } template @@ -219,9 +221,8 @@ namespace edm { ///Used with EventSetupRecord::doGet template ESGetTokenGeneric esConsumes(eventsetup::EventSetupRecordKey const& iRecord, eventsetup::DataKey const& iKey) { - return ESGetTokenGeneric(static_cast(Tr), - recordESConsumes(Tr, iRecord, iKey.type(), ESInputTag("", iKey.name().value())), - iRecord.type()); + auto [index, productLabel] = recordESConsumes(Tr, iRecord, iKey.type(), ESInputTag("", iKey.name().value())); + return ESGetTokenGeneric(static_cast(Tr), index, iRecord.type()); } //used for FinalPath @@ -231,12 +232,10 @@ namespace edm { virtual void extendUpdateLookup(BranchType iBranchType, ProductResolverIndexHelper const&); virtual void registerLateConsumes(eventsetup::ESRecordsToProductResolverIndices const&) {} unsigned int recordConsumes(BranchType iBranch, TypeToGet const& iType, edm::InputTag const& iTag, bool iAlwaysGets); - ESTokenIndex recordESConsumes(Transition, - eventsetup::EventSetupRecordKey const&, - eventsetup::heterocontainer::HCTypeTag const&, - edm::ESInputTag const& iTag); - - const char* labelFor(ESTokenIndex) const; + std::tuple recordESConsumes(Transition, + eventsetup::EventSetupRecordKey const&, + eventsetup::heterocontainer::HCTypeTag const&, + edm::ESInputTag const& iTag); void throwTypeMismatch(edm::TypeID const&, EDGetToken) const; void throwBranchMismatch(BranchType, EDGetToken) const; diff --git a/FWCore/Framework/interface/ESProducts.h b/FWCore/Framework/interface/ESProducts.h index 961bd23163059..3ec8975ddf594 100644 --- a/FWCore/Framework/interface/ESProducts.h +++ b/FWCore/Framework/interface/ESProducts.h @@ -98,7 +98,7 @@ namespace edm { }; } // namespace produce - } // namespace eventsetup + } // namespace eventsetup struct ESFillDirectly {}; template diff --git a/FWCore/Framework/interface/ESRecordsToProductResolverIndices.h b/FWCore/Framework/interface/ESRecordsToProductResolverIndices.h index 45f6c2e1209f0..206406f498340 100644 --- a/FWCore/Framework/interface/ESRecordsToProductResolverIndices.h +++ b/FWCore/Framework/interface/ESRecordsToProductResolverIndices.h @@ -1,11 +1,11 @@ +// -*- C++ -*- #ifndef FWCore_Framework_ESRecordsToProductResolverIndices_h #define FWCore_Framework_ESRecordsToProductResolverIndices_h -// -*- C++ -*- // // Package: Framework // Class : ESRecordsToProductResolverIndices // -/**\class ESRecordsToProductResolverIndices ESRecordsToProductResolverIndices.h FWCore/Framework/interface/ESRecordsToProductResolverIndices.h +/**\class edm::eventsetup::ESRecordsToProductResolverIndices Description: Key used to identify data within a EventSetupRecord @@ -19,7 +19,6 @@ // // system include files -#include #include // user include files @@ -37,7 +36,7 @@ namespace edm::eventsetup { ESRecordsToProductResolverIndices(std::vector iRecords); // ---------- const member functions --------------------- - ///If the index is not found, returns missingResolverIndex() + ///If the index is not found, returns ESResolverIndex::noResolverConfigured() ESResolverIndex indexInRecord(EventSetupRecordKey const& iRK, DataKey const& iDK) const noexcept; ComponentDescription const* component(EventSetupRecordKey const& iRK, DataKey const& iDK) const noexcept; @@ -45,9 +44,6 @@ namespace edm::eventsetup { ///Returns ESTagGetter for all products matching the type iTT for record iRK ESTagGetter makeTagGetter(EventSetupRecordKey const& iRK, TypeTag const& iTT) const; - static constexpr ESResolverIndex missingResolverIndex() noexcept { - return ESResolverIndex{std::numeric_limits::max()}; - } static constexpr ESRecordIndex missingRecordIndex() noexcept { return ESRecordIndex{ESRecordIndex::invalidValue()}; } diff --git a/FWCore/Framework/interface/Event.h b/FWCore/Framework/interface/Event.h index 998240247f602..eec9bedd4fb18 100644 --- a/FWCore/Framework/interface/Event.h +++ b/FWCore/Framework/interface/Event.h @@ -374,8 +374,7 @@ namespace edm { OrphanHandle Event::putImpl(EDPutToken::value_type index, std::unique_ptr product) { // The following will call post_insert if T has such a function, // and do nothing if T has no such function. - std::conditional_t::value, DoPostInsert, DoNotPostInsert> maybe_inserter; - maybe_inserter(product.get()); + detail::do_post_insert_if_available(*product.get()); assert(index < putProducts().size()); @@ -456,8 +455,7 @@ namespace edm { // The following will call post_insert if T has such a function, // and do nothing if T has no such function. - std::conditional_t::value, DoPostInsert, DoNotPostInsert> maybe_inserter; - maybe_inserter(&(wp->bareProduct())); + detail::do_post_insert_if_available(wp->bareProduct()); PROD const* prod = wp->product(); diff --git a/FWCore/Framework/interface/EventSetupRecord.h b/FWCore/Framework/interface/EventSetupRecord.h index c823365cabd15..4d65b917f0fb7 100644 --- a/FWCore/Framework/interface/EventSetupRecord.h +++ b/FWCore/Framework/interface/EventSetupRecord.h @@ -1,6 +1,6 @@ +// -*- C++ -*- #ifndef FWCore_Framework_EventSetupRecord_h #define FWCore_Framework_EventSetupRecord_h -// -*- C++ -*- // // Package: Framework // Class : EventSetupRecord @@ -41,6 +41,7 @@ // user include files #include "FWCore/Framework/interface/FunctorESHandleExceptionFactory.h" #include "FWCore/Framework/interface/DataKey.h" +#include "FWCore/Framework/interface/HCTypeTag.h" #include "FWCore/Framework/interface/NoProductResolverException.h" #include "FWCore/Framework/interface/ValidityInterval.h" #include "FWCore/Framework/interface/EventSetupRecordImpl.h" @@ -163,8 +164,13 @@ namespace edm { } auto resolverIndex = getTokenIndices_[iToken.index().value()]; - if UNLIKELY (resolverIndex.value() == std::numeric_limits::max()) { - return noResolverHandle(iToken); + + if UNLIKELY (resolverIndex == ESResolverIndex::moduleLabelDoesNotMatch()) { + return noResolverHandle(iToken, true); + } + + if UNLIKELY (resolverIndex == ESResolverIndex::noResolverConfigured()) { + return noResolverHandle(iToken, false); } T const* value = nullptr; @@ -204,11 +210,11 @@ namespace edm { } template