diff --git a/Inputs/EventGenerator/132Sndp.reaction b/Inputs/EventGenerator/132Sndp.reaction
index fd88541645b7aa52806ca9d3908786444a3768b9..5bdb077e4d6f9240fe93c625687c05caedc0baf3 100644
--- a/Inputs/EventGenerator/132Sndp.reaction
+++ b/Inputs/EventGenerator/132Sndp.reaction
@@ -10,8 +10,8 @@ Transfert
ExcitationEnergy= 0.0
BeamEnergy= 1320
BeamEnergySpread= 0
- SigmaX= 0
- SigmaY= 0
+ SigmaX= 2
+ SigmaY= 2
SigmaThetaX= 0
SigmaPhiY= 0
CrossSectionPath= sn132dp_gs_10AMeV.txt
diff --git a/NPAnalysis/Gaspard/src/Analysis.cc b/NPAnalysis/Gaspard/src/Analysis.cc
index e8c9037a9d20031dffcf0fe9facf5e10e1a579c2..8e4125f0c3da2b5d3ee6dfb94cbf727d318edf8f 100644
--- a/NPAnalysis/Gaspard/src/Analysis.cc
+++ b/NPAnalysis/Gaspard/src/Analysis.cc
@@ -78,10 +78,10 @@ int main(int argc,char** argv)
// Calculate excitation energy
if (Theta/deg > 90) {
- Ex = myReaction->ReconstructRelativistic(E, Theta / rad);
+// Ex = myReaction->ReconstructRelativistic(E, Theta / rad);
+ Ex = myReaction->ReconstructRelativistic(E, ThetaStrip);
}
else Ex = -200;
-// Ex = myReaction->ReconstructRelativistic(E, ThetaStrip);
}
else {
Ex = -100;
diff --git a/NPDocumentation/Gaspard.tex b/NPDocumentation/Gaspard.tex
new file mode 100755
index 0000000000000000000000000000000000000000..38974666e8e0a9650e3095cc10732ed1740ec33b
--- /dev/null
+++ b/NPDocumentation/Gaspard.tex
@@ -0,0 +1,27 @@
+\documentclass[a4paper,12pt]{article}
+\usepackage[T1]{fontenc}
+\usepackage [isolatin]{inputenc} % fontes avec caracteres accentues
+\usepackage{graphicx} % inclusion de figures
+\usepackage{listings}
+
+\begin{document}
+
+\title{\emph{Gaspard Documentation}}
+\author{Nicolas de S\'er\'eville}
+
+\maketitle
+\pagebreak
+\tableofcontents % la table des matieres
+\pagebreak
+
+
+\section{Introduction}
+\section{NPSimulation}
+\subsection{}
+\subsection{Storing the results of the simulation}
+\subsection{Adding a new detector shape to Gaspard}
+
+\section{NPAnalysis}
+
+\end{document}
+
diff --git a/NPSimulation/include/GaspardTrackerDummyShape.hh b/NPSimulation/include/GaspardTrackerDummyShape.hh
index 7567c3b19ac814b1f0a7aace2fa93e7d045966f6..d567d9c1e65e66762dacc876069b1c2de6c16f0b 100644
--- a/NPSimulation/include/GaspardTrackerDummyShape.hh
+++ b/NPSimulation/include/GaspardTrackerDummyShape.hh
@@ -164,6 +164,8 @@ namespace GPDDUMMYSHAPE
// const G4double FirstStageThickness = 300*micrometer ;
// for testing the excitation energy reconstruction
const G4double FirstStageThickness = 1.3*cm;
+// const G4int NumberOfStrips = 128;
+ const G4int NumberOfStrips = 20;
// Second stage
const G4double SecondStageFace = FirstStageFace;
diff --git a/NPSimulation/include/GaspardTrackerSquare.hh b/NPSimulation/include/GaspardTrackerSquare.hh
index 296e936e4c848bb571dae9e09194bb605814b405..841a605c9aeaddbe94ba5a8a49e9fcc27f7c1c28 100644
--- a/NPSimulation/include/GaspardTrackerSquare.hh
+++ b/NPSimulation/include/GaspardTrackerSquare.hh
@@ -168,6 +168,7 @@ namespace GPDSQUARE
const G4double SiliconFace = 98*mm ;
// const G4double VacBoxThickness = 3*cm ;
const G4double VacBoxThickness = 0.5*cm ;
+ const G4int NumberOfStrips = 128;
// Second stage
const G4double SiLiThickness = 5.1*mm ; // Must be checked
diff --git a/NPSimulation/include/GaspardTrackerTrapezoid.hh b/NPSimulation/include/GaspardTrackerTrapezoid.hh
index 034d4e0131add716c828cd81fb432d78ceca7db3..2b86902e39d58c4166cdee2a3f0579fecd79b82d 100644
--- a/NPSimulation/include/GaspardTrackerTrapezoid.hh
+++ b/NPSimulation/include/GaspardTrackerTrapezoid.hh
@@ -170,6 +170,8 @@ namespace GPDTRAP
const G4double FirstStageBaseSmall = 29*mm;
// const G4double VacBoxThickness = 3*cm ;
const G4double VacBoxThickness = 0.5*cm;
+ const G4int NumberOfStripsX = 128;
+ const G4int NumberOfStripsY = 128;
// Second stage
const G4double SiLiThickness = 5.1*mm ; // Must be checked
diff --git a/NPSimulation/src/GaspardTrackerDummyShape.cc b/NPSimulation/src/GaspardTrackerDummyShape.cc
index 952288afb5f54a597ed6667c431366fd0f34f1ef..f8ab37d186e71ba1b3abf02d1239541b962a80a0 100644
--- a/NPSimulation/src/GaspardTrackerDummyShape.cc
+++ b/NPSimulation/src/GaspardTrackerDummyShape.cc
@@ -939,8 +939,8 @@ void GaspardTrackerDummyShape::InitializeScorers()
G4VPrimitiveScorer* DetNbr = new GPDScorerDetectorNumber("DetectorNumber", 0, "FirstStage");
G4VPrimitiveScorer* Energy = new GPDScorerFirstStageEnergy("StripEnergy", 0);
G4VPrimitiveScorer* TOF = new PSTOF("StripTime", 0);
- G4VPrimitiveScorer* StripPositionX = new GPDScorerFirstStageFrontStripDummyShape("StripIDFront", 0, 128);
- G4VPrimitiveScorer* StripPositionY = new GPDScorerFirstStageBackStripDummyShape("StripIDBack", 0, 128);
+ G4VPrimitiveScorer* StripPositionX = new GPDScorerFirstStageFrontStripDummyShape("StripIDFront", 0, NumberOfStrips);
+ G4VPrimitiveScorer* StripPositionY = new GPDScorerFirstStageBackStripDummyShape("StripIDBack", 0, NumberOfStrips);
G4VPrimitiveScorer* InteractionCoordinatesX = new PSInteractionCoordinatesX("InterCoordX", 0);
G4VPrimitiveScorer* InteractionCoordinatesY = new PSInteractionCoordinatesY("InterCoordY", 0);
G4VPrimitiveScorer* InteractionCoordinatesZ = new PSInteractionCoordinatesZ("InterCoordZ", 0);
diff --git a/NPSimulation/src/GaspardTrackerSquare.cc b/NPSimulation/src/GaspardTrackerSquare.cc
index 31f481245d2bf11fee67e971ec718337e29f12c4..307c3ce244231f39c30b5e67dd1144d787da51bb 100644
--- a/NPSimulation/src/GaspardTrackerSquare.cc
+++ b/NPSimulation/src/GaspardTrackerSquare.cc
@@ -1135,8 +1135,8 @@ void GaspardTrackerSquare::InitializeScorers()
G4VPrimitiveScorer* DetNbr = new GPDScorerDetectorNumber("DetectorNumber", 0, "Silicon");
G4VPrimitiveScorer* Energy = new GPDScorerFirstStageEnergy("StripEnergy", 0);
G4VPrimitiveScorer* TOF = new PSTOF("StripTime", 0);
- G4VPrimitiveScorer* StripPositionX = new GPDScorerFirstStageFrontStripSquare("StripNumberX", 0, 128);
- G4VPrimitiveScorer* StripPositionY = new GPDScorerFirstStageBackStripSquare("StripNumberY", 0, 128);
+ G4VPrimitiveScorer* StripPositionX = new GPDScorerFirstStageFrontStripSquare("StripNumberX", 0, NumberOfStrips);
+ G4VPrimitiveScorer* StripPositionY = new GPDScorerFirstStageBackStripSquare("StripNumberY", 0, NumberOfStrips);
G4VPrimitiveScorer* InteractionCoordinatesX = new PSInteractionCoordinatesX("InterCoordX", 0);
G4VPrimitiveScorer* InteractionCoordinatesY = new PSInteractionCoordinatesY("InterCoordY", 0);
G4VPrimitiveScorer* InteractionCoordinatesZ = new PSInteractionCoordinatesZ("InterCoordZ", 0);
diff --git a/NPSimulation/src/GaspardTrackerTrapezoid.cc b/NPSimulation/src/GaspardTrackerTrapezoid.cc
index dacba3debf888b9ad85d9f51fbf180a2414e6d62..714a28c9d23a8980ab38c04e540f7b11bc0f16ea 100644
--- a/NPSimulation/src/GaspardTrackerTrapezoid.cc
+++ b/NPSimulation/src/GaspardTrackerTrapezoid.cc
@@ -1003,8 +1003,8 @@ void GaspardTrackerTrapezoid::InitializeScorers()
G4VPrimitiveScorer* DetNbr = new GPDScorerDetectorNumber("DetectorNumber", 0, "Silicon");
G4VPrimitiveScorer* Energy = new GPDScorerFirstStageEnergy("StripEnergy", 0);
G4VPrimitiveScorer* TOF = new PSTOF("StripTime", 0);
- G4VPrimitiveScorer* StripPositionX = new GPDScorerFirstStageFrontStripTrapezoid("StripNumberX", 0, 128);
- G4VPrimitiveScorer* StripPositionY = new GPDScorerFirstStageBackStripTrapezoid("StripNumberY", 0, 128);
+ G4VPrimitiveScorer* StripPositionX = new GPDScorerFirstStageFrontStripTrapezoid("StripNumberX", 0, NumberOfStripsX);
+ G4VPrimitiveScorer* StripPositionY = new GPDScorerFirstStageBackStripTrapezoid("StripNumberY", 0, NumberOfStripsY);
G4VPrimitiveScorer* InteractionCoordinatesX = new PSInteractionCoordinatesX("InterCoordX", 0);
G4VPrimitiveScorer* InteractionCoordinatesY = new PSInteractionCoordinatesY("InterCoordY", 0);
G4VPrimitiveScorer* InteractionCoordinatesZ = new PSInteractionCoordinatesZ("InterCoordZ", 0);