diff --git a/FullSimLight/include/ATLFieldManager.hh b/FullSimLight/include/ATLFieldManager.hh index 81b0f9bccbeed5d172b9c30daa3085af125221ec..babe6b6cd84933431e141c84fa2f686f16c44b22 100644 --- a/FullSimLight/include/ATLFieldManager.hh +++ b/FullSimLight/include/ATLFieldManager.hh @@ -34,14 +34,11 @@ class G4Region; class G4FieldManager; //class MagneticField; - namespace atl { class G4Field : public G4MagneticField { public: // Constructor G4Field(const G4MagneticField* f, double d); - - // Destructor ~G4Field() override; void GetFieldValue(const G4double* pos, G4double* B) const override; @@ -52,7 +49,6 @@ namespace atl { }; } - class ParameterSet { public: ParameterSet(const std::unordered_map<std::string, double>& params) @@ -110,24 +106,11 @@ public: G4PropagatorInField* ); - // G4PropagatorInField* GetPropagatorInField(); // void SetPropagatorInField(G4PropagatorInField* pFieldPropagator); // G4PropagatorInField* m_propagator = G4TransportationManager::GetTransportationManager()->GetPropagatorInField(); inline G4ChordFinder* GetChordFinder(); - - // inline G4PropagatorInField* GetPropagatorInField(); - // void SetPropagatorInField(G4PropagatorInField* pFieldPropagator); - - // inline void SetLargestAcceptableStep( G4double newDist ); - // inline G4double GetLargestAcceptableStep(); - - // inline void SetDeltaChord(G4double newval) { m_dChordDefault = newval; } ///there are 3 Chord - //inline G4double GetDeltaChord() const { return m_dChordDefault; } - - // void SetMinimumEpsilonStep(G4double MinimumEpsilonStep); - // void SetMaximumEpsilonStep(G4double MaximumEpsilonStep); private: bool isInsideBeampipe(const G4Track*); diff --git a/FullSimLight/src/ATLFieldManager.cc b/FullSimLight/src/ATLFieldManager.cc index d01c07822881f8d7b69f70ecd8f71483f3429377..7a8147dcb2a76656eb35d697835a740c3459ffe9 100644 --- a/FullSimLight/src/ATLFieldManager.cc +++ b/FullSimLight/src/ATLFieldManager.cc @@ -70,7 +70,7 @@ #include "G4StepLimiter.hh" //#include "StepMax.hh" #include <cassert> -#include "HistoManager.hh" +//#include "HistoManager.hh" #include "G4RegionStore.hh" #include "G4Region.hh" #include "G4Track.hh" @@ -210,10 +210,10 @@ void ATLFieldManager::InitialiseForVolume( ParameterSet ¶ms, std::cout << "ccccccc" << ">\n"; - // initialisation of field manager + // initialisation of field manager theField.reset(field); SetDetectorField(field); //here - // ////add or eliminate + //add or eliminate if (pf != nullptr) { pf->SetMaxLoopCount(maxLC); pf->SetMinimumEpsilonStep(minEpsStep);