Skip to content

Commit

Permalink
Clang-Format
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsbuild committed May 8, 2019
1 parent c458253 commit 7614b05
Show file tree
Hide file tree
Showing 168 changed files with 10,497 additions and 12,678 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@
#include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"

class CocoaMaterialElementary {

public:
//---------- Constructors / Destructor
CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol,
float A, ALIint Z);
CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol, float A, ALIint Z);
~CocoaMaterialElementary(){};

ALIstring getName() const { return theName; }
Expand Down
1 change: 0 additions & 1 deletion Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"

class CocoaSolidShape {

public:
//---------- Constructors / Destructor
CocoaSolidShape(ALIstring type);
Expand Down
4 changes: 1 addition & 3 deletions Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
#include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"

class CocoaSolidShapeBox : public CocoaSolidShape {

public:
//---------- Constructors / Destructor
CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim,
ALIfloat zdim);
CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim);
~CocoaSolidShapeBox() override{};

ALIfloat getXHalfLength() const { return theXHalfLength; }
Expand Down
8 changes: 5 additions & 3 deletions Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
#include "CLHEP/Units/GlobalSystemOfUnits.h"

class CocoaSolidShapeTubs : public CocoaSolidShape {

public:
//---------- Constructors / Destructor
CocoaSolidShapeTubs(const ALIstring pType, ALIfloat pRMin, ALIfloat pRMax,
ALIfloat pDz, ALIfloat pSPhi = 0. * deg,
CocoaSolidShapeTubs(const ALIstring pType,
ALIfloat pRMin,
ALIfloat pRMax,
ALIfloat pDz,
ALIfloat pSPhi = 0. * deg,
ALIfloat pDPhi = 360. * deg);
~CocoaSolidShapeTubs() override{};
ALIfloat getInnerRadius() const { return theInnerRadius; }
Expand Down
12 changes: 4 additions & 8 deletions Alignment/CocoaDDLObjects/src/CocoaMaterialElementary.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,20 @@
//
// History: v1.0
// Pedro Arce
#include <cmath> // include floating-point std::abs functions
#include <cmath> // include floating-point std::abs functions
#include <fstream>
#include <map>

#include "Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h"

CocoaMaterialElementary::CocoaMaterialElementary(ALIstring name, float density,
ALIstring symbol, float A,
ALIint Z)
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 {
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 &&
return (std::abs(mate.getDensity() - theDensity) < kTolerance && mate.getSymbol() == theSymbol &&
std::abs(mate.getA() - theA) < kTolerance && mate.getZ() == theZ);
}
4 changes: 1 addition & 3 deletions Alignment/CocoaDDLObjects/src/CocoaSolidShapeBox.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@

#include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h"

CocoaSolidShapeBox::CocoaSolidShapeBox(ALIstring type, ALIfloat xdim,
ALIfloat ydim, ALIfloat zdim)
CocoaSolidShapeBox::CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim)
: CocoaSolidShape(type) {

theXHalfLength = xdim;
theYHalfLength = ydim;
theZHalfLength = zdim;
Expand Down
6 changes: 2 additions & 4 deletions Alignment/CocoaDDLObjects/src/CocoaSolidShapeTubs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@

#include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h"

CocoaSolidShapeTubs::CocoaSolidShapeTubs(const ALIstring type, ALIfloat pRMin,
ALIfloat pRMax, ALIfloat pDz,
ALIfloat pSPhi, ALIfloat pDPhi)
CocoaSolidShapeTubs::CocoaSolidShapeTubs(
const ALIstring type, ALIfloat pRMin, ALIfloat pRMax, ALIfloat pDz, ALIfloat pSPhi, ALIfloat pDPhi)
: CocoaSolidShape(type) {

theInnerRadius = pRMin;
theOuterRadius = pRMax;
theZHalfLength = pDz;
Expand Down
Loading

0 comments on commit 7614b05

Please sign in to comment.