diff --git a/NPLib/Physics/GEF.cxx b/NPLib/Physics/GEF.cxx index e4b4ec5ca2b2c1fa40692fbd542159d6e004330b..91fe62db97e6fc50f6da7d2fb091cc5eaa605099 100644 --- a/NPLib/Physics/GEF.cxx +++ b/NPLib/Physics/GEF.cxx @@ -553,9 +553,10 @@ void GEF::FissionGENERAL() { float ZsqrA_fis; - //ZsqrA_fis = Csng(I_Z_CN^2) / Csng(I_A_CN); - ZsqrA_fis = pow(I_Z_CN,2)/I_A_CN; - Escission_lim = 0;//900.0 * exp(-ZsqrA_fis/13.0); // from PRC 86 (2012) 034605 + ZsqrA_fis = Csng(I_Z_CN^2) / Csng(I_A_CN); + //ZsqrA_fis = pow(I_Z_CN,2)/I_A_CN; + //Escission_lim = 0;//900.0 * exp(-ZsqrA_fis/13.0); // from PRC 86 (2012) 034605 + Escission_lim = 900.0 * exp(-ZsqrA_fis/13.0); // from PRC 86 (2012) 034605 CentralZ_FM(); I_N_CN = I_A_CN - I_Z_CN; MeanDefScission(); diff --git a/NPSimulation/Detectors/Sofia/Sofia.cc b/NPSimulation/Detectors/Sofia/Sofia.cc index d727204f7f77ba0b7e376fb7de497adf8274e896..437b3b60797ccae004eb6a08f19c37264b320ddb 100644 --- a/NPSimulation/Detectors/Sofia/Sofia.cc +++ b/NPSimulation/Detectors/Sofia/Sofia.cc @@ -272,7 +272,7 @@ void Sofia::ReadSensitive(const G4Event* ){ if(Energy>Sofia_NS::EnergyThreshold){ double Time = RandGauss::shoot(Scorer->GetTime(i),Sofia_NS::ResoTime); int DetectorNbr = level[0]; - int PlasticNbr = level[1]; + int PlasticNbr = level[1]-1; m_Event->SetDetectorNbr(DetectorNbr); m_Event->SetPlasticNbr(PlasticNbr); m_Event->SetEnergy(Energy); diff --git a/Projects/Sofia/.gitignore b/Projects/Sofia/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..3ed1a0bc5543756a8eec83cda3a6483250aa8556 --- /dev/null +++ b/Projects/Sofia/.gitignore @@ -0,0 +1 @@ +*.detector diff --git a/Projects/Sofia/sofia.detector b/Projects/Sofia/sofia.detector index 269ef8b5bc52492b68e2f50cf409eaf1dd3d01d2..2169ee897754ad40039862d6a07d1404ee009b4a 100644 --- a/Projects/Sofia/sofia.detector +++ b/Projects/Sofia/sofia.detector @@ -14,6 +14,6 @@ Sofia PHI= 0 deg Build_GLAD= 1 GLAD_DistanceFromTarget= 3.5 m - GLAD_MagField= 1.4 T + GLAD_MagField= 1.8 T %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%