diff --git a/Inputs/EventGenerator/sofia_238U.reaction b/Inputs/EventGenerator/sofia_238U.reaction
new file mode 100644
index 0000000000000000000000000000000000000000..64f4b000bb0238548425facbe3c602e982f2cbcb
--- /dev/null
+++ b/Inputs/EventGenerator/sofia_238U.reaction
@@ -0,0 +1,36 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Reaction file for 238U transfer reaction %%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad
+Beam
+ Particle= 238U
+ Energy= 135660
+ ExcitationEnergy= 15 MeV
+ SigmaEnergy= 2
+ SigmaX= 6 mm
+ SigmaY= 5 mm
+ SigmaThetaX= 0
+ SigmaPhiY= 0
+ MeanThetaX= 0
+ MeanPhiY= 0.1 deg
+ MeanX= -20.0 mm
+ MeanY= -2.8 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%TwoBodyReaction
+ Beam= 238U
+ Target= 208Pb
+ Light= 208Pb
+ Heavy= 238U
+ ExcitationEnergyLight= 15.0
+ ExcitationEnergyHeavy= 0.0
+ CrossSectionPath= sofia.txt CS
+ ShootLight= 1
+ ShootHeavy= 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+FissionDecay
+ CompoundNucleus= 238U
+ FissionModel= GEF
+ VamosChargeStates= 0
+ Shoot_FF= 1
+ Shoot_neutron= 0
+ Shoot_gamma= 0
diff --git a/NPSimulation/Detectors/Sofia/SofTofW.cc b/NPSimulation/Detectors/Sofia/SofTofW.cc
index 18d1864d971f4eb99069b54aa27865e276a34938..1607053412bb490641d777de314ded4b6344ae71 100644
--- a/NPSimulation/Detectors/Sofia/SofTofW.cc
+++ b/NPSimulation/Detectors/Sofia/SofTofW.cc
@@ -199,7 +199,7 @@ G4LogicalVolume* SofTofW::BuildGLADFromSTL()
auto mesh = CADMesh::TessellatedMesh::FromSTL((char*) path.c_str());
mesh->SetScale(mm);
- G4Material* GLAD_Material = MaterialManager::getInstance()->GetMaterialFromLibrary("Al");
+ G4Material* GLAD_Material = MaterialManager::getInstance()->GetMaterialFromLibrary("Inox");
auto cad_solid = mesh->GetSolid();
m_GLAD_STL = new G4LogicalVolume(cad_solid,GLAD_Material,"GLAD_Magnet",0,0,0);
@@ -318,7 +318,8 @@ void SofTofW::ConstructDetector(G4LogicalVolume* world){
u = u.unit();
G4RotationMatrix* Rot = new G4RotationMatrix(u,v,w);
- G4ThreeVector Z_translation = G4ThreeVector(0,0,4*m);
+ //G4ThreeVector Z_translation = G4ThreeVector(0,0,4*m);
+ G4ThreeVector Z_translation = G4ThreeVector(0,0,m_GLAD_DistanceFromTarget);
Det_pos += Z_translation;
BuildTOFDetector()->MakeImprint(world,Det_pos,Rot);
}
diff --git a/Projects/Sofia/macro/ShowResultSimu.C b/Projects/Sofia/macro/ShowResultSimu.C
index 95693d6168261318ff373381b8dbba02bbb858f6..320e26a79ba59ed5610baa458a64684344045385 100644
--- a/Projects/Sofia/macro/ShowResultSimu.C
+++ b/Projects/Sofia/macro/ShowResultSimu.C
@@ -4,18 +4,26 @@ TChain* chain=NULL;
void LoadRootFile(){
chain = new TChain("SimulatedTree");
- chain->Add("../../../Outputs/Simulation/sofia_simu.root");
-
- //chain->Add("../../../Outputs/Simulation/sofia_simu_1.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_2.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_3.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_4.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_5.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_6.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_7.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_8.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_9.root");
- //chain->Add("../../../Outputs/Simulation/sofia_simu_10.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_1.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_2.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_3.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_4.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_5.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_6.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_7.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_8.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_9.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_10.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_11.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_12.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_13.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_14.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_15.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_16.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_17.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_18.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_19.root");
+ chain->Add("../../../Outputs/Simulation/sofia_simu_glad_20.root");
}
//////////////////////////////////////////////////////////////////
@@ -23,7 +31,7 @@ void ShowResultSimu()
{
LoadRootFile();
- chain->Draw("fDetected_Position_Y:fDetected_Position_X>>hpos(500,-1900,-900,500,-350,350)","fTOF_Energy@.size()==2","colz");
+ chain->Draw("fDetected_Position_Y:fDetected_Position_X>>hpos(200,-2100,-1100,200,-350,350)","fTOF_Energy@.size()==2","colz");
TH2F* hpos = (TH2F*)gDirectory->FindObjectAny("hpos");
chain->Draw("fFC_Fragment_Z>>h1(35,30,65)");
diff --git a/Projects/Sofia/sofia.detector b/Projects/Sofia/sofia.detector
index cc0c943b9562f50c7609a1c9ff70ebf545837ad6..7cc1d3e5d5692e869e575bb6ca3fbf0ff97cf7e0 100644
--- a/Projects/Sofia/sofia.detector
+++ b/Projects/Sofia/sofia.detector
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Target
THICKNESS= 2 mm
- RADIUS= 50 mm
+ RADIUS= 100 mm
MATERIAL= Pb
ANGLE= 0 deg
X= 0 mm
@@ -9,21 +9,21 @@ Target
Z= 0 m
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
SofTofW
- R= 4 m
- THETA= -20 deg
+ R= 5 m
+ THETA= -18 deg
PHI= 0 deg
Build_GLAD= 1
GLAD_TiltAngle= 14 deg
- GLAD_DistanceFromTarget= 3.0 m
- Build_MagneticField= 0
- GLAD_MagField= 1.70 T
- Build_VacuumPipe= 0
+ GLAD_DistanceFromTarget= 3.3 m
+ Build_MagneticField= 1
+ GLAD_MagField= 1.80 T
+ Build_VacuumPipe= 1
VacuumPipeX= 0 cm
VacuumPipeY= 0 cm
VacuumPipeZ= 0.9 m
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%SofTwim
- R= 1.85 m
+SofTwim
+ R= 2.00 m
THETA= 0
PHI= 0
TwimGas= MixTwinMusic