diff --git a/NPLib/CATS/TCATSData.cxx b/NPLib/CATS/TCATSData.cxx
index 3f0366121d7f2d61040d4062410b6c562f39f0e4..b4decc67f6e8c7e50f3da0ede44010d83f6b3103 100644
--- a/NPLib/CATS/TCATSData.cxx
+++ b/NPLib/CATS/TCATSData.cxx
@@ -30,17 +30,7 @@ TCATSData::TCATSData()
{
// Default constructor
- // X
- fCATS_DetX.clear();
- fCATS_StripX.clear();
- fCATS_ChargeX.clear();
- // Y
- fCATS_DetY.clear();
- fCATS_StripY.clear();
- fCATS_ChargeY.clear();
- // (Qfil)
- fCATS_DetQ.clear();
- fCATS_Charge.clear();
+ Clear();
}
@@ -68,7 +58,7 @@ void TCATSData::Clear()
-void TCATSData::Dump()
+void TCATSData::Dump() const
{
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
diff --git a/NPLib/CATS/TCATSData.h b/NPLib/CATS/TCATSData.h
index cbe1358c2d4898a1774870a95108797145b9b2dc..ec451d2aaa2470bd0a0cf2b08c53971a2ea30991 100644
--- a/NPLib/CATS/TCATSData.h
+++ b/NPLib/CATS/TCATSData.h
@@ -48,7 +48,8 @@ class TCATSData : public TObject {
virtual ~TCATSData();
void Clear();
- void Dump();
+ void Clear(const Option_t*) {};
+ void Dump() const;
///////////////////// SETTERS ////////////////////////
// X
diff --git a/NPLib/CATS/TCATSPhysics.cxx b/NPLib/CATS/TCATSPhysics.cxx
index 74e1fc9a1b91eb372bcbfc31b28e6fa825a4a792..fcdf239d66ac7d937be514dc0096bb24ba6e9e34 100644
--- a/NPLib/CATS/TCATSPhysics.cxx
+++ b/NPLib/CATS/TCATSPhysics.cxx
@@ -271,6 +271,9 @@ void TCATSPhysics::AddCATS(TVector3 C_X1_Y1, TVector3 C_X28_Y1, TVector3 C_X1_Y2
{
NumberOfCATS++ ;
+ // remove warning
+ C_X28_Y28 *= 1;
+
// Vector U on Telescope Face (paralelle to Y Strip) (NB: remember that Y strip are along X axis)
TVector3 U = C_X28_Y1 - C_X1_Y1 ;
U = U.Unit() ;
@@ -394,7 +397,7 @@ void TCATSPhysics::Clear()
-void TCATSPhysics::Dump()
+void TCATSPhysics::Dump() const
{
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
diff --git a/NPLib/CATS/TCATSPhysics.h b/NPLib/CATS/TCATSPhysics.h
index 883c40245a379861f3be41042476a01c392b621b..8d8457dc06cad243f7946c2758c79274eda06ef9 100644
--- a/NPLib/CATS/TCATSPhysics.h
+++ b/NPLib/CATS/TCATSPhysics.h
@@ -167,7 +167,8 @@ class TCATSPhysics : public TObject, public NPA::VDetector
public : // Specific to CATS
void Clear();
- void Dump();
+ void Clear(const Option_t*) {};
+ void Dump() const;
void AddCATS(TVector3 C_X1_Y1, TVector3 C_X28_Y1, TVector3 C_X1_Y28, TVector3 C_X28_Y28);
diff --git a/NPLib/GASPARD/GaspardTracker.cxx b/NPLib/GASPARD/GaspardTracker.cxx
index af644c48569783d13a4c423b33e8029d80477928..7c9aa73762f8c9eb78d01ddb7e28a0888d66a60d 100644
--- a/NPLib/GASPARD/GaspardTracker.cxx
+++ b/NPLib/GASPARD/GaspardTracker.cxx
@@ -201,7 +201,7 @@ void GaspardTracker::ReadCalibrationFile(string Path)
// Activated associated Branches and link it to the private member DetectorData address
// In this method mother Branches (Detector) AND daughter leaf (fDetector_parameter) have to be activated
-void GaspardTracker::InitializeRootInput()
+void GaspardTracker::InitializeRootInputRaw()
{
TChain* inputChain = RootInput::getInstance()->GetChain();
inputChain->SetBranchStatus("GASPARD", true);
@@ -211,6 +211,14 @@ void GaspardTracker::InitializeRootInput()
+void GaspardTracker::InitializeRootInputPhysics()
+{
+ TChain* inputChain = RootInput::getInstance()->GetChain();
+ inputChain->SetBranchAddress("GASPARD" , &m_EventPhysics);
+}
+
+
+
// Create associated branches and associated private member DetectorPhysics address
void GaspardTracker::InitializeRootOutput()
{
diff --git a/NPLib/GASPARD/GaspardTracker.h b/NPLib/GASPARD/GaspardTracker.h
index 532de2ed64fb85cdb890d74e17eee604fcefde89..2e1b22ff263b8074b93230c23f209506dc3ce946 100644
--- a/NPLib/GASPARD/GaspardTracker.h
+++ b/NPLib/GASPARD/GaspardTracker.h
@@ -63,7 +63,10 @@ public:
// Activated associated Branches and link it to the private member DetectorData address
// In this method mother Branches (Detector) AND daughter leaf (fDetector_parameter) have to be activated
- void InitializeRootInput();
+ void InitializeRootInputRaw();
+
+ // In this method mother Branches (Detector) AND daughter leaf (parameter) have to be activated
+ void InitializeRootInputPhysics();
// Create associated branches and associated private member DetectorPhysics address
void InitializeRootOutput();
diff --git a/NPLib/HYDE/HydeTracker.cxx b/NPLib/HYDE/HydeTracker.cxx
index 841b23112af4bcffa5d3e863c68758c076429ef7..682c87cd4c1a43bf356d050c74766b06eff75eb8 100644
--- a/NPLib/HYDE/HydeTracker.cxx
+++ b/NPLib/HYDE/HydeTracker.cxx
@@ -492,7 +492,7 @@ void HydeTracker::ReadCalibrationFile(string Path)
// Activated associated Branches and link it to the private member DetectorData address
// In this method mother Branches (Detector) AND daughter leaf (fDetector_parameter) have to be activated
-void HydeTracker::InitializeRootInput()
+void HydeTracker::InitializeRootInputRaw()
{
TChain* inputChain = RootInput::getInstance()->GetChain();
inputChain->SetBranchStatus("HYDE", true);
diff --git a/NPLib/HYDE/HydeTracker.h b/NPLib/HYDE/HydeTracker.h
index 8c6eb3a882866d6a9e57ef8a1efa5ad87b212712..20d3ff42dd430d87bfe35b93d78b58127e0686ea 100644
--- a/NPLib/HYDE/HydeTracker.h
+++ b/NPLib/HYDE/HydeTracker.h
@@ -52,7 +52,7 @@ public:
// Activated associated Branches and link it to the private member DetectorData address
// In this method mother Branches (Detector) AND daughter leaf (fDetector_parameter) have to be activated
- void InitializeRootInput();
+ void InitializeRootInputRaw();
// Create associated branches and associated private member DetectorPhysics address
void InitializeRootOutput();
diff --git a/NPLib/Paris/Paris.cxx b/NPLib/Paris/Paris.cxx
index 1e7256424da3886cfd03a70df01c56a26d0796e6..fb10359690d332aded4c5171709a4176bfc18e02 100644
--- a/NPLib/Paris/Paris.cxx
+++ b/NPLib/Paris/Paris.cxx
@@ -471,7 +471,7 @@ void Paris::ReadCalibrationFile(string Path)
// Activated associated Branches and link it to the private member DetectorData address
// In this method mother Branches (Detector) AND daughter leaf (fDetector_parameter) have to be activated
-void Paris::InitializeRootInput()
+void Paris::InitializeRootInputRaw()
{
TChain* inputChain = RootInput::getInstance()->GetChain();
inputChain->SetBranchStatus("PARIS", true);
diff --git a/NPLib/Paris/Paris.h b/NPLib/Paris/Paris.h
index 090913088f93cad8124ba95070238651c2735ff2..a07a9ac5c727f613a16e5a7e2fc3913b1cea32db 100644
--- a/NPLib/Paris/Paris.h
+++ b/NPLib/Paris/Paris.h
@@ -48,7 +48,7 @@ public:
// Activated associated Branches and link it to the private member DetectorData address
// In this method mother Branches (Detector) AND daughter leaf (fDetector_parameter) have to be activated
- void InitializeRootInput();
+ void InitializeRootInputRaw();
// Create associated branches and associated private member DetectorPhysics address
void InitializeRootOutput();
diff --git a/README/ReleaseNotes-1.4.1.txt b/README/ReleaseNotes-1.4.1.txt
index 40a1f4b9b412ea7b6e58da03de3b27eb139c0d1b..942a5a5b52b2f4457a5e613633169c611ffaf2fb 100644
--- a/README/ReleaseNotes-1.4.1.txt
+++ b/README/ReleaseNotes-1.4.1.txt
@@ -35,6 +35,10 @@ Nicolas de Sereville, IPNO
a TChain object which can be called directly in the ROOT interpreter.
This is particularly useful when associating raw and physical data together.
+ + Add CATS directory
+ + TCATSData and TCASPhysics are added. These classes are only used in NPAnalysis.
+
+
+ NPSimulation
--------------
+ Scorers: Minimum energy deposit for charged particles is now 0.1 keV