diff -uNr v01-10.ORIG/Mokka/mokka-07-06/source/Kernel/src/PhysicsListFactory.cc v01-10/Mokka/mokka-07-06/source/Kernel/src/PhysicsListFactory.cc --- v01-10.ORIG/Mokka/mokka-07-06/source/Kernel/src/PhysicsListFactory.cc 2011-01-27 05:04:11.000000000 +0900 +++ v01-10/Mokka/mokka-07-06/source/Kernel/src/PhysicsListFactory.cc 2011-01-27 05:00:56.000000000 +0900 @@ -15,55 +15,76 @@ //#include "PhysicsListNeutrons.hh" #include "LCPhysicsList.hh" +#if 0 #include "FTFC.hh" #include "FTFP.hh" +#else +#include "G4HadronCaptureProcess.hh" +#include "G4HadronQElasticPhysics.hh" +#endif #include "LBE.hh" #include "LHEP.hh" //#include "LHEP_LEAD.hh" //#include "LHEP_LEAD_HP.hh" +#if 0 #include "LHEP_BERT.hh" +#endif //#include "LHEP_PRECO.hh" +#if 0 #include "LHEP_PRECO_HP.hh" +#endif #include "QGSP.hh" //#include "QGSP_HP.hh" #include "QGSP_BIC.hh" #include "QGSP_BERT.hh" +#if 0 #include "QGSC.hh" +#endif //#include "QGSC_LEAD.hh" //#include "QGSC_LEAD_HP.hh" // New Physics lists with Geant4 8.0 +#if 0 #include "LHEP_BERT_HP.hh" //#include "LHEP_BIC.hh" +#endif //#include "LHEP_BIC_HP.hh" #include "LHEP_EMV.hh" #include "QGSP_BERT_HP.hh" +#if 0 #include "QGSP_EMV.hh" #include "QGSC_EMV.hh" #include "QGSC_EFLOW.hh" +#endif #include "QGSP_BIC_HP.hh" #include "QGSP_QEL.hh" #include "QGSP_BERT_TRV.hh" +#if 0 #include "FTFP_EMV.hh" +#endif #include "QBBC.hh" #include "QGSP_BERT_EMV.hh" +#if 0 #include "QGSP_BERT_NQE.hh" #include "QGSP_EMV_NQE.hh" #include "QGSP_EMX.hh" #include "QGSP_NQE.hh" +#endif #if G4_VERSION_GE( 910 ) #include "FTFP_BERT.hh" #include "QGSC_BERT.hh" +#if 0 #include "QGSP_DIF.hh" #include "QGSP_BERT_DIF.hh" +#endif #include "QGS_BIC.hh" #include "FTF_BIC.hh" #endif @@ -88,47 +109,67 @@ { if (name == "LCPhys") return new LCPhysicsList; +#if 0 else if (name == "FTFC") return new FTFC; else if (name == "FTFP") return new FTFP; +#endif else if (name == "LBE") return new LBE; else if (name == "LHEP") return new LHEP; // else if (name == "LHEP_LEAD") return new LHEP_LEAD; // else if (name == "LHEP_LEAD_HP") return new LHEP_LEAD_HP; +#if 0 else if (name == "LHEP_BERT") return new LHEP_BERT; +#endif // else if (name == "LHEP_PRECO") return new LHEP_PRECO; +#if 0 else if (name == "LHEP_PRECO_HP") return new LHEP_PRECO_HP; +#endif else if (name == "QGSP") return new QGSP; // else if (name == "QGSP_HP") return new QGSP_HP; else if (name == "QGSP_BIC") return new QGSP_BIC; else if (name == "QGSP_BERT") return new QGSP_BERT; +#if 0 else if (name == "QGSC") return new QGSC; +#endif // else if (name == "QGSC_LEAD") return new QGSC_LEAD; // else if (name == "QGSC_LEAD_HP") return new QGSC_LEAD_HP; // New Physics lists with Geant4 8.0 +#if 0 else if (name == "LHEP_BERT_HP") return new LHEP_BERT_HP; +#endif // else if (name == "LHEP_BIC") return new LHEP_BIC; // else if (name == "LHEP_BIC_HP") return new LHEP_BIC_HP; +#if 0 else if (name == "LHEP_EMV") return new LHEP_EMV; +#endif else if (name == "QGSP_BERT_HP") return new QGSP_BERT_HP; +#if 0 else if (name == "QGSP_EMV") return new QGSP_EMV; else if (name == "QGSC_EMV") return new QGSC_EMV; else if (name == "QGSC_EFLOW") return new QGSC_EFLOW; +#endif else if (name == "QGSP_BIC_HP") return new QGSP_BIC_HP; else if (name == "QGSP_QEL") return new QGSP_QEL; else if (name == "QGSP_BERT_TRV") return new QGSP_BERT_TRV; +#if 0 else if (name == "FTFP_EMV") return new FTFP_EMV; +#endif else if (name == "QBBC") return new QBBC; else if (name == "QGSP_BERT_EMV") return new QGSP_BERT_EMV; +#if 0 else if (name == "QGSP_BERT_NQE") return new QGSP_BERT_NQE; else if (name == "QGSP_EMV_NQE") return new QGSP_EMV_NQE; else if (name == "QGSP_EMX") return new QGSP_EMX; else if (name == "QGSP_NQE") return new QGSP_NQE; +#endif #if G4_VERSION_GE( 910 ) else if (name == "FTFP_BERT") return new FTFP_BERT; else if (name == "QGSC_BERT") return new QGSC_BERT; +#if 0 else if (name == "QGSP_DIF") return new QGSP_DIF; else if (name == "QGSP_BERT_DIF") return new QGSP_BERT_DIF; +#endif else if (name == "QGS_BIC") return new QGS_BIC; else if (name == "FTF_BIC") return new FTF_BIC; #endif diff -uNr v01-10.ORIG/Mokka/mokka-07-06/source/LCPhys/src/LCHadronPhysics.cc v01-10/Mokka/mokka-07-06/source/LCPhys/src/LCHadronPhysics.cc --- v01-10.ORIG/Mokka/mokka-07-06/source/LCPhys/src/LCHadronPhysics.cc 2011-01-27 05:07:32.000000000 +0900 +++ v01-10/Mokka/mokka-07-06/source/LCPhys/src/LCHadronPhysics.cc 2011-01-27 05:00:56.000000000 +0900 @@ -16,7 +16,13 @@ // processes #include "G4ParticleTable.hh" #include "G4ProcessManager.hh" +#if 0 #include "G4MultipleScattering.hh" +#else +#include "G4eMultipleScattering.hh" +#include "G4hMultipleScattering.hh" +#include "G4MuMultipleScattering.hh" +#endif #include "G4hIonisation.hh" #include "G4HadronElasticProcess.hh" #include "G4PionPlusInelasticProcess.hh" @@ -184,7 +190,11 @@ pManager = G4PionPlus::PionPlus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -213,7 +223,11 @@ pManager = G4PionMinus::PionMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -245,7 +259,11 @@ pManager = G4KaonPlus::KaonPlus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -266,7 +284,11 @@ pManager = G4KaonMinus::KaonMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -325,7 +347,11 @@ pManager = G4Proton::Proton()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -355,7 +381,11 @@ pManager = G4AntiProton::AntiProton()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -493,7 +523,11 @@ pManager = G4SigmaMinus::SigmaMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -519,7 +553,11 @@ pManager = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -545,7 +583,11 @@ pManager = G4SigmaPlus::SigmaPlus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -570,7 +612,11 @@ pManager = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -596,7 +642,11 @@ pManager = G4XiMinus::XiMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -621,7 +671,11 @@ pManager = G4AntiXiMinus::AntiXiMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -686,7 +740,11 @@ pManager = G4OmegaMinus::OmegaMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -710,7 +768,11 @@ pManager = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic diff -uNr v01-10.ORIG/Mokka/mokka-07-06/source/LCPhys/src/LCIonPhysics.cc v01-10/Mokka/mokka-07-06/source/LCPhys/src/LCIonPhysics.cc --- v01-10.ORIG/Mokka/mokka-07-06/source/LCPhys/src/LCIonPhysics.cc 2011-01-27 05:06:56.000000000 +0900 +++ v01-10/Mokka/mokka-07-06/source/LCPhys/src/LCIonPhysics.cc 2011-01-27 05:00:56.000000000 +0900 @@ -15,7 +15,13 @@ #include "G4IonConstructor.hh" // processes +#if 0 #include "G4MultipleScattering.hh" +#else +#include "G4eMultipleScattering.hh" +#include "G4hMultipleScattering.hh" +#include "G4MuMultipleScattering.hh" +#endif #include "G4hIonisation.hh" #include "G4ionIonisation.hh" #include "G4HadronElasticProcess.hh" @@ -67,7 +73,11 @@ pManager = G4Deuteron::Deuteron()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -88,7 +98,11 @@ pManager = G4Triton::Triton()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // hadron elastic @@ -109,7 +123,11 @@ pManager = G4He3::He3()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4ionIonisation(), -1, 2, 2); // hadron elastic @@ -126,7 +144,11 @@ pManager = G4Alpha::Alpha()->GetProcessManager(); // EM processes +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4ionIonisation(), -1, 2, 2); // hadron elastic @@ -147,7 +169,11 @@ pManager = G4GenericIon::GenericIon()->GetProcessManager(); // Only EM processes for generic ion +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4hMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4ionIonisation(), -1, 2, 2); } diff -uNr v01-10.ORIG/Mokka/mokka-07-06/source/LCPhys/src/LCLeptonPhysics.cc v01-10/Mokka/mokka-07-06/source/LCPhys/src/LCLeptonPhysics.cc --- v01-10.ORIG/Mokka/mokka-07-06/source/LCPhys/src/LCLeptonPhysics.cc 2011-01-27 00:37:24.000000000 +0900 +++ v01-10/Mokka/mokka-07-06/source/LCPhys/src/LCLeptonPhysics.cc 2011-01-27 05:01:26.000000000 +0900 @@ -14,7 +14,13 @@ #include "G4ProcessManager.hh" // processes +#if 0 #include "G4MultipleScattering.hh" +#else +#include "G4eMultipleScattering.hh" +#include "G4hMultipleScattering.hh" +#include "G4MuMultipleScattering.hh" +#endif #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" #include "G4eplusAnnihilation.hh" @@ -83,7 +89,11 @@ // Electron physics pManager = G4Electron::Electron()->GetProcessManager(); +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4eMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4eIonisation(), -1, 2, 2); pManager->AddProcess(new G4eBremsstrahlung(), -1,-1, 3); @@ -96,7 +106,11 @@ // Positron physics pManager = G4Positron::Positron()->GetProcessManager(); +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4eMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4eIonisation(), -1, 2, 2); pManager->AddProcess(new G4eBremsstrahlung(), -1,-1, 3); pManager->AddProcess(new G4eplusAnnihilation(), 0,-1, 4); @@ -109,7 +123,11 @@ // Muon- pManager = G4MuonMinus::MuonMinus()->GetProcessManager(); +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4MuMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4MuIonisation(), -1, 2, 2); pManager->AddProcess(new G4MuBremsstrahlung(), -1,-1, 3); pManager->AddProcess(new G4MuPairProduction(), -1,-1, 4); @@ -117,7 +135,11 @@ // Muon+ pManager = G4MuonPlus::MuonPlus()->GetProcessManager(); +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4MuMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4MuIonisation(), -1, 2, 2); pManager->AddProcess(new G4MuBremsstrahlung(), -1,-1, 3); pManager->AddProcess(new G4MuPairProduction(), -1,-1, 4); @@ -125,13 +147,21 @@ // Tau- pManager = G4TauMinus::TauMinus()->GetProcessManager(); +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4MuMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); // Tau+ pManager = G4TauPlus::TauPlus()->GetProcessManager(); +#if 0 pManager->AddProcess(new G4MultipleScattering(), -1, 1, 1); +#else + pManager->AddProcess(new G4MuMultipleScattering(), -1, 1, 1); +#endif pManager->AddProcess(new G4hIonisation(), -1, 2, 2); }