From 578d25da6e41734216333dcd3f5fea70a28381bc Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Thu, 17 Feb 2011 16:33:37 +0000
Subject: [PATCH] * Fix warnings at compilation for CATS in NPLib
* Change InitializeRootInput() method for InitializeRootInputRaw() for
Gaspard, Hyde and Paris project.
---
NPLib/CATS/TCATSData.cxx | 14 ++------------
NPLib/CATS/TCATSData.h | 3 ++-
NPLib/CATS/TCATSPhysics.cxx | 5 ++++-
NPLib/CATS/TCATSPhysics.h | 3 ++-
NPLib/GASPARD/GaspardTracker.cxx | 10 +++++++++-
NPLib/GASPARD/GaspardTracker.h | 5 ++++-
NPLib/HYDE/HydeTracker.cxx | 2 +-
NPLib/HYDE/HydeTracker.h | 2 +-
NPLib/Paris/Paris.cxx | 2 +-
NPLib/Paris/Paris.h | 2 +-
README/ReleaseNotes-1.4.1.txt | 4 ++++
11 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/NPLib/CATS/TCATSData.cxx b/NPLib/CATS/TCATSData.cxx
index 3f0366121..b4decc67f 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 cbe1358c2..ec451d2aa 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 74e1fc9a1..fcdf239d6 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 883c40245..8d8457dc0 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 af644c485..7c9aa7376 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 532de2ed6..2e1b22ff2 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 841b23112..682c87cd4 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 8c6eb3a88..20d3ff42d 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 1e7256424..fb1035969 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 090913088..a07a9ac5c 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 40a1f4b9b..942a5a5b5 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
--
GitLab