Skip to content

Commit

Permalink
Merge pull request #27023 from cms-sw/code-format-alca-db-a207d6
Browse files Browse the repository at this point in the history 
Running code-format for alca-db
  • Loading branch information
@cmsbuild
cmsbuild committed Jun 3, 2019
2 parents 7c578c0 + 0eb9d4f commit 1b3086f
Show file tree
Hide file tree
Showing 19 changed files with 242 additions and 283 deletions.
12 changes: 5 additions & 7 deletions CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h
View file
Expand Up @@ -16,18 +16,16 @@
#include <vector>

class CSCRecoDigiParameters {

public:
CSCRecoDigiParameters() { }
~CSCRecoDigiParameters() { }
CSCRecoDigiParameters() {}
~CSCRecoDigiParameters() {}

std::vector<int> pUserParOffset; // where the fupars for a ch. type start in the fupars blob.
std::vector<int> pUserParSize; // size of the fupars. if known, then both this and the above can go.
std::vector<int> pUserParOffset; // where the fupars for a ch. type start in the fupars blob.
std::vector<int> pUserParSize; // size of the fupars. if known, then both this and the above can go.
std::vector<int> pChamberType;
std::vector<float> pfupars; // user parameters
std::vector<float> pfupars; // user parameters

COND_SERIALIZABLE;
};

#endif

44 changes: 21 additions & 23 deletions CondFormats/GeometryObjects/interface/HcalParameters.h
View file
Expand Up @@ -4,11 +4,9 @@
#include "CondFormats/Serialization/interface/Serializable.h"

class HcalParameters {

public:

HcalParameters( void ) { }
~HcalParameters( void ) { }
HcalParameters(void) {}
~HcalParameters(void) {}

struct LayerItem {
unsigned int layer;
Expand All @@ -18,7 +16,7 @@ class HcalParameters {

std::vector<double> rHB;
std::vector<double> drHB;
std::vector<double> zHE;
std::vector<double> zHE;
std::vector<double> dzHE;
std::vector<double> zHO;

Expand All @@ -37,33 +35,33 @@ class HcalParameters {
std::vector<double> etaTable;
std::vector<double> rTable;
std::vector<double> phibin;
std::vector<double> phitable;
std::vector<double> phitable;
std::vector<double> etaRange;
std::vector<double> gparHF;
std::vector<double> Layer0Wt;
std::vector<double> Layer0Wt;
std::vector<double> HBGains;
std::vector<double> HEGains;
std::vector<double> HFGains;
std::vector<double> etaTableHF;
double dzVcal;
std::vector<int> maxDepth;
std::vector<int> modHB;
std::vector<int> modHE;
std::vector<int> layHB;
std::vector<int> layHE;
double dzVcal;

std::vector<int> maxDepth;
std::vector<int> modHB;
std::vector<int> modHE;
std::vector<int> layHB;
std::vector<int> layHE;

std::vector<int> etaMin;
std::vector<int> etaMax;
std::vector<int> noff;
std::vector<int> HBShift;
std::vector<int> HEShift;
std::vector<int> HFShift;
std::vector<int> etaMin;
std::vector<int> etaMax;
std::vector<int> noff;
std::vector<int> HBShift;
std::vector<int> HEShift;
std::vector<int> HFShift;

std::vector<int> etagroup;
std::vector<int> phigroup;
std::vector<int> etagroup;
std::vector<int> phigroup;
std::vector<LayerItem> layerGroupEtaSim, layerGroupEtaRec;
int topologyMode;
int topologyMode;

COND_SERIALIZABLE;
};
Expand Down
36 changes: 17 additions & 19 deletions CondFormats/GeometryObjects/interface/PCaloGeometry.h
View file
Expand Up @@ -6,30 +6,28 @@
#include <vector>
#include <cstdint>

class PCaloGeometry{

public:
class PCaloGeometry {
public:
PCaloGeometry();
PCaloGeometry(std::vector<float> const & ,
std::vector<float> const & ,
std::vector<uint32_t> const &,
std::vector<uint32_t> const & );
PCaloGeometry(std::vector<float> const &,
std::vector<float> const &,
std::vector<uint32_t> const &,
std::vector<uint32_t> const &);

~PCaloGeometry(){};

std::vector<float> const & getTranslation() const { return m_translation; }
std::vector<float> const & getDimension() const { return m_dimension; }
std::vector<uint32_t> const & getIndexes() const { return m_indexes; }
std::vector<uint32_t> const & getDenseIndices() const { return m_dins; }
std::vector<float> const &getTranslation() const { return m_translation; }
std::vector<float> const &getDimension() const { return m_dimension; }
std::vector<uint32_t> const &getIndexes() const { return m_indexes; }
std::vector<uint32_t> const &getDenseIndices() const { return m_dins; }

private:
std::vector<float> m_translation ;
std::vector<float> m_dimension ;
std::vector<uint32_t> m_indexes ;
std::vector<uint32_t> m_dins ;
private:
std::vector<float> m_translation;
std::vector<float> m_dimension;
std::vector<uint32_t> m_indexes;
std::vector<uint32_t> m_dins;

COND_SERIALIZABLE;
COND_SERIALIZABLE;
};

#endif

38 changes: 18 additions & 20 deletions CondFormats/GeometryObjects/interface/PGeometricDet.h
View file
Expand Up @@ -6,15 +6,14 @@
#include <vector>
#include <string>

class PGeometricDet{
class PGeometricDet {
public:
PGeometricDet(){};
~PGeometricDet(){};

public:
PGeometricDet() { };
~PGeometricDet() { };

struct Item{
std::string _name; // save only the name, not the namespace.
std::string _ns; // save only the name, not the namespace.
struct Item {
std::string _name; // save only the name, not the namespace.
std::string _ns; // save only the name, not the namespace.

double _x;
double _y;
Expand All @@ -23,35 +22,34 @@ class PGeometricDet{
double _rho;
// fill as you will but intent is rotation matrix A where first number is row and second number is column
double _a11, _a12, _a13, _a21, _a22, _a23, _a31, _a32, _a33;
double _params0,_params1,_params2,_params3,_params4,_params5,_params6,_params7,_params8,_params9,_params10;
double _params0, _params1, _params2, _params3, _params4, _params5, _params6, _params7, _params8, _params9,
_params10;
double _radLength;
double _xi;
double _pixROCRows;
double _pixROCCols;
double _pixROCx;
double _pixROCy;
double _siliconAPVNum;
int _level; // goes like 1, 2, 3, 4, 4, 4, 3, 4, 4, 3, 4, 4, 4, 1, 2, 3, etc.

int _level; // goes like 1, 2, 3, 4, 4, 4, 3, 4, 4, 3, 4, 4, 4, 1, 2, 3, etc.
int _shape;
// nav_type _ddd; DO NOT SAVE!
// DDName _ddname; DO NOT SAVE!
int _type;

int _numnt;
int _nt0, _nt1, _nt2, _nt3, _nt4, _nt5, _nt6 , _nt7, _nt8, _nt9, _nt10;
int _geographicalID; // to be converted to DetId
int _nt0, _nt1, _nt2, _nt3, _nt4, _nt5, _nt6, _nt7, _nt8, _nt9, _nt10;

int _geographicalID; // to be converted to DetId
bool _stereo;

COND_SERIALIZABLE;
};

std::vector<Item> pgeomdets_;
COND_SERIALIZABLE;
};

std::vector<Item> pgeomdets_;

COND_SERIALIZABLE;
COND_SERIALIZABLE;
};

#endif

25 changes: 11 additions & 14 deletions CondFormats/GeometryObjects/interface/PGeometricDetExtra.h
View file
Expand Up @@ -6,30 +6,27 @@
#include <vector>
#include <string>

class PGeometricDetExtra{
class PGeometricDetExtra {
public:
PGeometricDetExtra(){};
~PGeometricDetExtra(){};

public:
PGeometricDetExtra() { };
~PGeometricDetExtra() { };

struct Item{
int _geographicalId; // to be converted to DetId
struct Item {
int _geographicalId; // to be converted to DetId
// std::vector< DDExpandedNode > _parents; DO NOT SAVE!
//GeoHistory _parents;
double _volume;
double _density;
double _weight;
int _copy;
int _copy;
std::string _material;

COND_SERIALIZABLE;
};

std::vector<Item> pgdes_;
COND_SERIALIZABLE;
};

std::vector<Item> pgdes_;

COND_SERIALIZABLE;
COND_SERIALIZABLE;
};

#endif

36 changes: 17 additions & 19 deletions CondFormats/GeometryObjects/interface/PGeometricTimingDet.h
View file
Expand Up @@ -6,15 +6,14 @@
#include <vector>
#include <string>

class PGeometricTimingDet{
class PGeometricTimingDet {
public:
PGeometricTimingDet(){};
~PGeometricTimingDet(){};

public:
PGeometricTimingDet() { };
~PGeometricTimingDet() { };

struct Item{
std::string name_; // save only the name, not the namespace.
std::string ns_; // save only the name, not the namespace.
struct Item {
std::string name_; // save only the name, not the namespace.
std::string ns_; // save only the name, not the namespace.

double x_;
double y_;
Expand All @@ -23,35 +22,34 @@ class PGeometricTimingDet{
double rho_;
// fill as you will but intent is rotation matrix A where first number is row and second number is column
double a11_, a12_, a13_, a21_, a22_, a23_, a31_, a32_, a33_;
double params_0,params_1,params_2,params_3,params_4,params_5,params_6,params_7,params_8,params_9,params_10;
double params_0, params_1, params_2, params_3, params_4, params_5, params_6, params_7, params_8, params_9,
params_10;
double radLength_;
double xi_;
double pixROCRows_;
double pixROCCols_;
double pixROCx_;
double pixROCy_;
double siliconAPVNum_;
int level_; // goes like 1, 2, 3, 4, 4, 4, 3, 4, 4, 3, 4, 4, 4, 1, 2, 3, etc.

int level_; // goes like 1, 2, 3, 4, 4, 4, 3, 4, 4, 3, 4, 4, 4, 1, 2, 3, etc.
int shape_;
// nav_type _ddd; DO NOT SAVE!
// DDName _ddname; DO NOT SAVE!
int type_;

int numnt_;
int nt0_, nt1_, nt2_, nt3_, nt4_, nt5_, nt6_, nt7_, nt8_, nt9_, nt10_;
int geographicalID_; // to be converted to DetId

int geographicalID_; // to be converted to DetId
bool stereo_;

COND_SERIALIZABLE;
};

std::vector<Item> pgeomdets_;
COND_SERIALIZABLE;
};

std::vector<Item> pgeomdets_;

COND_SERIALIZABLE;
COND_SERIALIZABLE;
};

#endif

25 changes: 11 additions & 14 deletions CondFormats/GeometryObjects/interface/PGeometricTimingDetExtra.h
View file
Expand Up @@ -6,30 +6,27 @@
#include <vector>
#include <string>

class PGeometricTimingDetExtra{
class PGeometricTimingDetExtra {
public:
PGeometricTimingDetExtra(){};
~PGeometricTimingDetExtra(){};

public:
PGeometricTimingDetExtra() { };
~PGeometricTimingDetExtra() { };

struct Item{
int geographicalId_; // to be converted to DetId
struct Item {
int geographicalId_; // to be converted to DetId
// std::vector< DDExpandedNode > parents_; DO NOT SAVE!
//GeoHistory _parents;
double volume_;
double density_;
double weight_;
int copy_;
int copy_;
std::string material_;

COND_SERIALIZABLE;
};

std::vector<Item> pgdes_;
COND_SERIALIZABLE;
};

std::vector<Item> pgdes_;

COND_SERIALIZABLE;
COND_SERIALIZABLE;
};

#endif

0 comments on commit 1b3086f

Please sign in to comment.