Skip to content

Commit

Permalink
Merge pull request #26718 from cms-sw/code-format-simulation-081fe0
Browse files Browse the repository at this point in the history 
Running code-format for simulation
  • Loading branch information
@cmsbuild
cmsbuild committed May 10, 2019
2 parents c079135 + 99dbf5b commit 3252ab4
Show file tree
Hide file tree
Showing 211 changed files with 9,723 additions and 11,655 deletions.
86 changes: 35 additions & 51 deletions DataFormats/EcalRawData/interface/ESDCCHeaderBlock.h
View file
Expand Up @@ -4,9 +4,7 @@
#include <vector>

class ESDCCHeaderBlock {

public :

public:
typedef int key_type;

enum ESDCCRunType {
Expand All @@ -18,21 +16,11 @@ class ESDCCHeaderBlock {
TEST_RUN = 6,
GLOBAL_COSMIC_RUN = 7
};

enum ESSeqType {
STD_SEQ = 0,
DELTASCAN_SEQ = 1,
DELAYSCAN_SEQ = 2,
PULSESHAPE_SEQ = 3
};

enum ESTriggerType {
PHYSICS_TRIGGER = 1,
CALIBRATION_TRIGGER = 2,
TEST_TRIGGER = 3,
TECHNICAL_EXTERNAL_TRIGGER = 4
};

enum ESSeqType { STD_SEQ = 0, DELTASCAN_SEQ = 1, DELAYSCAN_SEQ = 2, PULSESHAPE_SEQ = 3 };

enum ESTriggerType { PHYSICS_TRIGGER = 1, CALIBRATION_TRIGGER = 2, TEST_TRIGGER = 3, TECHNICAL_EXTERNAL_TRIGGER = 4 };

ESDCCHeaderBlock();
ESDCCHeaderBlock(const int& dccId);

Expand All @@ -45,53 +33,53 @@ class ESDCCHeaderBlock {
void setLV1(const int& LV1) { LV1_ = LV1; };
void setBX(const int& BX) { BX_ = BX; }
void setGain(const int& gain) { gain_ = gain; }
void setPrecision(const int& precision) { precision_ = precision; }
void setPrecision(const int& precision) { precision_ = precision; }
void setDAC(const int& dac) { dac_ = dac; }
void setEventLength(const int &evtLen) { evtLen_ = evtLen; };
void setEventLength(const int& evtLen) { evtLen_ = evtLen; };
void setDCCErrors(const int& dccErrs) { dccErrs_ = dccErrs; };
void setRunNumber(const int& runNum) { runNum_ = runNum; };
void setRunType(const int& runType) { runType_ = runType; };
void setSeqType(const int& seqType) { seqType_ = seqType; };
void setTriggerType(const int& trgType) { trgType_ = trgType; };
void setCompressionFlag(const int& compFlag) { compFlag_ = compFlag; };
void setOrbitNumber(const int& orbit) {orbit_ = orbit; };
void setMajorVersion(const int& vmajor) {vmajor_ = vmajor; };
void setMinorVersion(const int& vminor) {vminor_ = vminor; };
void setOrbitNumber(const int& orbit) { orbit_ = orbit; };
void setMajorVersion(const int& vmajor) { vmajor_ = vmajor; };
void setMinorVersion(const int& vminor) { vminor_ = vminor; };
void setOptoRX0(const int& optoRX0) { optoRX0_ = optoRX0; };
void setOptoRX1(const int& optoRX1) { optoRX1_ = optoRX1; };
void setOptoRX2(const int& optoRX2) { optoRX2_ = optoRX2; };
void setOptoBC0(const int& optoBC0) { optoBC0_ = optoBC0; };
void setOptoBC1(const int& optoBC1) { optoBC1_ = optoBC1; };
void setOptoBC2(const int& optoBC2) { optoBC2_ = optoBC2; };
void setFEChannelStatus(const std::vector<int>& FEch) { FEch_ = FEch; };
// crepe thing
void setPacketLength(const int & packetLen) { packetLen_ = packetLen; };
void setBC(const int & bc) { bc_ = bc; };
void setEV(const int & ev) { ev_ = ev; };
// crepe thing
void setPacketLength(const int& packetLen) { packetLen_ = packetLen; };
void setBC(const int& bc) { bc_ = bc; };
void setEV(const int& ev) { ev_ = ev; };
// top level supervisor
void setBMMeasurements(const int & BMMeasurements) { BMMeasurements_ = BMMeasurements; };
void setBeginOfSpillSec(const int & beginOfSpillSec) { beginOfSpillSec_ = beginOfSpillSec; };
void setBeginOfSpillMilliSec(const int & beginOfSpillMilliSec) { beginOfSpillMilliSec_ = beginOfSpillMilliSec; };
void setEndOfSpillSec(const int & endOfSpillSec) { endOfSpillSec_ = endOfSpillSec; };
void setEndOfSpillMilliSec(const int & endOfSpillMilliSec) { endOfSpillMilliSec_ = endOfSpillMilliSec; };
void setBeginOfSpillLV1(const int & beginOfSpillLV1) { beginOfSpillLV1_ = beginOfSpillLV1; };
void setEndOfSpillLV1(const int & endOfSpillLV1) { endOfSpillLV1_ = endOfSpillLV1; };
void setBMMeasurements(const int& BMMeasurements) { BMMeasurements_ = BMMeasurements; };
void setBeginOfSpillSec(const int& beginOfSpillSec) { beginOfSpillSec_ = beginOfSpillSec; };
void setBeginOfSpillMilliSec(const int& beginOfSpillMilliSec) { beginOfSpillMilliSec_ = beginOfSpillMilliSec; };
void setEndOfSpillSec(const int& endOfSpillSec) { endOfSpillSec_ = endOfSpillSec; };
void setEndOfSpillMilliSec(const int& endOfSpillMilliSec) { endOfSpillMilliSec_ = endOfSpillMilliSec; };
void setBeginOfSpillLV1(const int& beginOfSpillLV1) { beginOfSpillLV1_ = beginOfSpillLV1; };
void setEndOfSpillLV1(const int& endOfSpillLV1) { endOfSpillLV1_ = endOfSpillLV1; };
// Cosmic Trigger Supervisor
void setTimeStampSec(const int & timestamp_sec) { timestamp_sec_ = timestamp_sec; };
void setTimeStampUSec(const int & timestamp_usec) { timestamp_usec_ = timestamp_usec; };
void setSpillNumber(const int & spillNum) { spillNum_ = spillNum; };
void setEventInSpill(const int & evtInSpill) { evtInSpill_ = evtInSpill; };
void setCAMACError(const int & camacErr) { camacErr_ = camacErr; };
void setVMEError(const int & vmeErr) { vmeErr_ = vmeErr; };
void setADCChannelStatus(const std::vector<int>& ADCch_status) { ADCch_status_ = ADCch_status; };
void setADCChannel(const std::vector<int>& ADCch) { ADCch_ = ADCch; };
void setTDCChannelStatus(const std::vector<int>& TDCch_status) { TDCch_status_ = TDCch_status; };
void setTDCChannel(const std::vector<int>& TDCch) { TDCch_ = TDCch; };
void setTimeStampSec(const int& timestamp_sec) { timestamp_sec_ = timestamp_sec; };
void setTimeStampUSec(const int& timestamp_usec) { timestamp_usec_ = timestamp_usec; };
void setSpillNumber(const int& spillNum) { spillNum_ = spillNum; };
void setEventInSpill(const int& evtInSpill) { evtInSpill_ = evtInSpill; };
void setCAMACError(const int& camacErr) { camacErr_ = camacErr; };
void setVMEError(const int& vmeErr) { vmeErr_ = vmeErr; };
void setADCChannelStatus(const std::vector<int>& ADCch_status) { ADCch_status_ = ADCch_status; };
void setADCChannel(const std::vector<int>& ADCch) { ADCch_ = ADCch; };
void setTDCChannelStatus(const std::vector<int>& TDCch_status) { TDCch_status_ = TDCch_status; };
void setTDCChannel(const std::vector<int>& TDCch) { TDCch_ = TDCch; };

int getLV1() const { return LV1_; }
int getBX() const { return BX_; }
int getGain() const { return gain_; }
int getPrecision() const { return precision_; }
int getPrecision() const { return precision_; }
int getDAC() const { return dac_; }
int getEventLength() const { return evtLen_; }
int getDCCErrors() const { return dccErrs_; }
Expand Down Expand Up @@ -120,7 +108,7 @@ class ESDCCHeaderBlock {
int getEndOfSpillMiliSec() const { return endOfSpillMilliSec_; }
int getBeginOfSpillLV1() const { return beginOfSpillLV1_; }
int getEndOfSpillLV1() const { return endOfSpillLV1_; }
int getTimeStampSec() const { return timestamp_sec_; }
int getTimeStampSec() const { return timestamp_sec_; }
int getTimeStampUSec() const { return timestamp_usec_; }
int getSpillNumber() const { return spillNum_; }
int getEventInSpill() const { return evtInSpill_; }
Expand All @@ -130,9 +118,8 @@ class ESDCCHeaderBlock {
const std::vector<int>& getADCChannel() const { return ADCch_; }
const std::vector<int>& getTDCChannelStatus() const { return TDCch_status_; }
const std::vector<int>& getTDCChannel() const { return TDCch_; }

private :


private:
int dccId_;
int fedId_;
int LV1_;
Expand Down Expand Up @@ -177,9 +164,6 @@ class ESDCCHeaderBlock {
std::vector<int> ADCch_;
std::vector<int> TDCch_status_;
std::vector<int> TDCch_;

};

#endif


16 changes: 5 additions & 11 deletions DataFormats/EcalRawData/interface/ESKCHIPBlock.h
View file
Expand Up @@ -4,10 +4,8 @@
#include <vector>

class ESKCHIPBlock {

public :

typedef int key_type; // For the sorted collection
public:
typedef int key_type; // For the sorted collection

ESKCHIPBlock();
ESKCHIPBlock(const int& kId);
Expand All @@ -26,8 +24,8 @@ class ESKCHIPBlock {

void setBC(const int& BC) { BC_ = BC; }
void setEC(const int& EC) { EC_ = EC; }
void setOptoBC(const int & OptoBC) { OptoBC_ = BC_; }
void setOptoEC(const int & OptoEC) { OptoEC_ = EC_; }
void setOptoBC(const int& OptoBC) { OptoBC_ = BC_; }
void setOptoEC(const int& OptoEC) { OptoEC_ = EC_; }
void setFlag1(const int& flag1) { flag1_ = flag1; };
void setFlag2(const int& flag2) { flag2_ = flag2; };
void setCRC(const int& CRC) { CRC_ = CRC; }
Expand All @@ -40,8 +38,7 @@ class ESKCHIPBlock {
int getFlag2() const { return flag2_; }
int getCRC() const { return CRC_; }

private :

private:
int kId_;
int dccId_;
int fedId_;
Expand All @@ -53,9 +50,6 @@ class ESKCHIPBlock {
int flag1_;
int flag2_;
int CRC_;

};

#endif


16 changes: 7 additions & 9 deletions DataFormats/EcalRawData/interface/ESListOfFEDS.h
View file
Expand Up @@ -4,18 +4,16 @@
#include <vector>

class ESListOfFEDS {
public:
ESListOfFEDS();
void AddFED(int fed);
std::vector<int> GetList() const { return list_of_feds; }
void SetList(std::vector<int>& feds) { list_of_feds = feds; }

public:
ESListOfFEDS();
void AddFED(int fed);
std::vector<int> GetList() const { return list_of_feds; }
void SetList(std::vector<int>& feds) { list_of_feds = feds; }

private:
std::vector<int> list_of_feds;
private:
std::vector<int> list_of_feds;
};

typedef std::vector<ESListOfFEDS> ESListOfFEDSCollection;


#endif

0 comments on commit 3252ab4

Please sign in to comment.