diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector index f186361faa5e942ed5d8ac8ab90550c468d21056..eb0d0456e9db69bcc2f21e1d8c2fc78f82962e35 100644 --- a/Inputs/DetectorConfiguration/Riken_65mm.detector +++ b/Inputs/DetectorConfiguration/Riken_65mm.detector @@ -75,10 +75,10 @@ VIS= all %%%%%%% Telescope 5 %%%%%%% M2Telescope -X1_Y1= -50.23 -50.23 350 -X1_Y128= 50.23 -50.23 350 -X128_Y1= -50.23 50.23 350 -X128_Y128= 50.23 50.23 350 +X1_Y1= -50.23 -50.23 365 +X1_Y128= 50.23 -50.23 365 +X128_Y1= -50.23 50.23 365 +X128_Y128= 50.23 50.23 365 SI= 1 SILI= 0 CSI= 1 @@ -150,7 +150,7 @@ ScintillatorPlastic Plastic THETA= 0 PHI= 0 - R= 303 + R= 318 Thickness= 20 Radius= 20 Scintillator= BC452_10 @@ -159,7 +159,7 @@ Plastic Plastic THETA= 0 PHI= 0 - R= 328 + R= 343 Thickness= 30 Radius= 20 Scintillator= BC452_10 diff --git a/Inputs/EventGenerator/10He.reaction b/Inputs/EventGenerator/10He.reaction index 2c1407b0f4d2339fef7a3ead00cc6e449d203b9a..18dd9fe54efe5206f74414810dbe5d8c3fceda18 100644 --- a/Inputs/EventGenerator/10He.reaction +++ b/Inputs/EventGenerator/10He.reaction @@ -7,7 +7,7 @@ TransfertToResonance Target= 2H Light= 3He Heavy= 10He - ExcitationEnergy= 2.0 + ExcitationEnergy= 4.0 BeamEnergy= 550 BeamEnergySpread= 0 SigmaThetaX= 0.6921330164 @@ -16,7 +16,7 @@ TransfertToResonance SigmaY= 9.069 ResonanceWidth= 0 ResonanceDecayZ= 2 - ResonanceDecayA= 8 + ResonanceDecayA= 6 CrossSectionPath= 11Li(d,3He)10He.txt ShootLight= 1 ShootHeavy= 1 diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis index a7758f9345dae696017a6685d5000816532e2bca..d08fc4a3faa68c344ba4f73a4ab0b1cde81d242c 100755 Binary files a/NPAnalysis/10He_Riken/Analysis and b/NPAnalysis/10He_Riken/Analysis differ diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc index 8846b467520557c55fec35a1cf44637acc0544a1..ca47ae0997ea8a394215e43e50beec12a41c549a 100644 --- a/NPAnalysis/10He_Riken/src/Analysis.cc +++ b/NPAnalysis/10He_Riken/src/Analysis.cc @@ -95,7 +95,7 @@ int main(int argc,char** argv) // Minimum code if( i%10000 == 0 && i!=0) { - cout.precision(3); + cout.precision(5); end=clock(); double TimeElapsed = (end-begin)/CLOCKS_PER_SEC; double percent = (double)i/N ; diff --git a/NPSimulation/include/MUST2Array.hh b/NPSimulation/include/MUST2Array.hh index fd84ddb54c4668db1e9211d40c7df9c3aaafa047..71196c2f5cb5c84244ea51df37bf401b7d8fe128 100644 --- a/NPSimulation/include/MUST2Array.hh +++ b/NPSimulation/include/MUST2Array.hh @@ -55,8 +55,9 @@ namespace MUST2 const G4double MylarCsIThickness = 3*micrometer ; const G4double CsIThickness = 4.*cm + 2*MylarCsIThickness ; const G4double CsIFaceFront = 12.2*cm ; - const G4double CsIFaceBack = 16*cm ; - + const G4double CsIFaceBack = 16*cm ; + const G4double DistInterCsI = 0.2 * mm; + // Starting at the front and going to CsI const G4double AluStripFront_PosZ = Length* -0.5 + 0.5*AluStripThickness ; const G4double Silicon_PosZ = AluStripFront_PosZ + 0.5*AluStripThickness + 0.5*SiliconThickness ; diff --git a/NPSimulation/src/MUST2Array.cc b/NPSimulation/src/MUST2Array.cc index 5b854ff9077c388db806141054977407fa464c96..846505d6404ba10515d16d3069d5e652940b9400 100644 --- a/NPSimulation/src/MUST2Array.cc +++ b/NPSimulation/src/MUST2Array.cc @@ -382,9 +382,7 @@ void MUST2Array::VolumeMaker(G4int TelescopeNumber , //////////////////////////////////////////////////////////////// if (wCsI) { - //G4double DistInterCsI= 1.*mm;//<-Set the distance between CsI cristal. Exact value yet unknown - G4double DistInterCsI = 0.2 * mm; - + G4ThreeVector positionCsI = G4ThreeVector(0, 0, CsI_PosZ); G4Trd* solidCsI = new G4Trd("csI", 0.5*CsIFaceFront, 0.5*CsIFaceBack, 0.5*CsIFaceFront, 0.5*CsIFaceBack, 0.5*CsIThickness);