Skip to content
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

Address issues #41476

Closed
wants to merge 5 commits into from
Closed

Address issues #41476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
741284a
Address issues 40764 and 40477
civanch May 1, 2023
76ca69f
code format
civanch May 1, 2023
025419d
attempt to fix read/write out of the array bound
civanch May 1, 2023
c314d22
attempt to fix read/write out of the array bound
civanch May 1, 2023
15f5210
code format
civanch May 1, 2023
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
6 changes: 2 additions & 4 deletions DataFormats/EcalDigi/src/EcalTimeDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ EcalTimeDigi::EcalTimeDigi(const DetId& id)
: id_(id), size_(0), sampleOfInterest_(-1), waveform_(WAVEFORMSAMPLES), data_(MAXSAMPLES) {}

void EcalTimeDigi::setSize(unsigned int size) {
size_ = size;
if (size > MAXSAMPLES)
size_ = MAXSAMPLES;
else
size_ = size;
data_.resize(size_);
data_.resize(size_);
civanch marked this conversation as resolved.
Show resolved Hide resolved
}

void EcalTimeDigi::setWaveform(float* waveform) {
Expand Down
10 changes: 6 additions & 4 deletions SimCalorimetry/EcalSimAlgos/src/EcalTimeMapDigitizer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,16 @@ void EcalTimeMapDigitizer::run(EcalTimeDigiCollection& output) {
output.back().setWaveform(vSamAll(m_index[i])->waveform);

unsigned int nTimeHits = 0;
float timeHits[vSamAll(m_index[i])->time_average_capacity];
unsigned int timeBX[vSamAll(m_index[i])->time_average_capacity];
unsigned int nTimeHitsMax = vSamAll(m_index[i])->time_average_capacity;
float timeHits[nTimeHitsMax];
unsigned int timeBX[nTimeHitsMax];

for (unsigned int j(0); j != vSamAll(m_index[i])->time_average_capacity; ++j) //here sampling on the OOTPU
for (unsigned int j(0); j != nTimeHitsMax; ++j) //here sampling on the OOTPU
{
if (vSamAll(m_index[i])->nhits[j] > 0) {
timeHits[nTimeHits] = vSamAll(m_index[i])->average_time[j];
timeBX[nTimeHits++] = m_minBunch + j;
timeBX[nTimeHits] = m_minBunch + j;
nTimeHits++;
}
}

Expand Down
11 changes: 4 additions & 7 deletions SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ class FullModelReactionDynamics {
public:
FullModelReactionDynamics() {}

virtual ~FullModelReactionDynamics() {}

virtual G4double FindInelasticity() { return 0.0; }

virtual G4double FindTimeDelay() { return 0.0; }
~FullModelReactionDynamics() = default;

G4bool GenerateXandPt( // derived from GENXPT
G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
Expand Down Expand Up @@ -100,6 +96,9 @@ class FullModelReactionDynamics {
const G4double theAtomicMass,
const G4double *massVec);

FullModelReactionDynamics(const FullModelReactionDynamics &) = delete;
FullModelReactionDynamics &operator=(const FullModelReactionDynamics &) = delete;

private:
void Rotate(const G4double numberofFinalStateNucleons,
const G4ThreeVector &temp,
Expand Down Expand Up @@ -137,8 +136,6 @@ class FullModelReactionDynamics {
G4int &vecLen);

G4double normal();

G4int Poisson(G4double x);
};

#endif
Loading