diff --git a/Inputs/EventGenerator/3He.source b/Inputs/EventGenerator/3He.source
index 744bfb7ca322df2fce1c38886fa6bef29aff5d90..8fa0b8698412b53f993a685d44e12862aabcb8ff 100644
--- a/Inputs/EventGenerator/3He.source
+++ b/Inputs/EventGenerator/3He.source
@@ -5,9 +5,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Isotropic
EnergyLow= 0
- EnergyHigh= 300
+ EnergyHigh= 21.6
HalfOpenAngleMin= 0
- HalfOpenAngleMax= 180
+ HalfOpenAngleMax= 90
x0= 0
y0= 0
z0= 0
diff --git a/Inputs/EventGenerator/alpha.source b/Inputs/EventGenerator/alpha.source
index 17aa3c77eb3bcab6df72835193c70dcc7b6dbcac..fd5f19e5259addc2b6bbccaeb2e2bcb97b08b3e1 100644
--- a/Inputs/EventGenerator/alpha.source
+++ b/Inputs/EventGenerator/alpha.source
@@ -5,9 +5,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Isotropic
EnergyLow= 0
- EnergyHigh= 300
- HalfOpenAngleMin= 90
- HalfOpenAngleMax= 180
+ EnergyHigh= 21.6
+ HalfOpenAngleMin= 0
+ HalfOpenAngleMax= 90
x0= 0
y0= 0
z0= 0
diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis
index e0e3b14b288fb653c9e27f5969bf5190118bab1c..e45aba2337d941b4290b9fffcde8bb1d1a00e1f0 100755
Binary files a/NPAnalysis/10He_Riken/Analysis and b/NPAnalysis/10He_Riken/Analysis differ
diff --git a/NPDocumentation/NPTool_UserGuide.tex b/NPDocumentation/NPTool_UserGuide.tex
index a05c2f239abea348a0e7766d31ff8089903541ac..5de778589ad18ba5aaceed155d4044b2a7486748 100755
--- a/NPDocumentation/NPTool_UserGuide.tex
+++ b/NPDocumentation/NPTool_UserGuide.tex
@@ -198,12 +198,12 @@ The two last methods are followed by a "{}" wich mean you are free to implemente
////////////////////////////////////////////
//// Search for a Wonderful Detector //////
////////////////////////////////////////////
- else if (LineBuffer.compare(0, 15, "wonderfulArray") == 0 && cwonderful == false) {
- cwonderful = true ;
+ else if (LineBuffer.compare(0, 15, "WonderfulArray") == 0 && cWonderful == false) {
+ cWonderful = true ;
G4cout << "//////// wonderful ARRAY ////////" << G4endl << G4endl;
// Instantiate the new array as a VDetector Object
- VDetector* myDetector = new wonderfulDetector();
+ VDetector* myDetector = new WonderfulDetector();
// Read Position of detector
ConfigFile.close();
@@ -252,7 +252,7 @@ The two last methods are followed by a "{}" wich mean you are free to implemente
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter[NPAnalysis]{NPAnalysis}
-
+\chapter[NPLib]{NPLib}
\end{document}
diff --git a/NPSimulation/include/ThinSi.hh b/NPSimulation/include/ThinSi.hh
index bc6269abacf0f251bfa2ff6e3306387d4b597d8a..a1fc1e8c5d696751a8bbb04857333dfc20874cb1 100644
--- a/NPSimulation/include/ThinSi.hh
+++ b/NPSimulation/include/ThinSi.hh
@@ -42,7 +42,7 @@ namespace THINSI
{
// Energy and time Resolution
const G4double ResoTime = 0 ;
- const G4double ResoEnergy = 0.064 ;// = 100keV of Resolution // Unit is MeV/2.35
+ const G4double ResoEnergy = 0.064 ;// = 150keV of Resolution // Unit is MeV/2.35
// Geometry
const G4double DetectorSize = 68*mm ;
diff --git a/NPSimulation/src/EventGeneratorTransfertToResonance.cc b/NPSimulation/src/EventGeneratorTransfertToResonance.cc
index c199ed8fe2f1f0d97a0445f0ff8a7a28b15cbb0b..e1229e51fa4cab33b29da769b4b6f00a3bd82724 100644
--- a/NPSimulation/src/EventGeneratorTransfertToResonance.cc
+++ b/NPSimulation/src/EventGeneratorTransfertToResonance.cc
@@ -403,10 +403,10 @@ void EventGeneratorTransfertToResonance::GenerateEvent(G4Event* anEvent , G4Part
else if( m_Target !=0)
CalculateBeamInteraction( 0, m_SigmaX, 0, m_SigmaThetaX,
- 0, m_SigmaY, 0, m_SigmaPhiY,
- m_Target,
- InterCoord, Beam_thetaX, Beam_phiY,
- Beam_theta, Beam_phi);
+ 0, m_SigmaY, 0, m_SigmaPhiY,
+ m_Target,
+ InterCoord, Beam_thetaX, Beam_phiY,
+ Beam_theta, Beam_phi);
else
InterCoord = G4ThreeVector(0,0,0);
diff --git a/NPSimulation/src/Must2Scorers.cc b/NPSimulation/src/Must2Scorers.cc
index 2925a403861a218802b25b3b55fd54d3bfc1681b..ea0c60b30498b34ae1588fa2788af9bdc76ab46a 100644
--- a/NPSimulation/src/Must2Scorers.cc
+++ b/NPSimulation/src/Must2Scorers.cc
@@ -54,7 +54,7 @@ PSStripNumberX::~PSStripNumberX()
G4bool PSStripNumberX::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
- int DetNbr = GENERALSCORERS::PickUpDetectorNumber(aStep, "Must2Telescope");
+ int DetNbr = GENERALSCORERS::PickUpDetectorNumber(aStep, "MUST2Telescope");
G4ThreeVector POS = aStep->GetPreStepPoint()->GetPosition();
POS = aStep->GetPreStepPoint()->GetTouchableHandle()->GetHistory()->GetTopTransform().TransformPoint(POS);
@@ -120,7 +120,7 @@ PSStripNumberY::~PSStripNumberY()
G4bool PSStripNumberY::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
- int DetNbr = GENERALSCORERS::PickUpDetectorNumber(aStep, "Must2Telescope");
+ int DetNbr = GENERALSCORERS::PickUpDetectorNumber(aStep, "MUST2Telescope");
G4ThreeVector POS = aStep->GetPreStepPoint()->GetPosition();
diff --git a/NPSimulation/src/PhysicsList.cc b/NPSimulation/src/PhysicsList.cc
index b2830204201608cb20133a7d78c9670cb21749be..5b8679f84be07212c57668ba3ada4a2b521186cc 100644
--- a/NPSimulation/src/PhysicsList.cc
+++ b/NPSimulation/src/PhysicsList.cc
@@ -70,8 +70,9 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
PhysicsList::PhysicsList()
-{
- defaultCutValue = 1 * cm;
+{
+ // ie: no secondaries
+ defaultCutValue = 1000000000000 * cm;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
PhysicsList::~PhysicsList()
@@ -232,9 +233,9 @@ void PhysicsList::ConstructEM()
G4EmProcessOptions opt ;
opt.SetSubCutoff(true) ;
opt.SetMinEnergy(0.001*eV) ;
- opt.SetMaxEnergy(600.*MeV) ;
- opt.SetDEDXBinning(600) ;
- opt.SetLambdaBinning(600) ;
+ opt.SetMaxEnergy(1000.*MeV) ;
+ opt.SetDEDXBinning(1000) ;
+ opt.SetLambdaBinning(1000) ;
// mod by Nicolas [07/05/09]
// opt.SetLinearLossLimit(1.e-3) ;
diff --git a/NPSimulation/src/VEventGenerator.cc b/NPSimulation/src/VEventGenerator.cc
index 10f6183e0f3ddebf58f1cb0725bc4d74fcb44c18..f1b3873e1fda6dfb8f5d80c7b3a4147b2b3a53e0 100644
--- a/NPSimulation/src/VEventGenerator.cc
+++ b/NPSimulation/src/VEventGenerator.cc
@@ -106,8 +106,6 @@ void VEventGenerator::CalculateBeamInteraction(double MeanPosX, double SigmaPosX
}
else{
-
-
InterCoord = G4ThreeVector(0, 0, 0);
AngleEmittanceTheta=0;
AngleEmittancePhi=0;