Merge pull request cms-sw#33894 from civanch/geant4_for_tests

Use better interfaces to Geant4

Author: cmsbuild

SimG4CMS/CherenkovAnalysis/interface/DreamSD.h

@@ -4,7 +4,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimG4CMS/Calo/interface/CaloSD.h"
 
-#include "G4PhysicsOrderedFreeVector.hh"
+#include "G4PhysicsFreeVector.hh"
 
 #include <DD4hep/DD4hepUnits.h>
 
@@ -62,7 +62,7 @@ class DreamSD : public CaloSD {
   int side_;
 
   /// Table of Cherenkov angle integrals vs photon momentum
-  std::unique_ptr<G4PhysicsOrderedFreeVector> chAngleIntegrals_;
+  std::unique_ptr<G4PhysicsFreeVector> chAngleIntegrals_;
   G4MaterialPropertiesTable *materialPropertiesTable_;
 
   int nphotons_;

SimG4CMS/CherenkovAnalysis/src/DreamSD.cc

@@ -398,7 +398,7 @@ double DreamSD::getAverageNumberOfPhotons_(const double charge,
   double nMax = (*Rindex)[Rlength];
 
   // Max Cerenkov Angle Integral
-  double CAImax = chAngleIntegrals_.get()->GetMaxValue();
+  double CAImax = chAngleIntegrals_.get()->GetMaxEnergy();
 
   double dp = 0., ge = 0., CAImin = 0.;
 
@@ -483,13 +483,13 @@ bool DreamSD::setPbWO2MaterialProperties_(G4Material *aMaterial) {
 
   // Calculate Cherenkov angle integrals:
   // This is an ad-hoc solution (we hold it in the class, not in the material)
-  chAngleIntegrals_ = std::make_unique<G4PhysicsOrderedFreeVector>();
+  chAngleIntegrals_ = std::make_unique<G4PhysicsFreeVector>();
 
   int index = 0;
   double currentRI = RefractiveIndex[index];
   double currentPM = PhotonEnergy[index];
   double currentCAI = 0.0;
-  chAngleIntegrals_.get()->InsertValues(currentPM, currentCAI);
+  chAngleIntegrals_.get()->PutValue(0, currentPM, currentCAI);
   double prevPM = currentPM;
   double prevCAI = currentCAI;
   double prevRI = currentRI;
@@ -499,7 +499,7 @@ bool DreamSD::setPbWO2MaterialProperties_(G4Material *aMaterial) {
     currentCAI = 0.5 * (1.0 / (prevRI * prevRI) + 1.0 / (currentRI * currentRI));
     currentCAI = prevCAI + (currentPM - prevPM) * currentCAI;
 
-    chAngleIntegrals_.get()->InsertValues(currentPM, currentCAI);
+    chAngleIntegrals_.get()->PutValue(index, currentPM, currentCAI);
 
     prevPM = currentPM;
     prevCAI = currentCAI;

SimG4Core/Application/src/ElectronLimiter.cc

@@ -80,7 +80,7 @@ G4double ElectronLimiter::PostStepGetPhysicalInteractionLength(const G4Track &aT
   if (!killTrack_ && rangeCheckFlag_) {
     G4double safety = aTrack.GetStep()->GetPreStepPoint()->GetSafety();
     if (safety > std::min(minStepLimit_, previousLimit)) {
-      G4double range = ionisation_->GetRangeForLoss(kinEnergy, aTrack.GetMaterialCutsCouple());
+      G4double range = ionisation_->GetRange(kinEnergy, aTrack.GetMaterialCutsCouple());
       if (safety >= range) {
         killTrack_ = true;
         limit = 0.0;