diff --git a/NPAnalysis/10He_Riken/Analysis b/NPAnalysis/10He_Riken/Analysis
index d08fc4a3faa68c344ba4f73a4ab0b1cde81d242c..e0e3b14b288fb653c9e27f5969bf5190118bab1c 100755
Binary files a/NPAnalysis/10He_Riken/Analysis and b/NPAnalysis/10He_Riken/Analysis differ
diff --git a/NPLib/AnnularS1/TS1Data.cxx b/NPLib/AnnularS1/TS1Data.cxx
index 96ba8d46714fba5c24abb240f4bf4b42c14c4ed0..e5224851600abf587d58a78e8cbce7909926d20d 100644
--- a/NPLib/AnnularS1/TS1Data.cxx
+++ b/NPLib/AnnularS1/TS1Data.cxx
@@ -71,7 +71,7 @@ void TS1Data::Clear()
-void TS1Data::Dump()
+void TS1Data::Dump() const
{
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
diff --git a/NPLib/AnnularS1/TS1Data.h b/NPLib/AnnularS1/TS1Data.h
index d0a910d817c84aa4e4f9d1285b80672a397e079b..225f6e714cbbb9ec411a9c56f71b76378bbf0eda 100644
--- a/NPLib/AnnularS1/TS1Data.h
+++ b/NPLib/AnnularS1/TS1Data.h
@@ -61,7 +61,8 @@ class TS1Data : public TObject {
virtual ~TS1Data();
void Clear();
- void Dump();
+ void Clear(const Option_t*) {};
+ void Dump() const;
@@ -105,7 +106,7 @@ class TS1Data : public TObject {
void SetS1PhiTStripNbr(UShort_t Nr) {fS1_Phi_T_StripNbr.push_back(Nr);}
void SetS1PhiTTime(Double_t T) {fS1_Phi_T_Time.push_back(T);}
- ClassDef(TS1Data,1) // S1Data structure
+ ClassDef(TS1Data,2) // S1Data structure
};
#endif
diff --git a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
index ae48b30d5ba143676f34cf54d419075ae340eac1..8487f87751da5c57a52d2567d234347d9f7714bd 100644
--- a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
+++ b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
@@ -125,7 +125,7 @@ void TGaspardTrackerPhysics::BuildPhysicalEvent(TGaspardTrackerData* Data)
FirstStage_Y.push_back(stripYE);
// get energy from strips and store it
double EnergyStripFront = Data->GetGPDTrkFirstStageFrontEEnergy(0);
- double EnergyStripBack = Data->GetGPDTrkFirstStageBackEEnergy(0);
+// double EnergyStripBack = Data->GetGPDTrkFirstStageBackEEnergy(0);
// double EnergyStrip = 0.5 * (EnergyStripFront + EnergyStripBack);
double EnergyStrip = EnergyStripFront;
// if (EnergyStripBack > EnergyStrip) EnergyStrip = EnergyStripBack;
diff --git a/NPLib/MUST2/Must2Array.cxx b/NPLib/MUST2/Must2Array.cxx
index 52ff9e8b15a6af0ec91a03b72c477c7ecb9db8f8..846632eb029aac817d473758a8512f2196edd07c 100644
--- a/NPLib/MUST2/Must2Array.cxx
+++ b/NPLib/MUST2/Must2Array.cxx
@@ -73,7 +73,6 @@ void MUST2Array::ReadConfiguration(string Path)
double Ax , Bx , Cx , Dx , Ay , By , Cy , Dy , Az , Bz , Cz , Dz ;
TVector3 A , B , C , D ;
double Theta = 0 , Phi = 0 , R = 0 , beta_u = 0 , beta_v = 0 , beta_w = 0 ;
- int SI = 0 , SILI = 0 , CSI = 0 ;
bool check_A = false ;
bool check_C = false ;
@@ -392,6 +391,9 @@ void MUST2Array::AddTelescope( TVector3 C_X1_Y1 ,
TVector3 C_X1_Y128 ,
TVector3 C_X128_Y128 )
{
+ // To avoid warning
+ C_X1_Y128 *= 1;
+
NumberOfTelescope++;
// Vector U on Telescope Face (paralelle to Y Strip) (NB: remember that Y strip are allong X axis)
diff --git a/NPLib/MUST2/TMust2Data.cxx b/NPLib/MUST2/TMust2Data.cxx
index a8b1b3701c8058612582f48fdcae12df39909120..308e52a0b8d581e4b55d819dd2cd584245e767f3 100644
--- a/NPLib/MUST2/TMust2Data.cxx
+++ b/NPLib/MUST2/TMust2Data.cxx
@@ -111,7 +111,7 @@ void TMust2Data::Clear()
-void TMust2Data::Dump()
+void TMust2Data::Dump() const
{
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
diff --git a/NPLib/MUST2/TMust2Data.h b/NPLib/MUST2/TMust2Data.h
index 804cc7f93e52c4b23611eb6ddf4c1a7420e5057b..04393789731e33d124dab9a8bdb698438b1f35cf 100644
--- a/NPLib/MUST2/TMust2Data.h
+++ b/NPLib/MUST2/TMust2Data.h
@@ -72,7 +72,8 @@ class TMust2Data : public TObject {
virtual ~TMust2Data();
void Clear();
- void Dump();
+ void Clear(const Option_t*) {};
+ void Dump() const;
///////////////////// SETTERS ////////////////////////
// DSSD
@@ -160,7 +161,7 @@ class TMust2Data : public TObject {
UShort_t GetMMCsITCristalNbr(Int_t i) {return fMM_CsIT_CristalNbr.at(i);}
Double_t GetMMCsITTime(Int_t i) {return fMM_CsIT_Time.at(i);}
- ClassDef(TMust2Data,1) // Must2Data structure
+ ClassDef(TMust2Data,2) // Must2Data structure
};
#endif
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index c6811e20fdbd79114aa3be08507e122a7b2cdc05..137e8a86a7293f5063e8c45048785a6744ad6244 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -46,6 +46,12 @@ void TMust2Physics::BuildPhysicalEvent(TMust2Data* Data)
double SiLi_E_Threshold = 0 ; double SiLi_T_Threshold = 0 ;
double CsI_E_Threshold = 0 ; double CsI_T_Threshold = 0 ;
+ // To avoid warnings
+ Si_X_E_Threshold *= 1; Si_X_T_Threshold *= 1;
+ Si_Y_E_Threshold *= 1; Si_Y_T_Threshold *= 1;
+ SiLi_E_Threshold *= 1; SiLi_T_Threshold *= 1;
+ CsI_E_Threshold *= 1; CsI_T_Threshold *= 1;
+
// Multiplicity 1
if( Data->GetMMStripXEMult()==1 && Data->GetMMStripYEMult()==1 && Data->GetMMStripXTMult()==1 && Data->GetMMStripXTMult()==1 )
{
diff --git a/NPLib/MUST2/TMust2Physics.h b/NPLib/MUST2/TMust2Physics.h
index 04fabcd78110e9998ec2810a00f1dba7ceb06bdf..22bd7b3b518042138485d27d55fb8e14b2925728 100644
--- a/NPLib/MUST2/TMust2Physics.h
+++ b/NPLib/MUST2/TMust2Physics.h
@@ -36,6 +36,7 @@ class TMust2Physics : public TObject
public:
void Clear() ;
+ void Clear(const Option_t*) {};
void BuildPhysicalEvent(TMust2Data* Data) ;
void BuildSimplePhysicalEvent(TMust2Data* Data) ;
diff --git a/NPSimulation/src/Plastic.cc b/NPSimulation/src/Plastic.cc
index 0a0e7d057432612be261f2ff136beae149a2cbf3..21005243d7685a9f208fe56267cf1d8f09d6036c 100644
--- a/NPSimulation/src/Plastic.cc
+++ b/NPSimulation/src/Plastic.cc
@@ -264,7 +264,7 @@ void Plastic::ConstructDetector(G4LogicalVolume* world)
G4double wZ = m_R[i] * cos(m_Theta[i] ) ;
Det_pos = G4ThreeVector(wX, wY, wZ) ;
- G4LogicalVolume* logicPlastic = NULL ;
+// G4LogicalVolume* logicPlastic = NULL ;
VolumeMaker(Det_pos , i+1, world) ;
}
diff --git a/TODO b/TODO
index 6032699be18e86432157f55a1eaf252018e3f052..d9570d3e49d72ca5c699dfaa578fe4196987bdcc 100644
--- a/TODO
+++ b/TODO
@@ -22,7 +22,6 @@
TODO for NPTool:
----------------
- + Try to remove warnings from NPL / NPS compilation (Adrien + Nicolas)
+ Change map's index of scorers to deal a typical case like it is now done
for the dE-E with 2 plastics. (Adrien + Nicolas)
+ Build a dummy detector as a simple example of how NPTool is working (Adrien)