From c0e0c3de9e22326224a5cab2c596853b5ca7e19a Mon Sep 17 00:00:00 2001
From: Adrien Matta <matta@lpccaen.in2p3.fr>
Date: Fri, 4 Jun 2021 10:14:18 +0200
Subject: [PATCH] * Cleaning up old code from FDC0
---
NPLib/Detectors/Samurai/TSamuraiFDC0Physics.cxx | 2 --
NPLib/Detectors/Samurai/TSamuraiFDC0Physics.h | 7 +------
NPLib/scripts/build_dict.sh.in | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.cxx b/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.cxx
index f26eeb655..aab333813 100644
--- a/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.cxx
+++ b/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.cxx
@@ -43,7 +43,6 @@ ClassImp(TSamuraiFDC0Physics)
///////////////////////////////////////////////////////////////////////////
TSamuraiFDC0Physics::TSamuraiFDC0Physics(){
m_EventData = new TSamuraiFDC0Data ;
- m_PreTreatedData = new TSamuraiFDC0Data ;
m_EventPhysics = this ;
//m_Spectra = NULL;
// ToTThreshold_L = 0;
@@ -229,7 +228,6 @@ void TSamuraiFDC0Physics::BuildPhysicalEvent(){
}
///////////////////////////////////////////////////////////////////////////
void TSamuraiFDC0Physics::PreTreat(){
- ClearPreTreatedData();
static CalibrationManager* Cal = CalibrationManager::getInstance();
static string channel;
// one map per detector
diff --git a/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.h b/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.h
index e28c34596..a013d8bbb 100644
--- a/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.h
+++ b/NPLib/Detectors/Samurai/TSamuraiFDC0Physics.h
@@ -159,16 +159,12 @@ class TSamuraiFDC0Physics : public TObject, public NPL::VDetector{
public: // Specific to SamuraiFDC0 Array
- // Clear The PreTeated object
- void ClearPreTreatedData() {m_PreTreatedData->Clear();}
-
// Remove bad channel, calibrate the data and apply threshold
void PreTreat();
// Retrieve raw and pre-treated data
TSamuraiFDC0Data* GetRawData() const {return m_EventData;}
- TSamuraiFDC0Data* GetPreTreatedData() const {return m_PreTreatedData;}
-
+
TVector3 GetPos(){return TVector3(PosX,PosY,m_offset.Z());}
double GetPosX(){return PosX;}
double GetPosY(){return PosY;}
@@ -180,7 +176,6 @@ class TSamuraiFDC0Physics : public TObject, public NPL::VDetector{
private: // Root Input and Output tree classes
TSamuraiFDC0Data* m_EventData;//!
- TSamuraiFDC0Data* m_PreTreatedData;//!
TSamuraiFDC0Physics* m_EventPhysics;//!
diff --git a/NPLib/scripts/build_dict.sh.in b/NPLib/scripts/build_dict.sh.in
index a182332eb..583d354ba 100755
--- a/NPLib/scripts/build_dict.sh.in
+++ b/NPLib/scripts/build_dict.sh.in
@@ -53,7 +53,7 @@ fi
# Version 5 : generate the dictionnary then the libmap
if [ $version_major -eq 5 ]
then
- rootcint -f $2 -c -I../Core -I../Physics -I../../Core -I../../Physics -I../TrackReconstruction -I../../TrackReconstruction $1 $5
+ rootcint -DNPMULTITHREADING=@NPMULTITHREADING@ -f $2 -c -I../Core -I../Physics -I../../Core -I../../Physics -I../TrackReconstruction -I../../TrackReconstruction $1 $5
fi
# Version 6 or more : generate both at once
--
GitLab