From 2925dbae7f488c3113b5f574eca1ceaba0ffdaac Mon Sep 17 00:00:00 2001 From: shivesh Date: Tue, 21 Aug 2018 15:36:34 +0100 Subject: Tue 21 Aug 15:36:34 BST 2018 --- include/G4BeamTestDetectorConstruction.h | 6 +- include/G4BeamTestEMPhysics.h | 12 -- include/G4BeamTestGeneralPhysics.h | 11 - include/G4BeamTestHadronPhysics.h | 338 ------------------------------- include/G4BeamTestHadronPhysics.h.backup | 327 ++++++++++++++++++++++++++++++ include/G4BeamTestIonPhysics.h | 100 --------- include/G4BeamTestIonPhysics.h.backup | 88 ++++++++ include/G4BeamTestMuonPhysics.h | 16 +- include/G4BeamTestPhysicsList.h | 11 - include/G4BeamTestRunManager.h | 14 +- include/G4BeamTestTank.h | 90 ++++---- include/G4BeamTestUserSteppingAction.h | 14 -- include/G4BeamTestUserTrackingAction.h | 14 -- include/G4Interface.h | 22 +- include/G4TankIceSD.h | 38 ++-- 15 files changed, 479 insertions(+), 622 deletions(-) delete mode 100644 include/G4BeamTestHadronPhysics.h create mode 100644 include/G4BeamTestHadronPhysics.h.backup delete mode 100644 include/G4BeamTestIonPhysics.h create mode 100644 include/G4BeamTestIonPhysics.h.backup (limited to 'include') diff --git a/include/G4BeamTestDetectorConstruction.h b/include/G4BeamTestDetectorConstruction.h index ce53256..a3c0c9f 100644 --- a/include/G4BeamTestDetectorConstruction.h +++ b/include/G4BeamTestDetectorConstruction.h @@ -4,7 +4,7 @@ #include #include -// class G4BeamTestTank; +#include "G4BeamTestTank.h"; class G4BeamTestDetectorConstruction: public G4VUserDetectorConstruction { @@ -17,7 +17,7 @@ class G4BeamTestDetectorConstruction: public G4VUserDetectorConstruction void SetVerboseLevel(G4int level) {verboseLevel_=level;} - /* void InstallTank(G4BeamTestTank* tank) {tankList_.push_back(tank);} */ + void InstallTank(G4BeamTestTank* tank) {tank_ = tank;} const G4ThreeVector& GetWorldOrigin() const {return origin_;} @@ -39,7 +39,7 @@ class G4BeamTestDetectorConstruction: public G4VUserDetectorConstruction G4int verboseLevel_; - // std::vector tankList_; + G4BeamTestTank* tank_; }; #endif diff --git a/include/G4BeamTestEMPhysics.h b/include/G4BeamTestEMPhysics.h index 797719e..bf20b62 100644 --- a/include/G4BeamTestEMPhysics.h +++ b/include/G4BeamTestEMPhysics.h @@ -1,15 +1,3 @@ -/* - * copyright (C) 2010 - * The Icecube Collaboration - * - * $Id: G4BeamTestEMPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $ - * - * @version $Revision: 154687 $ - * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $ - * @author Fabian Kislat , Peter Nießen (tanktop) - * Last changed by: $LastChangedBy: jgonzalez $ - */ - #ifndef G4TANKRESPONSE_G4BEAMTESTEMPHYSICS_H_INCLUDED #define G4TANKRESPONSE_G4BEAMTESTEMPHYSICS_H_INCLUDED diff --git a/include/G4BeamTestGeneralPhysics.h b/include/G4BeamTestGeneralPhysics.h index 012bf40..19ab27b 100644 --- a/include/G4BeamTestGeneralPhysics.h +++ b/include/G4BeamTestGeneralPhysics.h @@ -1,14 +1,3 @@ -/* - * copyright (C) 2010 - * The Icecube Collaboration - * - * $Id: G4BeamTestGeneralPhysics.h 149388 2016-08-18 21:50:04Z jgonzalez $ - * - * @version $Revision: 149388 $ - * @date $LastChangedDate: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $ - * @author Fabian Kislat Last changed by: $LastChangedBy: jgonzalez $ - */ - #ifndef G4TANKRESPONSE_G4BEAMTESTGENERALPHYSICS_H_INCLUDED #define G4TANKRESPONSE_G4BEAMTESTGENERALPHYSICS_H_INCLUDED diff --git a/include/G4BeamTestHadronPhysics.h b/include/G4BeamTestHadronPhysics.h deleted file mode 100644 index 0fd9868..0000000 --- a/include/G4BeamTestHadronPhysics.h +++ /dev/null @@ -1,338 +0,0 @@ -/* - * copyright (C) 2010 - * The Icecube Collaboration - * - * $Id: G4BeamTestHadronPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $ - * - * @version $Revision: 154687 $ - * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $ - * @author Fabian Kislat Last changed by: $LastChangedBy: jgonzalez $ - */ - -#ifndef G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED -#define G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED - -#include - -#include - -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Low-energy Models -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// High-energy Models - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Stopping processes -#include -#include - -#ifdef TRIUMF_STOP_PIMINUS -#include -#else -#include -#endif -#ifdef TRIUMF_STOP_KMINUS -#include -#else -#include -#endif - -// quark gluon string model with chips afterburner. -#include -#include -#include -#include -#include -#include -#include -#include - -/** - @brief Hadron physics. Used only if Geant4 version is earlier than 4.10. - @author GEANT4/Peter Niessen - @date Sat Jul 24 23:53:47 EDT 2004 - - Many processes. You're encouraged to check the source. -*/ -class G4BeamTestHadronPhysics : public G4VPhysicsConstructor { -public: - - /** - * The constructor - */ - G4BeamTestHadronPhysics(); - - /** - * The virtual destructor - */ - virtual ~G4BeamTestHadronPhysics(); - - /** - * This method will be invoked in the Construct() method. - * each particle type will be instantiated - */ - virtual void ConstructParticle(); - - /** - * This method will be invoked in the Construct() method. - * each physics process will be instantiated and - * registered to the process manager of each particle type - */ - virtual void ConstructProcess(); - -protected: - - // Elastic Process - G4HadronElasticProcess elasticProcess_; - G4LElastic *elasticModel_; - - // Pi + - G4PionPlusInelasticProcess pionPlusInelastic_; - G4LEPionPlusInelastic *lePionPlusModel_; - G4hMultipleScattering pionPlusMult_; - G4hIonisation pionPlusIonisation_; - - // Pi - - G4PionMinusInelasticProcess pionMinusInelastic_; - G4LEPionMinusInelastic *lePionMinusModel_; - G4hMultipleScattering pionMinusMult_; - G4hIonisation pionMinusIonisation_; -#ifdef TRIUMF_STOP_PIMINUS - G4PionMinusAbsorptionAtRest pionMinusAbsorption_; -#else - G4PiMinusAbsorptionAtRest pionMinusAbsorption_; -#endif - - // pi+ and pi- - G4TheoFSGenerator theoModel_; - G4ExcitationHandler excitationHandler_; - G4PreCompoundModel *preEquilib_; - G4GeneratorPrecompoundInterface cascade_; - G4QGSModel< G4QGSParticipants > stringModel_; - G4QGSMFragmentation fragmentation_; - G4ExcitedStringDecay *stringDecay_; - - // K + - G4KaonPlusInelasticProcess kaonPlusInelastic_; - G4LEKaonPlusInelastic *leKaonPlusModel_; - G4HEKaonPlusInelastic *heKaonPlusModel_; - G4hMultipleScattering kaonPlusMult_; - G4hIonisation kaonPlusIonisation_; - - // K - - G4KaonMinusInelasticProcess kaonMinusInelastic_; - G4LEKaonMinusInelastic *leKaonMinusModel_; - G4HEKaonMinusInelastic *heKaonMinusModel_; - G4hMultipleScattering kaonMinusMult_; - G4hIonisation kaonMinusIonisation_; -#ifdef TRIUMF_STOP_KMINUS - G4KaonMinusAbsorption kaonMinusAbsorption_; -#else - G4PiMinusAbsorptionAtRest kaonMinusAbsorption_; -#endif - - // K0L - G4KaonZeroLInelasticProcess kaonZeroLInelastic_; - G4LEKaonZeroLInelastic *leKaonZeroLModel_; - G4HEKaonZeroInelastic *heKaonZeroLModel_; - - // K0S - G4KaonZeroSInelasticProcess kaonZeroSInelastic_; - G4LEKaonZeroSInelastic *leKaonZeroSModel_; - G4HEKaonZeroInelastic *heKaonZeroSModel_; - - // Proton - G4ProtonInelasticProcess protonInelastic_; - G4LEProtonInelastic *leProtonModel_; - G4HEProtonInelastic *heProtonModel_; - G4hMultipleScattering protonMult_; - G4hIonisation protonIonisation_; - - // anti-proton - G4AntiProtonInelasticProcess antiProtonInelastic_; - G4LEAntiProtonInelastic *leAntiProtonModel_; - G4HEAntiProtonInelastic *heAntiProtonModel_; - G4hMultipleScattering antiProtonMult_; - G4hIonisation antiProtonIonisation_; - G4AntiProtonAnnihilationAtRest antiProtonAnnihilation_; - - // neutron - G4NeutronInelasticProcess neutronInelastic_; - G4LENeutronInelastic *leNeutronModel_; - G4HENeutronInelastic *heNeutronModel_; - G4HadronFissionProcess neutronFission_; - G4LFission *neutronFissionModel_; - G4HadronCaptureProcess neutronCapture_; - G4LCapture *neutronCaptureModel_; - - - // anti-neutron - G4AntiNeutronInelasticProcess antiNeutronInelastic_; - G4LEAntiNeutronInelastic *leAntiNeutronModel_; - G4HEAntiNeutronInelastic *heAntiNeutronModel_; - G4AntiNeutronAnnihilationAtRest antiNeutronAnnihilation_; - - // Lambda - G4LambdaInelasticProcess lambdaInelastic_; - G4LELambdaInelastic *leLambdaModel_; - G4HELambdaInelastic *heLambdaModel_; - - // AntiLambda - G4AntiLambdaInelasticProcess antiLambdaInelastic_; - G4LEAntiLambdaInelastic *leAntiLambdaModel_; - G4HEAntiLambdaInelastic *heAntiLambdaModel_; - - // SigmaMinus - G4SigmaMinusInelasticProcess sigmaMinusInelastic_; - G4LESigmaMinusInelastic *leSigmaMinusModel_; - G4HESigmaMinusInelastic *heSigmaMinusModel_; - G4hMultipleScattering sigmaMinusMult_; - G4hIonisation sigmaMinusIonisation_; - - // AntiSigmaMinus - G4AntiSigmaMinusInelasticProcess antiSigmaMinusInelastic_; - G4LEAntiSigmaMinusInelastic *leAntiSigmaMinusModel_; - G4HEAntiSigmaMinusInelastic *heAntiSigmaMinusModel_; - G4hMultipleScattering antiSigmaMinusMult_; - G4hIonisation antiSigmaMinusIonisation_; - - // SigmaPlus - G4SigmaPlusInelasticProcess sigmaPlusInelastic_; - G4LESigmaPlusInelastic *leSigmaPlusModel_; - G4HESigmaPlusInelastic *heSigmaPlusModel_; - G4hMultipleScattering sigmaPlusMult_; - G4hIonisation sigmaPlusIonisation_; - - // AntiSigmaPlus - G4AntiSigmaPlusInelasticProcess antiSigmaPlusInelastic_; - G4LEAntiSigmaPlusInelastic *leAntiSigmaPlusModel_; - G4HEAntiSigmaPlusInelastic *heAntiSigmaPlusModel_; - G4hMultipleScattering antiSigmaPlusMult_; - G4hIonisation antiSigmaPlusIonisation_; - - // XiZero - G4XiZeroInelasticProcess xiZeroInelastic_; - G4LEXiZeroInelastic *leXiZeroModel_; - G4HEXiZeroInelastic *heXiZeroModel_; - - // AntiXiZero - G4AntiXiZeroInelasticProcess antiXiZeroInelastic_; - G4LEAntiXiZeroInelastic* leAntiXiZeroModel_; - G4HEAntiXiZeroInelastic* heAntiXiZeroModel_; - - // XiMinus - G4XiMinusInelasticProcess xiMinusInelastic_; - G4LEXiMinusInelastic *leXiMinusModel_; - G4HEXiMinusInelastic *heXiMinusModel_; - G4hMultipleScattering xiMinusMult_; - G4hIonisation xiMinusIonisation_; - - // AntiXiMinus - G4AntiXiMinusInelasticProcess antiXiMinusInelastic_; - G4LEAntiXiMinusInelastic *leAntiXiMinusModel_; - G4HEAntiXiMinusInelastic *heAntiXiMinusModel_; - G4hMultipleScattering antiXiMinusMult_; - G4hIonisation antiXiMinusIonisation_; - - // OmegaMinus - G4OmegaMinusInelasticProcess omegaMinusInelastic_; - G4LEOmegaMinusInelastic *leOmegaMinusModel_; - G4HEOmegaMinusInelastic *heOmegaMinusModel_; - G4hMultipleScattering omegaMinusMult_; - G4hIonisation omegaMinusIonisation_; - - // AntiOmegaMinus - G4AntiOmegaMinusInelasticProcess antiOmegaMinusInelastic_; - G4LEAntiOmegaMinusInelastic *leAntiOmegaMinusModel_; - G4HEAntiOmegaMinusInelastic *heAntiOmegaMinusModel_; - G4hMultipleScattering antiOmegaMinusMult_; - G4hIonisation antiOmegaMinusIonisation_; -}; - - -#endif // G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED diff --git a/include/G4BeamTestHadronPhysics.h.backup b/include/G4BeamTestHadronPhysics.h.backup new file mode 100644 index 0000000..dc2bf67 --- /dev/null +++ b/include/G4BeamTestHadronPhysics.h.backup @@ -0,0 +1,327 @@ +#ifndef G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED +#define G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED + +#include + +#include + +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Low-energy Models +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// High-energy Models + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Stopping processes +#include +#include + +#ifdef TRIUMF_STOP_PIMINUS +#include +#else +#include +#endif +#ifdef TRIUMF_STOP_KMINUS +#include +#else +#include +#endif + +// quark gluon string model with chips afterburner. +#include +#include +#include +#include +#include +#include +#include +#include + +/** + @brief Hadron physics. Used only if Geant4 version is earlier than 4.10. + @author GEANT4/Peter Niessen + @date Sat Jul 24 23:53:47 EDT 2004 + + Many processes. You're encouraged to check the source. +*/ +class G4BeamTestHadronPhysics : public G4VPhysicsConstructor { +public: + + /** + * The constructor + */ + G4BeamTestHadronPhysics(); + + /** + * The virtual destructor + */ + virtual ~G4BeamTestHadronPhysics(); + + /** + * This method will be invoked in the Construct() method. + * each particle type will be instantiated + */ + virtual void ConstructParticle(); + + /** + * This method will be invoked in the Construct() method. + * each physics process will be instantiated and + * registered to the process manager of each particle type + */ + virtual void ConstructProcess(); + +protected: + + // Elastic Process + G4HadronElasticProcess elasticProcess_; + G4LElastic *elasticModel_; + + // Pi + + G4PionPlusInelasticProcess pionPlusInelastic_; + G4LEPionPlusInelastic *lePionPlusModel_; + G4hMultipleScattering pionPlusMult_; + G4hIonisation pionPlusIonisation_; + + // Pi - + G4PionMinusInelasticProcess pionMinusInelastic_; + G4LEPionMinusInelastic *lePionMinusModel_; + G4hMultipleScattering pionMinusMult_; + G4hIonisation pionMinusIonisation_; +#ifdef TRIUMF_STOP_PIMINUS + G4PionMinusAbsorptionAtRest pionMinusAbsorption_; +#else + G4PiMinusAbsorptionAtRest pionMinusAbsorption_; +#endif + + // pi+ and pi- + G4TheoFSGenerator theoModel_; + G4ExcitationHandler excitationHandler_; + G4PreCompoundModel *preEquilib_; + G4GeneratorPrecompoundInterface cascade_; + G4QGSModel< G4QGSParticipants > stringModel_; + G4QGSMFragmentation fragmentation_; + G4ExcitedStringDecay *stringDecay_; + + // K + + G4KaonPlusInelasticProcess kaonPlusInelastic_; + G4LEKaonPlusInelastic *leKaonPlusModel_; + G4HEKaonPlusInelastic *heKaonPlusModel_; + G4hMultipleScattering kaonPlusMult_; + G4hIonisation kaonPlusIonisation_; + + // K - + G4KaonMinusInelasticProcess kaonMinusInelastic_; + G4LEKaonMinusInelastic *leKaonMinusModel_; + G4HEKaonMinusInelastic *heKaonMinusModel_; + G4hMultipleScattering kaonMinusMult_; + G4hIonisation kaonMinusIonisation_; +#ifdef TRIUMF_STOP_KMINUS + G4KaonMinusAbsorption kaonMinusAbsorption_; +#else + G4PiMinusAbsorptionAtRest kaonMinusAbsorption_; +#endif + + // K0L + G4KaonZeroLInelasticProcess kaonZeroLInelastic_; + G4LEKaonZeroLInelastic *leKaonZeroLModel_; + G4HEKaonZeroInelastic *heKaonZeroLModel_; + + // K0S + G4KaonZeroSInelasticProcess kaonZeroSInelastic_; + G4LEKaonZeroSInelastic *leKaonZeroSModel_; + G4HEKaonZeroInelastic *heKaonZeroSModel_; + + // Proton + G4ProtonInelasticProcess protonInelastic_; + G4LEProtonInelastic *leProtonModel_; + G4HEProtonInelastic *heProtonModel_; + G4hMultipleScattering protonMult_; + G4hIonisation protonIonisation_; + + // anti-proton + G4AntiProtonInelasticProcess antiProtonInelastic_; + G4LEAntiProtonInelastic *leAntiProtonModel_; + G4HEAntiProtonInelastic *heAntiProtonModel_; + G4hMultipleScattering antiProtonMult_; + G4hIonisation antiProtonIonisation_; + G4AntiProtonAnnihilationAtRest antiProtonAnnihilation_; + + // neutron + G4NeutronInelasticProcess neutronInelastic_; + G4LENeutronInelastic *leNeutronModel_; + G4HENeutronInelastic *heNeutronModel_; + G4HadronFissionProcess neutronFission_; + G4LFission *neutronFissionModel_; + G4HadronCaptureProcess neutronCapture_; + G4LCapture *neutronCaptureModel_; + + + // anti-neutron + G4AntiNeutronInelasticProcess antiNeutronInelastic_; + G4LEAntiNeutronInelastic *leAntiNeutronModel_; + G4HEAntiNeutronInelastic *heAntiNeutronModel_; + G4AntiNeutronAnnihilationAtRest antiNeutronAnnihilation_; + + // Lambda + G4LambdaInelasticProcess lambdaInelastic_; + G4LELambdaInelastic *leLambdaModel_; + G4HELambdaInelastic *heLambdaModel_; + + // AntiLambda + G4AntiLambdaInelasticProcess antiLambdaInelastic_; + G4LEAntiLambdaInelastic *leAntiLambdaModel_; + G4HEAntiLambdaInelastic *heAntiLambdaModel_; + + // SigmaMinus + G4SigmaMinusInelasticProcess sigmaMinusInelastic_; + G4LESigmaMinusInelastic *leSigmaMinusModel_; + G4HESigmaMinusInelastic *heSigmaMinusModel_; + G4hMultipleScattering sigmaMinusMult_; + G4hIonisation sigmaMinusIonisation_; + + // AntiSigmaMinus + G4AntiSigmaMinusInelasticProcess antiSigmaMinusInelastic_; + G4LEAntiSigmaMinusInelastic *leAntiSigmaMinusModel_; + G4HEAntiSigmaMinusInelastic *heAntiSigmaMinusModel_; + G4hMultipleScattering antiSigmaMinusMult_; + G4hIonisation antiSigmaMinusIonisation_; + + // SigmaPlus + G4SigmaPlusInelasticProcess sigmaPlusInelastic_; + G4LESigmaPlusInelastic *leSigmaPlusModel_; + G4HESigmaPlusInelastic *heSigmaPlusModel_; + G4hMultipleScattering sigmaPlusMult_; + G4hIonisation sigmaPlusIonisation_; + + // AntiSigmaPlus + G4AntiSigmaPlusInelasticProcess antiSigmaPlusInelastic_; + G4LEAntiSigmaPlusInelastic *leAntiSigmaPlusModel_; + G4HEAntiSigmaPlusInelastic *heAntiSigmaPlusModel_; + G4hMultipleScattering antiSigmaPlusMult_; + G4hIonisation antiSigmaPlusIonisation_; + + // XiZero + G4XiZeroInelasticProcess xiZeroInelastic_; + G4LEXiZeroInelastic *leXiZeroModel_; + G4HEXiZeroInelastic *heXiZeroModel_; + + // AntiXiZero + G4AntiXiZeroInelasticProcess antiXiZeroInelastic_; + G4LEAntiXiZeroInelastic* leAntiXiZeroModel_; + G4HEAntiXiZeroInelastic* heAntiXiZeroModel_; + + // XiMinus + G4XiMinusInelasticProcess xiMinusInelastic_; + G4LEXiMinusInelastic *leXiMinusModel_; + G4HEXiMinusInelastic *heXiMinusModel_; + G4hMultipleScattering xiMinusMult_; + G4hIonisation xiMinusIonisation_; + + // AntiXiMinus + G4AntiXiMinusInelasticProcess antiXiMinusInelastic_; + G4LEAntiXiMinusInelastic *leAntiXiMinusModel_; + G4HEAntiXiMinusInelastic *heAntiXiMinusModel_; + G4hMultipleScattering antiXiMinusMult_; + G4hIonisation antiXiMinusIonisation_; + + // OmegaMinus + G4OmegaMinusInelasticProcess omegaMinusInelastic_; + G4LEOmegaMinusInelastic *leOmegaMinusModel_; + G4HEOmegaMinusInelastic *heOmegaMinusModel_; + G4hMultipleScattering omegaMinusMult_; + G4hIonisation omegaMinusIonisation_; + + // AntiOmegaMinus + G4AntiOmegaMinusInelasticProcess antiOmegaMinusInelastic_; + G4LEAntiOmegaMinusInelastic *leAntiOmegaMinusModel_; + G4HEAntiOmegaMinusInelastic *heAntiOmegaMinusModel_; + G4hMultipleScattering antiOmegaMinusMult_; + G4hIonisation antiOmegaMinusIonisation_; +}; + + +#endif // G4TANKRESPONSE_G4BEAMTESTHADRONPHYSICS_H_INCLUDED diff --git a/include/G4BeamTestIonPhysics.h b/include/G4BeamTestIonPhysics.h deleted file mode 100644 index 276b0d5..0000000 --- a/include/G4BeamTestIonPhysics.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - * copyright (C) 2010 - * The Icecube Collaboration - * - * $Id: G4BeamTestIonPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $ - * - * @version $Revision: 154687 $ - * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $ - * @author Fabian Kislat , Peter Nießen (tanktop) - * Last changed by: $LastChangedBy: jgonzalez $ - */ - -#ifndef G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED -#define G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** - @class G4BeamTestIonPhysics - @brief Ion physics. Used only if Geant4 version is earlier than 4.10. - @author GEANT4/Peter Niessen - @date Sun Jul 25 00:24:42 EDT 2004 - - The ion physics. Check the source for details. -*/ -class G4BeamTestIonPhysics : public G4VPhysicsConstructor { - -public: - - /** - * The constructor - */ - G4BeamTestIonPhysics(); - - /** - * The virtual destructor - */ - virtual ~G4BeamTestIonPhysics(); - - /** - * This method will be invoked in the Construct() method. - * each particle type will be instantiated - */ - virtual void ConstructParticle(); - - /** - * This method will be invoked in the Construct() method. - * each physics process will be instantiated and - * registered to the process manager of each particle type - */ - virtual void ConstructProcess(); - -protected: - // Elastic Process - G4HadronElasticProcess elasticProcess_; - G4LElastic* elasticModel_; - - // Generic Ion physics - G4hMultipleScattering ionMultipleScattering_; - G4ionIonisation ionIonisation_; - - // Deuteron physics - G4hMultipleScattering deuteronMultipleScattering_; - G4hIonisation deuteronIonisation_; - G4DeuteronInelasticProcess deuteronProcess_; - G4LEDeuteronInelastic* deuteronModel_; - - // Triton physics - G4hMultipleScattering tritonMultipleScattering_; - G4hIonisation tritonIonisation_; - G4TritonInelasticProcess tritonProcess_; - G4LETritonInelastic* tritonModel_; - - // Alpha physics - G4hMultipleScattering alphaMultipleScattering_; - G4hIonisation alphaIonisation_; - G4AlphaInelasticProcess alphaProcess_; - G4LEAlphaInelastic* alphaModel_; - - // He3 physics - G4hMultipleScattering he3MultipleScattering_; - G4hIonisation he3Ionisation_; - -}; - - -#endif // G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED diff --git a/include/G4BeamTestIonPhysics.h.backup b/include/G4BeamTestIonPhysics.h.backup new file mode 100644 index 0000000..0a9d5f1 --- /dev/null +++ b/include/G4BeamTestIonPhysics.h.backup @@ -0,0 +1,88 @@ +#ifndef G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED +#define G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** + @class G4BeamTestIonPhysics + @brief Ion physics. Used only if Geant4 version is earlier than 4.10. + @author GEANT4/Peter Niessen + @date Sun Jul 25 00:24:42 EDT 2004 + + The ion physics. Check the source for details. +*/ +class G4BeamTestIonPhysics : public G4VPhysicsConstructor { + +public: + + /** + * The constructor + */ + G4BeamTestIonPhysics(); + + /** + * The virtual destructor + */ + virtual ~G4BeamTestIonPhysics(); + + /** + * This method will be invoked in the Construct() method. + * each particle type will be instantiated + */ + virtual void ConstructParticle(); + + /** + * This method will be invoked in the Construct() method. + * each physics process will be instantiated and + * registered to the process manager of each particle type + */ + virtual void ConstructProcess(); + +protected: + // Elastic Process + G4HadronElasticProcess elasticProcess_; + G4LElastic* elasticModel_; + + // Generic Ion physics + G4hMultipleScattering ionMultipleScattering_; + G4ionIonisation ionIonisation_; + + // Deuteron physics + G4hMultipleScattering deuteronMultipleScattering_; + G4hIonisation deuteronIonisation_; + G4DeuteronInelasticProcess deuteronProcess_; + G4LEDeuteronInelastic* deuteronModel_; + + // Triton physics + G4hMultipleScattering tritonMultipleScattering_; + G4hIonisation tritonIonisation_; + G4TritonInelasticProcess tritonProcess_; + G4LETritonInelastic* tritonModel_; + + // Alpha physics + G4hMultipleScattering alphaMultipleScattering_; + G4hIonisation alphaIonisation_; + G4AlphaInelasticProcess alphaProcess_; + G4LEAlphaInelastic* alphaModel_; + + // He3 physics + G4hMultipleScattering he3MultipleScattering_; + G4hIonisation he3Ionisation_; + +}; + + +#endif // G4TANKRESPONSE_G4BEAMTESTIONPHYSICS_H_INCLUDED diff --git a/include/G4BeamTestMuonPhysics.h b/include/G4BeamTestMuonPhysics.h index de09d73..0c53595 100644 --- a/include/G4BeamTestMuonPhysics.h +++ b/include/G4BeamTestMuonPhysics.h @@ -1,15 +1,3 @@ -/* - * copyright (C) 2010 - * The Icecube Collaboration - * - * $Id: G4BeamTestMuonPhysics.h 154687 2017-04-05 15:46:57Z jgonzalez $ - * - * @version $Revision: 154687 $ - * @date $LastChangedDate: 2017-04-05 16:46:57 +0100 (Wed, 05 Apr 2017) $ - * @author Fabian Kislat , Peter Nießen (tanktop) - * Last changed by: $LastChangedBy: jgonzalez $ - */ - #ifndef G4TANKRESPONSE_G4BEAMTESTMUONPHYSICS_H_INCLUDED #define G4TANKRESPONSE_G4BEAMTESTMUONPHYSICS_H_INCLUDED @@ -20,7 +8,7 @@ #include #include #include -#include +#include /** @class G4BeamTestMuonPhysics @@ -58,7 +46,7 @@ private: G4MuBremsstrahlung muMinusBremsstrahlung_; G4MuPairProduction muMinusPairProduction_; - G4MuonMinusCaptureAtRest muMinusCaptureAtRest_; + G4MuonMinusCapture muMinusCapture_; // Tau physics G4MuMultipleScattering tauPlusMultipleScattering_; diff --git a/include/G4BeamTestPhysicsList.h b/include/G4BeamTestPhysicsList.h index e253e33..7fb7ed5 100644 --- a/include/G4BeamTestPhysicsList.h +++ b/include/G4BeamTestPhysicsList.h @@ -1,14 +1,3 @@ -/** - * Copyright (C) 2009 - * The IceCube collaboration - * ID: $Id: G4BeamTestPhysicsList.h 149388 2016-08-18 21:50:04Z jgonzalez $ - * - * @file G4BeamTestPhysicsList.h - * @version $Rev: 149388 $ - * @date $Date: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $ - * @author Tilo Waldenmaier, Thomas Melzig, Fabian Kislat - */ - #ifndef _TOPSIMULATOR_G4BEAMTESTPHYSICSLIST_H #define _TOPSIMULATOR_G4BEAMTESTPHYSICSLIST_H diff --git a/include/G4BeamTestRunManager.h b/include/G4BeamTestRunManager.h index c142b38..a7eaff0 100644 --- a/include/G4BeamTestRunManager.h +++ b/include/G4BeamTestRunManager.h @@ -1,15 +1,3 @@ -/** - * Copyright (C) 2009 - * The IceCube collaboration - * ID: $Id: G4BeamTestRunManager.h 149391 2016-08-18 21:58:04Z jgonzalez $ - * - * @file G4BeamTestRunManager.h - * @version $Rev: 149391 $ - * @date $Date: 2016-08-18 22:58:04 +0100 (Thu, 18 Aug 2016) $ - * @author Tilo Waldenmaier - */ - - #ifndef TOPSIMULATOR_G4BEAMTESTRUNMANAGER_H #define TOPSIMULATOR_G4BEAMTESTRUNMANAGER_H @@ -25,7 +13,7 @@ class G4BeamTestRunManager: public G4RunManager public: G4BeamTestRunManager(); - static G4BeamTestRunManager* GetIceTopRunManager() {return (G4IceTopRunManager*)GetRunManager();} + static G4BeamTestRunManager* GetIceTopRunManager() {return (G4BeamTestRunManager*)GetRunManager();} // Disable BeamOn void BeamOn(G4int n_event,const char* macroFile=0,G4int n_select=-1); diff --git a/include/G4BeamTestTank.h b/include/G4BeamTestTank.h index b08e223..c7a1713 100644 --- a/include/G4BeamTestTank.h +++ b/include/G4BeamTestTank.h @@ -1,22 +1,10 @@ -/** - * Copyright (C) 2009 - * The IceCube collaboration - * ID: $Id: G4BeamTestTank.h 149431 2016-08-19 17:38:06Z jgonzalez $ - * - * @file G4BeamTestTank.h - * @version $Rev: 149431 $ - * @date $Date: 2016-08-19 18:38:06 +0100 (Fri, 19 Aug 2016) $ - * @author Tilo Waldenmaier, Thomas Melzig - */ - - #ifndef _TOPSIMULATOR_G4BEAMTESTTANK_H_ #define _TOPSIMULATOR_G4BEAMTESTTANK_H_ -class OMKey; -struct TankKey; -class I3Geometry; -class I3Position; +// class OMKey; +// struct TankKey; +// class I3Geometry; +// class I3Position; class G4LogicalVolume; class G4VPhysicalVolume; @@ -26,8 +14,6 @@ class G4TankIceSD; #include #include -#include - /** * This class constructs the physical volume of single tanks, serves as bridge to the sensitive detector in the tank, and computes the location of the point that define the snow surface. It also stores the basic tank dimensions (height, radius, snow). * @@ -39,49 +25,49 @@ class G4TankIceSD; class G4BeamTestTank { public: - G4BeamTestTank(const TankKey& tankKey, const I3Geometry& geometry); + G4BeamTestTank(/* const TankKey& tankKey, const I3Geometry& geometry */); ~G4BeamTestTank(); const G4ThreeVector& GetPos() const {return position_;} - /// Position of center of the tank - I3Position GetPos_I3(); - double GetX_I3(); - double GetY_I3(); - double GetZ_I3(); + /* /// Position of center of the tank */ + /* I3Position GetPos_I3(); */ + /* double GetX_I3(); */ + /* double GetY_I3(); */ + /* double GetZ_I3(); */ - /// Delaunay points around tank - const G4ThreeVector& GetDelaunayPoint1() const {return delaunayPoint1_;} - const G4ThreeVector& GetDelaunayPoint2() const {return delaunayPoint2_;} - const G4ThreeVector& GetDelaunayPoint3() const {return delaunayPoint3_;} + /* /// Delaunay points around tank */ + /* const G4ThreeVector& GetDelaunayPoint1() const {return delaunayPoint1_;} */ + /* const G4ThreeVector& GetDelaunayPoint2() const {return delaunayPoint2_;} */ + /* const G4ThreeVector& GetDelaunayPoint3() const {return delaunayPoint3_;} */ /// Tank dimensions in Geant4 units G4double GetTankHeight_G4() {return tankHeight_;} G4double GetTankRadius_G4() {return outerRadius_;} - G4double GetSnowHeight_G4() {return snowHeight_;} + G4double GetFillHeight_G4() {return fillHeight_;} - /// Tank dimensions in IceCube units and reference system - double GetTankHeight_I3(); - double GetTankRadius_I3(); - double GetSnowHeight_I3(); + /* /// Tank dimensions in IceCube units and reference system */ + /* double GetTankHeight_I3(); */ + /* double GetTankRadius_I3(); */ + /* double GetSnowHeight_I3(); */ /// Energy deposit for a given OM, in Geant4 units (from G4TankIceSD) - G4double GetEDep_G4(const OMKey& omKey); + G4double GetEDep_G4(/* const OMKey& omKey */); /// Emission time for a given OM, in Geant4 units (from G4TankIceSD) - G4double GetTime_G4(const OMKey& omKey); + G4double GetTime_G4(/* const OMKey& omKey */); - /// Energy deposit for a given OM, in Geant4 units (from G4TankIceSD) - double GetEDep_I3(const OMKey& omKey); - /// Emission time for a given OM, in Geant4 units (from G4TankIceSD) - double GetTime_I3(const OMKey& omKey); + /* /// Energy deposit for a given OM, in Geant4 units (from G4TankIceSD) */ + /* double GetEDep_I3(const OMKey& omKey); */ + /* /// Emission time for a given OM, in Geant4 units (from G4TankIceSD) */ + /* double GetTime_I3(const OMKey& omKey); */ /// Number of Cherenkovs for a given OM (from G4TankIceSD) - double GetNumCherenkov(const OMKey& omKey); + double GetNumCherenkov(/* const OMKey& omKey */); /// Number of Cherenkovs weighted by emission point (from G4TankIceSD) - double GetNumCherenkovWeight(const OMKey& omKey); + double GetNumCherenkovWeight(/* const OMKey& omKey */); - const TankKey& GetTankKey() const {return tankKey_;} + /* const TankKey& GetTankKey() const {return tankKey_;} */ /// Method to call when constructing detector G4VPhysicalVolume* InstallTank(G4VPhysicalVolume* mother, const G4ThreeVector& origin); @@ -94,27 +80,27 @@ class G4BeamTestTank G4double innerRadius_; G4double outerRadius_; - G4double snowHeight_; - G4double perliteHeight_; + G4double waterHeight_; + G4double airHeight_; G4double glassOuterRadius_; G4double glassThickness_; G4ThreeVector position_; - G4ThreeVector delaunayPoint1_; - G4ThreeVector delaunayPoint2_; - G4ThreeVector delaunayPoint3_; - - std::map relDomPositions_; + // G4ThreeVector delaunayPoint1_; + // G4ThreeVector delaunayPoint2_; + // G4ThreeVector delaunayPoint3_; + // + // std::map relDomPositions_; G4LogicalVolume* tankLog_; G4TankIceSD* iceSD_; - const TankKey& tankKey_; - const I3Geometry& geometry_; + /* const TankKey& tankKey_; */ + /* const I3Geometry& geometry_; */ - SET_LOGGER("G4BeamTestTank"); + /* SET_LOGGER("G4BeamTestTank"); */ }; #endif diff --git a/include/G4BeamTestUserSteppingAction.h b/include/G4BeamTestUserSteppingAction.h index 9807bbf..2d09799 100644 --- a/include/G4BeamTestUserSteppingAction.h +++ b/include/G4BeamTestUserSteppingAction.h @@ -1,19 +1,5 @@ #ifndef G4BEAMTESTUSERSTEPPINGACTION_H_INCLUDED #define G4BEAMTESTUSERSTEPPINGACTION_H_INCLUDED -/** - * Copyright (C) 2011 - * The IceCube collaboration - * ID: $Id$ - * - * @file G4BeamTestUserSteppingAction.h - * @version $Revision$ - * @date $Date$ - * @author Thomas Melzig - * - * $LastChangedBy$ - */ - - #include "G4UserSteppingAction.hh" /** diff --git a/include/G4BeamTestUserTrackingAction.h b/include/G4BeamTestUserTrackingAction.h index bb6d155..9786f52 100644 --- a/include/G4BeamTestUserTrackingAction.h +++ b/include/G4BeamTestUserTrackingAction.h @@ -1,19 +1,5 @@ #ifndef G4BEAMTESTUSERTRACKINGACTION_H_INCLUDED #define G4BEAMTESTUSERTRACKINGACTION_H_INCLUDED -/** - * Copyright (C) 2011 - * The IceCube collaboration - * ID: $Id$ - * - * @file G4BeamTestUserTrackingAction.h - * @version $Revision$ - * @date $Date$ - * @author Thomas Melzig - * - * $LastChangedBy$ - */ - - #include "G4UserTrackingAction.hh" /** diff --git a/include/G4Interface.h b/include/G4Interface.h index c9bec07..4b88f00 100644 --- a/include/G4Interface.h +++ b/include/G4Interface.h @@ -1,19 +1,8 @@ -/** - * Copyright (C) 2009 - * The IceCube collaboration - * ID: $Id: G4Interface.h 149388 2016-08-18 21:50:04Z jgonzalez $ - * - * @file G4Interface.h - * @version $Rev: 149388 $ - * @date $Date: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $ - * @author Tilo Waldenmaier - */ - #ifndef _TOPSIM_G4INTERFACE_H_ #define _TOPSIM_G4INTERFACE_H_ -#include -#include +#include "G4BeamTestRunManager.h" +/* #include */ #ifdef G4VIS_USE class G4VisManager; @@ -44,7 +33,10 @@ class G4Interface /// To be called after simulating each IceTray event. void TerminateEvent(); /// Simulate a single particle (InitializeEvent must be called first) - void InjectParticle(const I3Particle& particle); + void InjectParticle(const std::string& particleName, + const G4ThreeVector& particlePosition, + const G4ThreeVector& particleDirection, + const G4double particleEnergy); private: void Initialize(); @@ -62,7 +54,7 @@ class G4Interface bool eventInitialized_; std::string visMacro_; - SET_LOGGER("G4Interface"); + /* SET_LOGGER("G4Interface"); */ }; #endif diff --git a/include/G4TankIceSD.h b/include/G4TankIceSD.h index 75375c1..25ce7ca 100644 --- a/include/G4TankIceSD.h +++ b/include/G4TankIceSD.h @@ -1,24 +1,12 @@ -/** - * Copyright (C) 2009 - * The IceCube collaboration - * ID: $Id: G4TankIceSD.h 149388 2016-08-18 21:50:04Z jgonzalez $ - * - * @file G4TankIceSD.h - * @version $Rev: 149388 $ - * @date $Date: 2016-08-18 22:50:04 +0100 (Thu, 18 Aug 2016) $ - * @author Tilo Waldenmaier, Thomas Melzig - */ - - #ifndef _G4TANKRESPONSE_G4TankIceSD_H #define _G4TANKRESPONSE_G4TankIceSD_H -#include +/* #include */ #include #include -#include +/* #include */ class G4Step; class G4HCofThisEvent; @@ -26,7 +14,7 @@ class G4TouchableHistory; /** - * An "ice sensitive detector". This sensitive detector is meant to be associated with the ice logical volume in a tank. + * An "ice sensitive detector". This sensitive detector is meant to be associated with the ice logical volume in a tank. TODO(shivesh): make the PMT the SD * * This class keeps track of the energy losses and number Cherenkov photons produced in the ice of each tank. * The Cherenkov photons are counted in two ways. One is a simple count and the other is a weighted count @@ -35,7 +23,7 @@ class G4TouchableHistory; class G4TankIceSD : public G4VSensitiveDetector { public: - G4TankIceSD(G4String name, const std::map& domPositions); + G4TankIceSD(G4String name/* , const std::map& domPositions */); ~G4TankIceSD(); /// Methods called by Geant4 framework @@ -44,26 +32,26 @@ class G4TankIceSD : public G4VSensitiveDetector void EndOfEvent(G4HCofThisEvent *HCE); /// Get total energy deposit for a given OM (same for both OMs in a tank) - G4double GetEDep(const OMKey& omKey) {return sumEdep_[omKey];} + G4double GetEDep(/* const OMKey& omKey */) {return sumEdep_/* [omKey] */;} /// Get average emission time weighted by deposited energy (same for both OMs in a tank) - G4double GetTime(const OMKey& omKey) {return cogTime_[omKey];} + G4double GetTime(/* const OMKey& omKey */) {return cogTime_/* [omKey] */;} /// Get number of Cherenkov photons for a given OM (same for both OMs in a tank) - G4double GetNumCherenkov(const OMKey& omKey) {return cherenkovCounter_[omKey];} + G4double GetNumCherenkov(/* const OMKey& omKey */) {return cherenkovCounter_/* [omKey] */;} /// Get number of Cherenkov photons for a given OM weighted relative to emission point - G4double GetNumCherenkovWeight(const OMKey& omKey) {return cherenkovCounterWeight_[omKey];} + G4double GetNumCherenkovWeight(/* const OMKey& omKey */) {return cherenkovCounterWeight_/* [omKey] */;} private: //ExN04TrackerHitsCollection *trackerCollection; - const std::map domPositions_; + const G4ThreeVector domPositions_; /// Cherenkov production. See technical note G4double GetCerenkovNumber(G4Step* aStep); G4double GetProbability(G4double radius, G4double height); - std::map sumEdep_; - std::map cogTime_; - std::map cherenkovCounter_; - std::map cherenkovCounterWeight_; + G4double sumEdep_; + G4double cogTime_; + G4double cherenkovCounter_; + G4double cherenkovCounterWeight_; }; #endif -- cgit v1.2.3