Skip to content

Commit

Permalink
Clang-Format
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsbuild committed May 15, 2019
1 parent 7e79971 commit 92500ad
Show file tree
Hide file tree
Showing 242 changed files with 70,408 additions and 59,380 deletions.
13 changes: 6 additions & 7 deletions Alignment/MuonAlignment/interface/AlignableCSCChamber.h
Expand Up @@ -8,9 +8,8 @@
* $Revision: 1.12 $
* \author Andre Sznajder - UERJ(Brazil)
*/


#include <iosfwd>

#include <iosfwd>
#include <iostream>
#include <vector>

Expand All @@ -22,12 +21,12 @@

/// A muon CSC Chamber( an AlignableDet )

class AlignableCSCChamber: public AlignableDet {
public:
friend std::ostream& operator<< (std::ostream&, const AlignableCSCChamber &);
class AlignableCSCChamber : public AlignableDet {
public:
friend std::ostream& operator<<(std::ostream&, const AlignableCSCChamber&);

/// Constructor
AlignableCSCChamber(const GeomDet *geomDet);
AlignableCSCChamber(const GeomDet* geomDet);

/// Updater
void update(const GeomDet* geomDet);
Expand Down
35 changes: 10 additions & 25 deletions Alignment/MuonAlignment/interface/AlignableCSCEndcap.h
Expand Up @@ -9,15 +9,12 @@
* \author Andre Sznajder - UERJ(Brazil)
*/


#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignment/interface/AlignableComposite.h"
#include "Alignment/CommonAlignment/interface/AlignableSurface.h"

#include "Alignment/MuonAlignment/interface/AlignableCSCStation.h"



#include <vector>

class GeomDet;
Expand All @@ -27,45 +24,33 @@ class GeomDet;
/// Misalignment can be de-/reactivated (forwarded to components).
///

class AlignableCSCEndcap : public AlignableComposite
{

public:
class AlignableCSCEndcap : public AlignableComposite {
public:
AlignableCSCEndcap(const std::vector<AlignableCSCStation*>& cscStations);

AlignableCSCEndcap( const std::vector<AlignableCSCStation*>& cscStations );

// gets the global position as the average over all positions of the layers
PositionType computePosition() ;
PositionType computePosition();
// get the global orientation
RotationType computeOrientation() ; //see explanation for "theOrientation"
RotationType computeOrientation(); //see explanation for "theOrientation"
// get the Surface
AlignableSurface computeSurface() ;
AlignableSurface computeSurface();

AlignableCSCStation& station(int i);

AlignableCSCStation &station(int i);

/// Printout muon End Cap information (not recursive)
friend std::ostream& operator << ( std::ostream&, const AlignableCSCEndcap& );
friend std::ostream& operator<<(std::ostream&, const AlignableCSCEndcap&);

/// Recursive printout of the muon End Cap structure
void dump( void ) const override;
void dump(void) const override;

// Get alignments sorted by DetId
Alignments* alignments() const override;

// Get alignment errors sorted by DetId
AlignmentErrorsExtended* alignmentErrors() const override;



private:

std::vector<AlignableCSCStation*> theCSCStations;


};

#endif




34 changes: 10 additions & 24 deletions Alignment/MuonAlignment/interface/AlignableCSCRing.h
Expand Up @@ -9,14 +9,12 @@
* \author Jim Pivarski - Texas A&M University
*/


#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignment/interface/AlignableComposite.h"
#include "Alignment/CommonAlignment/interface/AlignableSurface.h"

#include "Alignment/MuonAlignment/interface/AlignableCSCChamber.h"


#include <vector>

class GeomDet;
Expand All @@ -27,41 +25,29 @@ class AlignableCSCChamber;
/// Misalignment can be de-/reactivated (forwarded to components).
///

class AlignableCSCRing : public AlignableComposite
{
class AlignableCSCRing : public AlignableComposite {
public:
AlignableCSCRing(const std::vector<AlignableCSCChamber*>& cscChambers);

public:

AlignableCSCRing( const std::vector<AlignableCSCChamber*>& cscChambers );

// gets the global position as the average over all positions of the layers
PositionType computePosition() ;
PositionType computePosition();
// get the global orientation
RotationType computeOrientation() ; //see explanation for "theOrientation"
RotationType computeOrientation(); //see explanation for "theOrientation"
// get the Surface
AlignableSurface computeSurface() ;
AlignableSurface computeSurface();

AlignableCSCChamber& chamber(int i);

AlignableCSCChamber &chamber(int i);

//virtual void twist(float);

/// Printout muon CSC Ring information (not recursive)
friend std::ostream& operator << ( std::ostream&, const AlignableCSCRing& );
friend std::ostream& operator<<(std::ostream&, const AlignableCSCRing&);

/// Recursive printout of the muon CSC Ring structure
void dump( void ) const override;


void dump(void) const override;

private:

std::vector<AlignableCSCChamber*> theCSCChambers;


};

#endif




34 changes: 10 additions & 24 deletions Alignment/MuonAlignment/interface/AlignableCSCStation.h
Expand Up @@ -9,14 +9,12 @@
* \author Andre Sznajder - UERJ(Brazil)
*/


#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignment/interface/AlignableComposite.h"
#include "Alignment/CommonAlignment/interface/AlignableSurface.h"

#include "Alignment/MuonAlignment/interface/AlignableCSCRing.h"


#include <vector>

class GeomDet;
Expand All @@ -27,41 +25,29 @@ class AlignableCSCRing;
/// Misalignment can be de-/reactivated (forwarded to components).
///

class AlignableCSCStation : public AlignableComposite
{
class AlignableCSCStation : public AlignableComposite {
public:
AlignableCSCStation(const std::vector<AlignableCSCRing*>& cscRings);

public:

AlignableCSCStation( const std::vector<AlignableCSCRing*>& cscRings );

// gets the global position as the average over all positions of the layers
PositionType computePosition() ;
PositionType computePosition();
// get the global orientation
RotationType computeOrientation() ; //see explanation for "theOrientation"
RotationType computeOrientation(); //see explanation for "theOrientation"
// get the Surface
AlignableSurface computeSurface() ;
AlignableSurface computeSurface();

AlignableCSCRing& ring(int i);

AlignableCSCRing &ring(int i);

//virtual void twist(float);

/// Printout muon CSC Station information (not recursive)
friend std::ostream& operator << ( std::ostream&, const AlignableCSCStation& );
friend std::ostream& operator<<(std::ostream&, const AlignableCSCStation&);

/// Recursive printout of the muon CSC Station structure
void dump( void ) const override;


void dump(void) const override;

private:

std::vector<AlignableCSCRing*> theCSCRings;


};

#endif




36 changes: 10 additions & 26 deletions Alignment/MuonAlignment/interface/AlignableDTBarrel.h
Expand Up @@ -9,15 +9,12 @@
* \author Andre Sznajder - UERJ(Brazil)
*/


#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignment/interface/AlignableComposite.h"
#include "Alignment/CommonAlignment/interface/AlignableSurface.h"

#include "Alignment/MuonAlignment/interface/AlignableDTWheel.h"



#include <vector>

class GeomDet;
Expand All @@ -27,46 +24,33 @@ class GeomDet;
/// Misalignment can be de-/reactivated (forwarded to components).
///

class AlignableDTBarrel : public AlignableComposite
{

public:
class AlignableDTBarrel : public AlignableComposite {
public:
AlignableDTBarrel(const std::vector<AlignableDTWheel*>& dtWheels);

AlignableDTBarrel( const std::vector<AlignableDTWheel*>& dtWheels );

// gets the global position as the average over all positions of the layers
PositionType computePosition() ;
PositionType computePosition();
// get the global orientation
RotationType computeOrientation() ; //see explanation for "theOrientation"
RotationType computeOrientation(); //see explanation for "theOrientation"
// get the Surface
AlignableSurface computeSurface() ;
AlignableSurface computeSurface();

AlignableDTWheel& wheel(int i);

AlignableDTWheel &wheel(int i);

/// Printout muon Barrel information (not recursive)
friend std::ostream& operator << ( std::ostream&, const AlignableDTBarrel& );
friend std::ostream& operator<<(std::ostream&, const AlignableDTBarrel&);

/// Recursive printout of the muon Barrel structure
void dump( void ) const override;

void dump(void) const override;

// Get alignments sorted by DetId
Alignments* alignments() const override;

// Get alignment errors sorted by DetId
AlignmentErrorsExtended* alignmentErrors() const override;



private:

std::vector<AlignableDTWheel*> theDTWheels;


};

#endif




9 changes: 4 additions & 5 deletions Alignment/MuonAlignment/interface/AlignableDTChamber.h
Expand Up @@ -9,8 +9,7 @@
* \author Andre Sznajder - UERJ(Brazil)
*/


#include <iosfwd>
#include <iosfwd>
#include <iostream>
#include <vector>

Expand All @@ -22,9 +21,9 @@

/// A muon DT Chamber( an AlignableDet )

class AlignableDTChamber: public AlignableDet {
public:
friend std::ostream& operator<< (std::ostream&, const AlignableDTChamber &);
class AlignableDTChamber : public AlignableDet {
public:
friend std::ostream &operator<<(std::ostream &, const AlignableDTChamber &);

/// Constructor
AlignableDTChamber(const GeomDet *geomDet);
Expand Down
33 changes: 10 additions & 23 deletions Alignment/MuonAlignment/interface/AlignableDTStation.h
Expand Up @@ -9,14 +9,12 @@
* \author Andre Sznajder - UERJ(Brazil)
*/


#include "Alignment/CommonAlignment/interface/Utilities.h"
#include "Alignment/CommonAlignment/interface/AlignableComposite.h"
#include "Alignment/CommonAlignment/interface/AlignableSurface.h"

#include "Alignment/MuonAlignment/interface/AlignableDTChamber.h"


#include <vector>

class GeomDet;
Expand All @@ -26,38 +24,27 @@ class GeomDet;
/// Misalignment can be de-/reactivated (forwarded to components).
///

class AlignableDTStation : public AlignableComposite
{

public:
class AlignableDTStation : public AlignableComposite {
public:
AlignableDTStation(const std::vector<AlignableDTChamber*>& dtChambers);

AlignableDTStation( const std::vector<AlignableDTChamber*>& dtChambers );

// gets the global position as the average over all positions of the layers
PositionType computePosition() ;
PositionType computePosition();
// get the global orientation
RotationType computeOrientation() ; //see explanation for "theOrientation"
RotationType computeOrientation(); //see explanation for "theOrientation"
// get the Surface
AlignableSurface computeSurface() ;
AlignableSurface computeSurface();

AlignableDTChamber& chamber(int i);

AlignableDTChamber &chamber(int i);

/// Printout muon DT Station information (not recursive)
friend std::ostream& operator << ( std::ostream&, const AlignableDTStation& );
friend std::ostream& operator<<(std::ostream&, const AlignableDTStation&);

/// Recursive printout of the muon DT Station structure
void dump( void ) const override;

void dump(void) const override;

private:

std::vector<AlignableDTChamber*> theDTChambers;


};

#endif




0 comments on commit 92500ad

Please sign in to comment.