Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14876 from ghellwig/fix-clang-warnings-Alignment_80X
Fix clang warnings alignment 80X (Backport of #14875)
- Loading branch information
Showing
42 changed files
with
5,489 additions
and
5,493 deletions.
There are no files selected for viewing
96 changes: 48 additions & 48 deletions
96
Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,48 @@ | ||
| // COCOA class header file | ||
| //Id: CocoaMaterialElementary.h | ||
| //CAT: Model | ||
| // | ||
| // Class to manage the sets of fitted entries (one set per each measurement data set) | ||
| // | ||
| // History: v1.0 | ||
| // Pedro Arce | ||
|
|
||
| #ifndef _CocoaMaterialElementary_HH | ||
| #define _CocoaMaterialElementary_HH | ||
|
|
||
| #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h" | ||
|
|
||
|
|
||
| class CocoaMaterialElementary | ||
| { | ||
|
|
||
| public: | ||
| //---------- Constructors / Destructor | ||
| CocoaMaterialElementary( ALIstring name, float density, ALIstring symbol, ALIint A, ALIint Z ); | ||
| ~CocoaMaterialElementary(){ }; | ||
|
|
||
| ALIstring getName() const { | ||
| return theName; } | ||
| float getDensity() const { | ||
| return theDensity; } | ||
| ALIstring getSymbol() const { | ||
| return theSymbol; } | ||
| ALIint getA() const { | ||
| return theA; } | ||
| ALIint getZ() const { | ||
| return theZ; } | ||
|
|
||
| ALIbool operator==(const CocoaMaterialElementary& mate ) const; | ||
|
|
||
| private: | ||
|
|
||
| ALIstring theName; | ||
| float theDensity; | ||
| ALIstring theSymbol; | ||
| ALIint theA; | ||
| ALIint theZ; | ||
|
|
||
| }; | ||
|
|
||
| #endif | ||
|
|
||
| // COCOA class header file | ||
| //Id: CocoaMaterialElementary.h | ||
| //CAT: Model | ||
| // | ||
| // Class to manage the sets of fitted entries (one set per each measurement data set) | ||
| // | ||
| // History: v1.0 | ||
| // Pedro Arce | ||
|
|
||
| #ifndef _CocoaMaterialElementary_HH | ||
| #define _CocoaMaterialElementary_HH | ||
|
|
||
| #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h" | ||
|
|
||
|
|
||
| class CocoaMaterialElementary | ||
| { | ||
|
|
||
| public: | ||
| //---------- Constructors / Destructor | ||
| CocoaMaterialElementary( ALIstring name, float density, ALIstring symbol, float A, ALIint Z ); | ||
| ~CocoaMaterialElementary(){ }; | ||
|
|
||
| ALIstring getName() const { | ||
| return theName; } | ||
| float getDensity() const { | ||
| return theDensity; } | ||
| ALIstring getSymbol() const { | ||
| return theSymbol; } | ||
| float getA() const { | ||
| return theA; } | ||
| ALIint getZ() const { | ||
| return theZ; } | ||
|
|
||
| ALIbool operator==(const CocoaMaterialElementary& mate ) const; | ||
|
|
||
| private: | ||
|
|
||
| ALIstring theName; | ||
| float theDensity; | ||
| ALIstring theSymbol; | ||
| float theA; | ||
| ALIint theZ; | ||
|
|
||
| }; | ||
|
|
||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,34 @@ | ||
| // COCOA class implementation file | ||
| //Id: CocoaMaterialElementary.cc | ||
| //CAT: Model | ||
| // | ||
| // History: v1.0 | ||
| // Pedro Arce | ||
| #include <map> | ||
| #include <fstream> | ||
|
|
||
| #include "Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h" | ||
|
|
||
|
|
||
| CocoaMaterialElementary::CocoaMaterialElementary( ALIstring name, float density, ALIstring symbol, ALIint A, ALIint Z ) | ||
| { | ||
|
|
||
| theName = name; | ||
| theDensity = density; | ||
| theSymbol = symbol; | ||
| theA = A; | ||
| theZ = Z; | ||
| } | ||
|
|
||
|
|
||
| ALIbool CocoaMaterialElementary::operator==(const CocoaMaterialElementary& mate ) const | ||
| { | ||
| float kTolerance = 1.E-9; | ||
| if( mate.getDensity() - theDensity < kTolerance | ||
| && mate.getSymbol() == theSymbol | ||
| && mate.getA() == theA | ||
| && mate.getZ() == theZ ) { | ||
| return 1; | ||
| } else { | ||
| return 0; | ||
| } | ||
|
|
||
| } | ||
| // COCOA class implementation file | ||
| //Id: CocoaMaterialElementary.cc | ||
| //CAT: Model | ||
| // | ||
| // History: v1.0 | ||
| // Pedro Arce | ||
| #include <map> | ||
| #include <fstream> | ||
| #include <cmath> // include floating-point std::abs functions | ||
|
|
||
| #include "Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h" | ||
|
|
||
|
|
||
| CocoaMaterialElementary::CocoaMaterialElementary( ALIstring name, float density, ALIstring symbol, float A, ALIint Z ) : | ||
| theName(name), | ||
| theDensity(density), | ||
| theSymbol(symbol), | ||
| theA(A), | ||
| theZ(Z) | ||
| { | ||
| } | ||
|
|
||
|
|
||
| ALIbool CocoaMaterialElementary::operator==(const CocoaMaterialElementary& mate ) const | ||
| { | ||
| // GM: Using numeric_limits<float>::epsilon() might be better instead of a | ||
| // magic number 'kTolerance'. Not changing this to not break code | ||
| // potentially relying on this number. | ||
| const float kTolerance = 1.E-9; | ||
| return ( std::abs(mate.getDensity() - theDensity) < kTolerance | ||
| && mate.getSymbol() == theSymbol | ||
| && std::abs(mate.getA() - theA) < kTolerance | ||
| && mate.getZ() == theZ ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| // COCOA class header file | ||
| //Id: OptOCameraDetector.h | ||
| //CAT: Model | ||
| // | ||
| // Base class to describe Optical Objects of type sensor 2D | ||
| // | ||
| // History: v1.0 | ||
| // Pedro Arce | ||
|
|
||
| #ifndef _OPTOCAMERADETECTOR_HH | ||
| #define _OPTOCAMERADETECTOR_HH | ||
|
|
||
| #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h" | ||
| #include "Alignment/CocoaModel/interface/OpticalObject.h" | ||
| class Measurement; | ||
| class LightRay; | ||
|
|
||
| class OptOCameraDetector: public OpticalObject | ||
| { | ||
|
|
||
| public: | ||
| //---------- Constructors / Destructor | ||
| OptOCameraDetector(){ }; | ||
| OptOCameraDetector(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) : | ||
| OpticalObject( parent, type, name, copy_data){ }; | ||
| ~OptOCameraDetector(){ }; | ||
|
|
||
| //---------- Propagate light for measurement meas | ||
| virtual void participateInMeasurement( LightRay& lightray, Measurement* meas, const ALIstring& behav ); | ||
| void constructSolidShape(); | ||
|
|
||
|
|
||
| }; | ||
|
|
||
| #endif | ||
|
|
||
| // COCOA class header file | ||
| //Id: OptOCameraDetector.h | ||
| //CAT: Model | ||
| // | ||
| // Base class to describe Optical Objects of type sensor 2D | ||
| // | ||
| // History: v1.0 | ||
| // Pedro Arce | ||
|
|
||
| #ifndef _OPTOCAMERADETECTOR_HH | ||
| #define _OPTOCAMERADETECTOR_HH | ||
|
|
||
| #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h" | ||
| #include "Alignment/CocoaModel/interface/OpticalObject.h" | ||
| class Measurement; | ||
| class LightRay; | ||
|
|
||
| class OptOCameraDetector: public OpticalObject | ||
| { | ||
|
|
||
| public: | ||
| //---------- Constructors / Destructor | ||
| OptOCameraDetector(){ }; | ||
| OptOCameraDetector(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) : | ||
| OpticalObject( parent, type, name, copy_data){ }; | ||
| ~OptOCameraDetector(){ }; | ||
|
|
||
| //---------- Propagate light for measurement meas | ||
| virtual void participateInMeasurement( LightRay& lightray, Measurement& meas, const ALIstring& behav ) override; | ||
| virtual void constructSolidShape() override; | ||
|
|
||
|
|
||
| }; | ||
|
|
||
| #endif | ||
|
|
Oops, something went wrong.