From 5cf2958d55b17eb9f2f198f3901722ede6829c78 Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Mon, 14 Sep 2009 13:18:44 +0000
Subject: [PATCH] * NumberOfStrips variable for GaspardTracker modules is now
accessible directly from the namespace of each class.
* Documentation file (empty for the moment) for the Gaspard project is
added
---
Inputs/EventGenerator/132Sndp.reaction | 4 +--
NPAnalysis/Gaspard/src/Analysis.cc | 4 +--
NPDocumentation/Gaspard.tex | 27 +++++++++++++++++++
.../include/GaspardTrackerDummyShape.hh | 2 ++
NPSimulation/include/GaspardTrackerSquare.hh | 1 +
.../include/GaspardTrackerTrapezoid.hh | 2 ++
NPSimulation/src/GaspardTrackerDummyShape.cc | 4 +--
NPSimulation/src/GaspardTrackerSquare.cc | 4 +--
NPSimulation/src/GaspardTrackerTrapezoid.cc | 4 +--
9 files changed, 42 insertions(+), 10 deletions(-)
create mode 100755 NPDocumentation/Gaspard.tex
diff --git a/Inputs/EventGenerator/132Sndp.reaction b/Inputs/EventGenerator/132Sndp.reaction
index fd8854164..5bdb077e4 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 e8c9037a9..8e4125f0c 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 000000000..38974666e
--- /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 7567c3b19..d567d9c1e 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 296e936e4..841a605c9 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 034d4e013..2b86902e3 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 952288afb..f8ab37d18 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 31f481245..307c3ce24 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 dacba3deb..714a28c9d 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);
--
GitLab