Skip to content
Snippets Groups Projects
Commit b47adfb3 authored by nnitika's avatar nnitika
Browse files

ATL

parent f367f15e
No related branches found
No related tags found
No related merge requests found
Pipeline #7045961 failed
...@@ -34,14 +34,11 @@ class G4Region; ...@@ -34,14 +34,11 @@ class G4Region;
class G4FieldManager; class G4FieldManager;
//class MagneticField; //class MagneticField;
namespace atl { namespace atl {
class G4Field : public G4MagneticField { class G4Field : public G4MagneticField {
public: public:
// Constructor // Constructor
G4Field(const G4MagneticField* f, double d); G4Field(const G4MagneticField* f, double d);
// Destructor
~G4Field() override; ~G4Field() override;
void GetFieldValue(const G4double* pos, G4double* B) const override; void GetFieldValue(const G4double* pos, G4double* B) const override;
...@@ -52,7 +49,6 @@ namespace atl { ...@@ -52,7 +49,6 @@ namespace atl {
}; };
} }
class ParameterSet { class ParameterSet {
public: public:
ParameterSet(const std::unordered_map<std::string, double>& params) ParameterSet(const std::unordered_map<std::string, double>& params)
...@@ -110,24 +106,11 @@ public: ...@@ -110,24 +106,11 @@ public:
G4PropagatorInField* ); G4PropagatorInField* );
// G4PropagatorInField* GetPropagatorInField(); // G4PropagatorInField* GetPropagatorInField();
// void SetPropagatorInField(G4PropagatorInField* pFieldPropagator); // void SetPropagatorInField(G4PropagatorInField* pFieldPropagator);
// G4PropagatorInField* m_propagator = G4TransportationManager::GetTransportationManager()->GetPropagatorInField(); // G4PropagatorInField* m_propagator = G4TransportationManager::GetTransportationManager()->GetPropagatorInField();
inline G4ChordFinder* GetChordFinder(); 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: private:
bool isInsideBeampipe(const G4Track*); bool isInsideBeampipe(const G4Track*);
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#include "G4StepLimiter.hh" #include "G4StepLimiter.hh"
//#include "StepMax.hh" //#include "StepMax.hh"
#include <cassert> #include <cassert>
#include "HistoManager.hh" //#include "HistoManager.hh"
#include "G4RegionStore.hh" #include "G4RegionStore.hh"
#include "G4Region.hh" #include "G4Region.hh"
#include "G4Track.hh" #include "G4Track.hh"
...@@ -210,10 +210,10 @@ void ATLFieldManager::InitialiseForVolume( ParameterSet &params, ...@@ -210,10 +210,10 @@ void ATLFieldManager::InitialiseForVolume( ParameterSet &params,
std::cout << "ccccccc" << ">\n"; std::cout << "ccccccc" << ">\n";
// initialisation of field manager // initialisation of field manager
theField.reset(field); theField.reset(field);
SetDetectorField(field); //here SetDetectorField(field); //here
// ////add or eliminate //add or eliminate
if (pf != nullptr) { if (pf != nullptr) {
pf->SetMaxLoopCount(maxLC); pf->SetMaxLoopCount(maxLC);
pf->SetMinimumEpsilonStep(minEpsStep); pf->SetMinimumEpsilonStep(minEpsStep);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment