Skip to content

Commit

Permalink
Clang-Format
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmsbuild
cmsbuild committed May 9, 2019
1 parent 6d472b8 commit 7f0c057
Show file tree
Hide file tree
Showing 198 changed files with 13,977 additions and 14,441 deletions.
27 changes: 11 additions & 16 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignableData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,46 +10,41 @@
/// also surface deformation parameters are foreseen;
/// can be used for both absolute and relative positions/rotations

template<class T> class AlignableData
{

template <class T>
class AlignableData {
public:

/// constructor
/// deformationParameters can be given if detUnit
AlignableData(const T& pos,
const align::RotationType& rot,
align::ID id, align::StructureType objid,
const std::vector<double> &deformationParameters = std::vector<double>()) :
thePos(pos), theRot(rot), theObjId(objid), theId(id),
theDeformationParameters(deformationParameters) {}
const align::RotationType& rot,
align::ID id,
align::StructureType objid,
const std::vector<double>& deformationParameters = std::vector<double>())
: thePos(pos), theRot(rot), theObjId(objid), theId(id), theDeformationParameters(deformationParameters) {}

/// accessors
const T& pos() const { return thePos; }
const align::RotationType& rot() const { return theRot; }
align::StructureType objId() const { return theObjId; }
align::ID id() const { return theId; }
const std::vector<double> deformationParameters() const { return theDeformationParameters;}
const std::vector<double> deformationParameters() const { return theDeformationParameters; }

private:

// data members

T thePos;
align::RotationType theRot;
align::StructureType theObjId;
align::ID theId;
std::vector<double> theDeformationParameters;

};

/// Absolute position/rotation
typedef AlignableData<align::GlobalPoint> AlignableAbsData;
/// relative position/rotation
/// Absolute position/rotation
typedef AlignableData<align::GlobalPoint> AlignableAbsData;
/// relative position/rotation
typedef AlignableData<align::GlobalVector> AlignableRelData;

typedef std::vector<AlignableAbsData> AlignablePositions;
typedef std::vector<AlignableRelData> AlignableShifts;

#endif

62 changes: 28 additions & 34 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,80 +7,74 @@
class Alignable;

/// Abstract base class for IO of alignable positions/shifts.
/// Derived concrete class must implement raw read/write methods

class AlignableDataIO
{

protected:
/// Derived concrete class must implement raw read/write methods

class AlignableDataIO {
protected:
enum PosType { Abs, Org, Rel };

/// Constructor
AlignableDataIO(PosType p) : thePosType(p) {};
/// Constructor
AlignableDataIO(PosType p) : thePosType(p){};

/// Destructor
/// Destructor
virtual ~AlignableDataIO(){};

/// Open IO handle
virtual int open( const char* filename, int iteration, bool writemode ) = 0;
virtual int open(const char* filename, int iteration, bool writemode) = 0;

/// Close IO handle
virtual int close(void) = 0;

/// Write absolute positions of one Alignable
/// Write absolute positions of one Alignable
int writeAbsPos(Alignable* ali, bool validCheck);

/// Write absolute positions of many Alignables
/// Write absolute positions of many Alignables
int writeAbsPos(const align::Alignables& alivec, bool validCheck);

/// Read absolute positions of one Alignable
/// Read absolute positions of one Alignable
AlignableAbsData readAbsPos(Alignable* ali, int& ierr);

/// Read absolute positions of many Alignables
/// Read absolute positions of many Alignables
AlignablePositions readAbsPos(const align::Alignables& alivec, int& ierr);


/// Write original positions of one Alignable
/// Write original positions of one Alignable
int writeOrgPos(Alignable* ali, bool validCheck);

/// Write original positions of many Alignables
/// Write original positions of many Alignables
int writeOrgPos(const align::Alignables& alivec, bool validCheck);

/// Read original positions of one Alignable
/// Read original positions of one Alignable
AlignableAbsData readOrgPos(Alignable* ali, int& ierr);

/// Read original positions of many Alignables
/// Read original positions of many Alignables
AlignablePositions readOrgPos(const align::Alignables& alivec, int& ierr);


/// Write relative positions of one Alignable
/// Write relative positions of one Alignable
int writeRelPos(Alignable* ali, bool validCheck);

/// Write relative positions of many Alignables
/// Write relative positions of many Alignables
int writeRelPos(const align::Alignables& alivec, bool validCheck);

/// Read relative positions of one Alignable
/// Read relative positions of one Alignable
AlignableRelData readRelPos(Alignable* ali, int& ierr);

/// Read relative positions of many Alignables
/// Read relative positions of many Alignables
AlignableShifts readRelPos(const align::Alignables& alivec, int& ierr);

// 'raw' read/write methods
// must be provided by concrete derived class

/// Write absolute positions
virtual int writeAbsRaw(const AlignableAbsData &ad) =0;
/// Read absolute positions
virtual AlignableAbsData readAbsRaw(Alignable* ali,int& ierr) =0;
/// Write relative positions
virtual int writeRelRaw(const AlignableRelData &ad) =0;
/// Read relative positions
virtual AlignableRelData readRelRaw(Alignable* ali,int& ierr) =0;
/// Write absolute positions
virtual int writeAbsRaw(const AlignableAbsData& ad) = 0;
/// Read absolute positions
virtual AlignableAbsData readAbsRaw(Alignable* ali, int& ierr) = 0;
/// Write relative positions
virtual int writeRelRaw(const AlignableRelData& ad) = 0;
/// Read relative positions
virtual AlignableRelData readRelRaw(Alignable* ali, int& ierr) = 0;

// Data members
PosType thePosType; // Defines whether absolute/orig/relative pos. are used

PosType thePosType; // Defines whether absolute/orig/relative pos. are used
};

#endif
49 changes: 23 additions & 26 deletions Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIORoot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,52 @@

class Alignable;

/// concrete class for ROOT based IO of Alignable positions

class AlignableDataIORoot : public AlignmentIORootBase, public AlignableDataIO
{
/// concrete class for ROOT based IO of Alignable positions

class AlignableDataIORoot : public AlignmentIORootBase, public AlignableDataIO {
friend class AlignmentIORoot;

private:
/// constructor
AlignableDataIORoot(PosType p);
private:
/// constructor
AlignableDataIORoot(PosType p);

/// open IO
int open(const char* filename, int iteration, bool writemode) override
{ newopen=true; return openRoot(filename,iteration,writemode); }
/// open IO
int open(const char* filename, int iteration, bool writemode) override {
newopen = true;
return openRoot(filename, iteration, writemode);
}

/// close IO
int close(void) override{ return closeRoot(); }
/// close IO
int close(void) override { return closeRoot(); }

/// write absolute positions
int writeAbsRaw(const AlignableAbsData &ad) override;
/// read absolute positions
AlignableAbsData readAbsRaw(Alignable* ali,int& ierr) override;
/// write relative positions
int writeRelRaw(const AlignableRelData &ad) override;
/// read relative positions
AlignableRelData readRelRaw(Alignable* ali,int& ierr) override;
/// write absolute positions
int writeAbsRaw(const AlignableAbsData& ad) override;
/// read absolute positions
AlignableAbsData readAbsRaw(Alignable* ali, int& ierr) override;
/// write relative positions
int writeRelRaw(const AlignableRelData& ad) override;
/// read relative positions
AlignableRelData readRelRaw(Alignable* ali, int& ierr) override;

int findEntry(align::ID, align::StructureType);
void createBranches(void) override;
void setBranchAddresses(void) override;

// data members

/// root tree contents
/// root tree contents
align::StructureType ObjId;
//unsigned int Id;
align::ID Id;
Double_t Pos[3];
Double_t Rot[9];
UInt_t numDeformationValues_;
enum {kMaxNumPar = 20}; // slighly above 'two bowed surfaces' limit
enum { kMaxNumPar = 20 }; // slighly above 'two bowed surfaces' limit
Float_t deformationValues_[kMaxNumPar];

bool newopen;
typedef std::map< std::pair<align::ID, align::StructureType>, int > treemaptype;
typedef std::map<std::pair<align::ID, align::StructureType>, int> treemaptype;
treemaptype treemap;

};



#endif
Loading

0 comments on commit 7f0c057

Please sign in to comment.