Skip to content

[CPP20][SIMULATION] Replace some enums with constexpr int #44535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Mar 28, 2024
Merged

[CPP20][SIMULATION] Replace some enums with constexpr int #44535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class CaloHitResponse {
public:
typedef std::map<DetId, CaloSamples> AnalogSignalMap;
// get this from somewhere external
enum { BUNCHSPACE = 25 };
static constexpr int BUNCHSPACE = 25;
static constexpr double dt = 0.5;
static constexpr int invdt = 2;

Expand Down
2 changes: 1 addition & 1 deletion SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class CaloShapeIntegrator : public CaloVShape {
public:
enum { BUNCHSPACE = 25 };
static constexpr int BUNCHSPACE = 25;

CaloShapeIntegrator(const CaloVShape *aShape);

Expand Down
11 changes: 5 additions & 6 deletions SimCalorimetry/EcalSimAlgos/interface/EcalCoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ class EcalCoder {

typedef CorrelatedNoisifier<EcalCorrMatrix> Noisifier;

enum {
NBITS = 12, // number of available bits
MAXADC = 4095, // 2^12 -1, adc max range
ADCGAINSWITCH = 4079, // adc gain switch
NGAINS = 3 // number of electronic gains
};
static constexpr int NBITS = 12, // number of available bits
MAXADC = 4095, // 2^12 -1, adc max range
ADCGAINSWITCH = 4079, // adc gain switch
NGAINS = 3 // number of electronic gains
;

/// ctor
EcalCoder(bool addNoise,
Expand Down
10 changes: 4 additions & 6 deletions SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,10 @@ class EcalSignalGenerator : public EcalBaseSignalGenerator {

// much of this stolen from EcalSimAlgos/EcalCoder

enum {
NBITS = 12, // number of available bits
MAXADC = 4095, // 2^12 -1, adc max range
ADCGAINSWITCH = 4079, // adc gain switch
NGAINS = 3
}; // number of electronic gains
static constexpr int NBITS = 12, // number of available bits
MAXADC = 4095, // 2^12 -1, adc max range
ADCGAINSWITCH = 4079, // adc gain switch
NGAINS = 3; // number of electronic gains

CaloSamples samplesInPE(const DIGI& digi); // have to define this separately for ES

Expand Down