Address issues 40764 and 40477

cms-sw · May 3, 2023 · 3338824 · 3338824
1 parent 62858e8
commit 3338824
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 246 deletions.
diff --git a/DataFormats/EcalDigi/src/EcalTimeDigi.cc b/DataFormats/EcalDigi/src/EcalTimeDigi.cc
@@ -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_);
 }
 
 void EcalTimeDigi::setWaveform(float* waveform) {

diff --git a/SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h b/SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h
@@ -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,
@@ -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,
@@ -137,8 +136,6 @@ class FullModelReactionDynamics {
                      G4int &vecLen);
 
   G4double normal();
-
-  G4int Poisson(G4double x);
 };
 
 #endif