diff --git a/NPSimulation/Detectors/Nebula/Nebula.cc b/NPSimulation/Detectors/Nebula/Nebula.cc index 98648115abb66c4a727571d4b2d433256dd550b0..ebb727cbd2d3dfe78011c2f1f16ffbf27626009b 100644 --- a/NPSimulation/Detectors/Nebula/Nebula.cc +++ b/NPSimulation/Detectors/Nebula/Nebula.cc @@ -40,7 +40,7 @@ // NPTool header #include "Nebula.hh" -#include "CalorimeterScorers.hh" +#include "PlasticBar.hh" #include "InteractionScorers.hh" #include "RootOutput.h" #include "MaterialManager.hh" @@ -216,7 +216,7 @@ void Nebula::ReadSensitive(const G4Event* ){ /////////// // Module scorer - CalorimeterScorers::PS_Calorimeter* Scorer= (CalorimeterScorers::PS_Calorimeter*) m_ModuleScorer->GetPrimitive(0); + PlasticBar::PS_PlasticBar* Scorer= (PlasticBar::PS_PlasticBar*) m_ModuleScorer->GetPrimitive(0); unsigned int size = Scorer->GetMult(); for(unsigned int i = 0 ; i < size ; i++){ @@ -245,18 +245,18 @@ void Nebula::InitializeScorers() { // Otherwise the scorer is initialise // Module vector<int> level; level.push_back(0); - G4VPrimitiveScorer* ModuleCalorimeter= new CalorimeterScorers::PS_Calorimeter("ModuleCalorimeter",level, 0) ; + G4VPrimitiveScorer* ModulePlasticBar= new PlasticBar::PS_PlasticBar("ModulePlasticBar",level, 0) ; G4VPrimitiveScorer* ModuleInteraction= new InteractionScorers::PS_Interactions("ModuleInteraction",ms_InterCoord, 0) ; //and register it to the multifunctionnal detector - m_ModuleScorer->RegisterPrimitive(ModuleCalorimeter); + m_ModuleScorer->RegisterPrimitive(ModulePlasticBar); m_ModuleScorer->RegisterPrimitive(ModuleInteraction); G4SDManager::GetSDMpointer()->AddNewDetector(m_ModuleScorer) ; // Veto - G4VPrimitiveScorer* VetoCalorimeter= new CalorimeterScorers::PS_Calorimeter("VetoCalorimeter",level, 0) ; + G4VPrimitiveScorer* VetoPlasticBar= new PlasticBar::PS_PlasticBar("VetoPlasticBar",level, 0) ; G4VPrimitiveScorer* VetoInteraction= new InteractionScorers::PS_Interactions("VetoInteraction",ms_InterCoord, 0) ; //and register it to the multifunctionnal detector - m_VetoScorer->RegisterPrimitive(VetoCalorimeter); + m_VetoScorer->RegisterPrimitive(VetoPlasticBar); m_VetoScorer->RegisterPrimitive(VetoInteraction); G4SDManager::GetSDMpointer()->AddNewDetector(m_VetoScorer) ; diff --git a/Projects/Nebula/8Hp2p.reaction b/Projects/Nebula/8Hp2p.reaction deleted file mode 100755 index c90a099b52e7923d715e00ef8dcad3fd00d3a5b8..0000000000000000000000000000000000000000 --- a/Projects/Nebula/8Hp2p.reaction +++ /dev/null @@ -1,28 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Beam - Particle= 8He - Energy= 2000 MeV - SigmaEnergy= 100 MeV - SigmaThetaX= 1 deg - SigmaPhiY= 1 deg - SigmaX= 5 mm - SigmaY= 5 mm - MeanThetaX= 0 deg - MeanPhiY= 0 deg - MeanX= 0 mm - MeanY= 0 mm - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -QFSReaction - Beam= 8He - Target= 1H - Scattered= 1H - KnockedOut= 1H - Heavy= 7H - ExcitationEnergyBeam= 0.0 MeV - ExcitationEnergyHeavy= 3.6800 MeV - MomentumSigma= 50.0 - ShootHeavy= 1 - ShootLight= 1 - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Projects/Nebula/Nebula.detector b/Projects/Nebula/Nebula.detector index bac1199e6a78636a5aacab60a7e097aa72842d1f..bed889732401a0802694eeb598743fa6b3ebca77 100644 --- a/Projects/Nebula/Nebula.detector +++ b/Projects/Nebula/Nebula.detector @@ -1,53 +1,53 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Target - THICKNESS= 10 micrometer - RADIUS= 20 mm - MATERIAL= CD2 + THICKNESS= 0.49 cm + RADIUS= 28 mm + MATERIAL= Vacuum ANGLE= 0 deg - X= 0 mm + X= 3.5 cm Y= 0 mm - Z= -4000 mm + Z= 0 mm +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% NEBULA - POS= 0 0 5 m - NumberOfModule= 30 + POS= 0 0 12 m + NumberOfModule= 15 Veto= 1 Frame= 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% NEBULA - POS= 0 0 5.15 m - NumberOfModule= 30 + POS= 0 0 12.15 m + NumberOfModule= 15 Veto= 0 Frame= 0 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% NEBULA - POS= 0 0 10 m + POS= 0 0 16 m NumberOfModule= 30 Veto= 1 Frame= 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% NEBULA - POS= 0 0 10.15 m + POS= 0 0 16.15 m NumberOfModule= 30 Veto= 0 Frame= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% NEBULA - POS= 0 0 3 m - NumberOfModule= 15 + POS= 0 0 18 m + NumberOfModule= 30 Veto= 1 Frame= 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% NEBULA - POS= 0 0 3.15 m - NumberOfModule= 15 + POS= 0 0 18.15 m + NumberOfModule= 30 Veto= 0 Frame= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %Samurai % POS= 0 0 0 mm @@ -78,4 +78,4 @@ NEBULA % %InvertY= 1 % %InvertD= 1 -% + diff --git a/Projects/Nebula/PhysicsListOption.txt b/Projects/Nebula/PhysicsListOption.txt new file mode 100644 index 0000000000000000000000000000000000000000..2a32a3b1722a1ec55d040d6e46faf8b513c453a0 --- /dev/null +++ b/Projects/Nebula/PhysicsListOption.txt @@ -0,0 +1,11 @@ +EmPhysicsList Option4 +DefaultCutOff 1 +IonBinaryCascadePhysics 0 +NPIonInelasticPhysics 0 +EmExtraPhysics 0 +HadronElasticPhysics 0 +StoppingPhysics 0 +OpticalPhysics 0 +HadronPhysicsINCLXX 0 +HadronPhysicsQGSP_BIC_HP 1 +Decay 0 diff --git a/Projects/Nebula/SimpleNeutrons.reaction b/Projects/Nebula/SimpleNeutrons.reaction new file mode 100755 index 0000000000000000000000000000000000000000..6f5aea35fb4485aedc285ab8ba581ecc955b4c9a --- /dev/null +++ b/Projects/Nebula/SimpleNeutrons.reaction @@ -0,0 +1,14 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +Beam + Particle= n + Energy= 196 MeV + SigmaEnergy= 0.5 MeV + SigmaThetaX= 0.01 deg + SigmaPhiY= 0.01 deg + SigmaX= 0.5 mm + SigmaY= 0.5 mm + MeanThetaX= 0 deg + MeanPhiY= 0 deg + MeanX= 3.5 cm + MeanY= 0 mm + ZEmission= -1000 mm diff --git a/Projects/Nebula/flat.txt b/Projects/Nebula/flat.txt new file mode 100644 index 0000000000000000000000000000000000000000..09b15128730aecce2f1126bf7937af827eba3712 --- /dev/null +++ b/Projects/Nebula/flat.txt @@ -0,0 +1,3 @@ +0 1 +90 1 +180 1