From 2a15525a333ba50d58754c85e606bcfeb77a5517 Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Wed, 23 Sep 2009 20:04:45 +0000
Subject: [PATCH] * Remove warnings at compilation time concerning some data
storage classes - case for TInitialConditions, TInteractionCoordinates,
TGaspardTrackerData and TPlasticData - one method was added: void
Clear(const Option_t*) {}; - one method was modified: void Dump() const;
---
.../gaspardTestSpheric.detector | 83 ++++++++++---------
Inputs/EventGenerator/132Sndp.reaction | 4 +-
NPAnalysis/Gaspard/src/Analysis.cc | 2 +-
NPLib/GASPARD/TGaspardTrackerData.cxx | 2 +-
NPLib/GASPARD/TGaspardTrackerData.h | 3 +-
NPLib/GASPARD/TGaspardTrackerPhysics.h | 1 +
.../InitialConditions/TInitialConditions.cxx | 2 +-
NPLib/InitialConditions/TInitialConditions.h | 3 +-
.../TInteractionCoordinates.cxx | 2 +-
.../TInteractionCoordinates.h | 6 +-
NPLib/Plastic/TPlasticData.cxx | 4 +-
NPLib/Plastic/TPlasticData.h | 3 +-
.../include/GaspardTrackerDummyShape.hh | 4 +-
13 files changed, 64 insertions(+), 55 deletions(-)
diff --git a/Inputs/DetectorConfiguration/gaspardTestSpheric.detector b/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
index 0b46aa52e..e0378a74c 100644
--- a/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
+++ b/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
@@ -9,7 +9,8 @@
GeneralTarget
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Target
- THICKNESS= 9.7
+% THICKNESS= 10.3
+ THICKNESS= 0.0001
ANGLE= 0
RADIUS= 12
MATERIAL= CD2
@@ -32,7 +33,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
GPDDummyShape
@@ -42,7 +43,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
GPDDummyShape
@@ -52,7 +53,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
GPDDummyShape
@@ -62,7 +63,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
GPDDummyShape
@@ -72,7 +73,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
GPDDummyShape
@@ -82,7 +83,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
GPDDummyShape
@@ -92,7 +93,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%7
GPDDummyShape
@@ -102,7 +103,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
GPDDummyShape
@@ -112,7 +113,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%9
GPDDummyShape
@@ -122,7 +123,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%10
GPDDummyShape
@@ -132,7 +133,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%11
GPDDummyShape
@@ -142,7 +143,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%12 First Cone (forward)
GPDDummyShape
@@ -152,7 +153,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%13
GPDDummyShape
@@ -162,7 +163,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%14
GPDDummyShape
@@ -172,7 +173,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%15
GPDDummyShape
@@ -182,7 +183,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%16
GPDDummyShape
@@ -192,7 +193,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%17
GPDDummyShape
@@ -202,7 +203,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%18
GPDDummyShape
@@ -212,7 +213,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%19
GPDDummyShape
@@ -222,7 +223,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%20
GPDDummyShape
@@ -232,7 +233,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%21 Second Cone (forward)
GPDDummyShape
@@ -242,7 +243,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%22
GPDDummyShape
@@ -252,7 +253,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%23
GPDDummyShape
@@ -262,7 +263,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%24
GPDDummyShape
@@ -272,7 +273,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%25 First Cone (backward)
GPDDummyShape
@@ -282,7 +283,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%26
GPDDummyShape
@@ -292,7 +293,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%27
GPDDummyShape
@@ -302,7 +303,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%28
GPDDummyShape
@@ -312,7 +313,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%29
GPDDummyShape
@@ -322,7 +323,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%30
GPDDummyShape
@@ -332,7 +333,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%31
GPDDummyShape
@@ -342,7 +343,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%32
GPDDummyShape
@@ -352,7 +353,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%33
GPDDummyShape
@@ -362,7 +363,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%34 Second Cone (backward)
GPDDummyShape
@@ -372,7 +373,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%35
GPDDummyShape
@@ -382,7 +383,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%36
GPDDummyShape
@@ -392,7 +393,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%37
GPDDummyShape
@@ -402,7 +403,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%38 End Cap (forward)
GPDDummyShape
@@ -412,7 +413,7 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%39 End Cap (backward)
GPDDummyShape
@@ -422,5 +423,5 @@ GPDDummyShape
BETA= 0 0 0
FIRSTSTAGE= 1
SECONDSTAGE= 1
- THIRDSTAGE= 1
+ THIRDSTAGE= 0
VIS= all
diff --git a/Inputs/EventGenerator/132Sndp.reaction b/Inputs/EventGenerator/132Sndp.reaction
index 0ff5e1462..fd8854164 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.851
- SigmaY= 0.851
+ SigmaX= 0
+ SigmaY= 0
SigmaThetaX= 0
SigmaPhiY= 0
CrossSectionPath= sn132dp_gs_10AMeV.txt
diff --git a/NPAnalysis/Gaspard/src/Analysis.cc b/NPAnalysis/Gaspard/src/Analysis.cc
index f7c83fdf9..5e17b75f7 100644
--- a/NPAnalysis/Gaspard/src/Analysis.cc
+++ b/NPAnalysis/Gaspard/src/Analysis.cc
@@ -78,7 +78,7 @@ int main(int argc,char** argv)
ThetaStrip = ThetaCalculation (A ,TVector3(0,0,1));
// Correct for energy loss in the target
- E = DeutonTargetCD2.EvaluateInitialEnergy(E, 4.85*micrometer, ThetaStrip);
+// E = DeutonTargetCD2.EvaluateInitialEnergy(E, 4.85*micrometer, ThetaStrip);
// Calculate excitation energy
if (Theta/deg > 90) {
diff --git a/NPLib/GASPARD/TGaspardTrackerData.cxx b/NPLib/GASPARD/TGaspardTrackerData.cxx
index 72199549b..97ae3e74d 100644
--- a/NPLib/GASPARD/TGaspardTrackerData.cxx
+++ b/NPLib/GASPARD/TGaspardTrackerData.cxx
@@ -89,7 +89,7 @@ void TGaspardTrackerData::Clear()
-void TGaspardTrackerData::Dump()
+void TGaspardTrackerData::Dump() const
{
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
diff --git a/NPLib/GASPARD/TGaspardTrackerData.h b/NPLib/GASPARD/TGaspardTrackerData.h
index b88c42ff7..3be1dc393 100644
--- a/NPLib/GASPARD/TGaspardTrackerData.h
+++ b/NPLib/GASPARD/TGaspardTrackerData.h
@@ -82,7 +82,8 @@ public:
virtual ~TGaspardTrackerData();
void Clear();
- void Dump();
+ void Clear(const Option_t*) {};
+ void Dump() const;
///////////////////// SETTERS ////////////////////////
// DSSD
diff --git a/NPLib/GASPARD/TGaspardTrackerPhysics.h b/NPLib/GASPARD/TGaspardTrackerPhysics.h
index 5f8426c05..425d5e601 100644
--- a/NPLib/GASPARD/TGaspardTrackerPhysics.h
+++ b/NPLib/GASPARD/TGaspardTrackerPhysics.h
@@ -39,6 +39,7 @@ public:
public:
void Clear();
+ void Clear(const Option_t*) {};
void BuildPhysicalEvent(TGaspardTrackerData* Data);
void BuildSimplePhysicalEvent(TGaspardTrackerData* Data);
diff --git a/NPLib/InitialConditions/TInitialConditions.cxx b/NPLib/InitialConditions/TInitialConditions.cxx
index e76622b63..be597460d 100644
--- a/NPLib/InitialConditions/TInitialConditions.cxx
+++ b/NPLib/InitialConditions/TInitialConditions.cxx
@@ -68,7 +68,7 @@ void TInitialConditions::Clear()
-void TInitialConditions::Dump()
+void TInitialConditions::Dump() const
{
cout << "XXXXXXXXXXXXX Initial conditions XXXXXXXXXXXXXXXX" << endl;
diff --git a/NPLib/InitialConditions/TInitialConditions.h b/NPLib/InitialConditions/TInitialConditions.h
index ab3a94278..96d8e9cec 100644
--- a/NPLib/InitialConditions/TInitialConditions.h
+++ b/NPLib/InitialConditions/TInitialConditions.h
@@ -66,7 +66,8 @@ public:
virtual ~TInitialConditions();
void Clear();
- void Dump();
+ void Clear(const Option_t*) {};
+ void Dump() const;
///////////////////// SETTERS ////////////////////////
// Incident particle properties (before interactions in the target)
diff --git a/NPLib/InteractionCoordinates/TInteractionCoordinates.cxx b/NPLib/InteractionCoordinates/TInteractionCoordinates.cxx
index 25e71b4f3..624060e12 100644
--- a/NPLib/InteractionCoordinates/TInteractionCoordinates.cxx
+++ b/NPLib/InteractionCoordinates/TInteractionCoordinates.cxx
@@ -52,7 +52,7 @@ void TInteractionCoordinates::Clear()
-void TInteractionCoordinates::Dump()
+void TInteractionCoordinates::Dump() const
{
cout << "XXXXXXXXXXXXX Interaction coordinates XXXXXXXXXXXXXXXX" << endl;
diff --git a/NPLib/InteractionCoordinates/TInteractionCoordinates.h b/NPLib/InteractionCoordinates/TInteractionCoordinates.h
index c722d5143..ffd1fcc3c 100644
--- a/NPLib/InteractionCoordinates/TInteractionCoordinates.h
+++ b/NPLib/InteractionCoordinates/TInteractionCoordinates.h
@@ -46,9 +46,13 @@ private:
public:
TInteractionCoordinates();
virtual ~TInteractionCoordinates();
-
+/*
void Clear();
void Dump();
+*/
+ void Clear();
+ void Clear(const Option_t*) {};
+ void Dump() const;
///////////////////// SETTERS ////////////////////////
// Incident particle properties (before interactions in the target)
diff --git a/NPLib/Plastic/TPlasticData.cxx b/NPLib/Plastic/TPlasticData.cxx
index ac7ae2789..8b4f51ece 100644
--- a/NPLib/Plastic/TPlasticData.cxx
+++ b/NPLib/Plastic/TPlasticData.cxx
@@ -27,11 +27,11 @@ void TPlasticData::Clear()
-void TPlasticData::Dump()
+void TPlasticData::Dump() const
{
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
- for(short i = 0 ; i<fPlastic_Energy.size() ; i ++)
+ for(unsigned short i = 0 ; i<fPlastic_Energy.size() ; i ++)
{
cout << "Plastic Number " << fPlastic_Number[i] << " Energy: " << fPlastic_Energy[i] << " Time: "<< fPlastic_Time[i] << endl;
diff --git a/NPLib/Plastic/TPlasticData.h b/NPLib/Plastic/TPlasticData.h
index 15b2a5901..253213c86 100644
--- a/NPLib/Plastic/TPlasticData.h
+++ b/NPLib/Plastic/TPlasticData.h
@@ -19,7 +19,8 @@ class TPlasticData : public TObject {
virtual ~TPlasticData();
void Clear();
- void Dump();
+ void Clear(const Option_t*) {};
+ void Dump() const;
///////////////////// GETTERS ////////////////////////
// (E)
diff --git a/NPSimulation/include/GaspardTrackerDummyShape.hh b/NPSimulation/include/GaspardTrackerDummyShape.hh
index 49eb5e54c..db4cdec8c 100644
--- a/NPSimulation/include/GaspardTrackerDummyShape.hh
+++ b/NPSimulation/include/GaspardTrackerDummyShape.hh
@@ -143,7 +143,7 @@ namespace GPDDUMMYSHAPE
{
// Resolution
const G4double ResoFirstStage = 0.0213; // = 50 keV of Resolution // Unit is MeV/2.35
- const G4double ResoSecondStage = 0.0213; // = 50 keV of resolution // Unit is MeV/2.35
+ const G4double ResoSecondStage = 0.0213 * sqrt(2); // = 50 keV of resolution // Unit is MeV/2.35
const G4double ResoThirdStage = 0.0213; // = 50 keV of resolution // Unit is MeV/2.35
const G4double ResoTimeGpd = 0.212765957;// = 500ps // Unit is ns/2.35
@@ -165,7 +165,7 @@ namespace GPDDUMMYSHAPE
// Second stage
const G4double SecondStageFace = FirstStageFace;
- const G4double SecondStageThickness = 1*mm;
+ const G4double SecondStageThickness = 2*mm;
// Third stage
const G4double ThirdStageFace = FirstStageFace;
--
GitLab