diff --git a/NPLib/Detectors/GANIL/CMakeLists.txt b/NPLib/Detectors/GANIL/CMakeLists.txt
index 0f442987797c4aeacbdb46885d215c22e942da37..dd228e95c3136e00177430751b15850618a747ef 100644
--- a/NPLib/Detectors/GANIL/CMakeLists.txt
+++ b/NPLib/Detectors/GANIL/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_custom_command(OUTPUT TTacPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTacPhysics.h TTacPhysicsDict.cxx TTacPhysics.rootmap libNPGANIL.dylib DEPENDS TTacPhysics.h)
-add_custom_command(OUTPUT TTriggerDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTriggerData.h TTriggerDataDict.cxx TTriggerData.rootmap libNPGANIL.dylib DEPENDS TTriggerData.h)
-add_custom_command(OUTPUT TTacDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTacData.h TTacDataDict.cxx TTacData.rootmap libNPGANIL.dylib DEPENDS TTacData.h)
-add_library(NPGANIL SHARED TTacPhysics.cxx TTacData.cxx TTriggerData.cxx TTacDataDict.cxx TTriggerDataDict.cxx TTacPhysicsDict.cxx)
+add_custom_command(OUTPUT TGANILTacPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TGANILTacPhysics.h TGANILTacPhysicsDict.cxx TGANILTacPhysics.rootmap libNPGANIL.dylib DEPENDS TGANILTacPhysics.h)
+add_custom_command(OUTPUT TGANILTriggerDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TGANILTriggerData.h TGANILTriggerDataDict.cxx TGANILTriggerData.rootmap libNPGANIL.dylib DEPENDS TGANILTriggerData.h)
+add_custom_command(OUTPUT TGANILTacDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TGANILTacData.h TGANILTacDataDict.cxx TGANILTacData.rootmap libNPGANIL.dylib DEPENDS TGANILTacData.h)
+add_library(NPGANIL SHARED TGANILTacPhysics.cxx TGANILTacData.cxx TGANILTriggerData.cxx TGANILTacDataDict.cxx TGANILTriggerDataDict.cxx TGANILTacPhysicsDict.cxx)
target_link_libraries(NPGANIL ${ROOT_LIBRARIES} NPCore)
-install(FILES TTacData.h TTriggerData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
+install(FILES TGANILTacData.h TGANILTriggerData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/GANIL/TTacData.cxx b/NPLib/Detectors/GANIL/TTacData.cxx
deleted file mode 100644
index 95d8437a8860f89e381b39fc3b90b7ac19f1bff6..0000000000000000000000000000000000000000
--- a/NPLib/Detectors/GANIL/TTacData.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2009-2016 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: Benjamin Le Crom contact address: lecrom@ipno.in2p3.fr *
- * *
- * Creation Date : *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * *
- * *
- * *
- *---------------------------------------------------------------------------*
- * Comment: *
- * *
- * *
- *****************************************************************************/
-#include <iostream>
-using namespace std;
-
-#include "TTacData.h"
-
-ClassImp(TTacData)
-
-TTacData::TTacData()
-{
- // Default constructor
- Clear();
-}
-
-TTacData::~TTacData()
-{
-}
-
-void TTacData::Clear()
-{
- // (TAC)
- fTAC_MM_CATS1 = -1;
- fTAC_CATS12 = -1;
- fTAC_CATS1_PLD4 = -1;
- fTAC_CATS1_HF = -1;
- fTAC_CATS1_EXO = -1;
- fTAC_MM_HF = -1;
- fTAC_MM_HF_DetectorNbr.clear();
- fTAC_MM_EXO = -1;
- fTAC_BARREL_EXO = -1;
- fTAC_BARREL_CATS1FAG = -1;
- fTAC_HYB_EXO = -1;
- fTAC_HYB_CATS1FAG = -1;
- fTAC_CHAR_EXO = -1;
- fTAC_CHAR_CATS1FAG = -1;
- fTAC_CHAR_PLD4 = -1;
- fTAC_CHAR_GALOTTE = -1;
- fTAC_CATS1_CATS2 = -1;
- fTAC_CATS1_GALOTTE = -1;
- fTAC_FAG_CATS2 = -1;
-}
-
-void TTacData::Dump() const
-{
- cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
- // (TAC)
- cout << "fTAC_MM_CATS1 : " << fTAC_MM_CATS1 << endl;
- cout << "fTAC_CATS12 : " << fTAC_CATS12 << endl;
- cout << "fTAC_CATS1_PLD4 : " << fTAC_CATS1_PLD4 << endl;
- cout << "fTAC_CATS1_HF : " << fTAC_CATS1_HF << endl;
- cout << "fTAC_CATS1_EXO : " << fTAC_CATS1_EXO << endl;
- cout << "fTAC_MM_HF : " << fTAC_MM_HF << endl;
- cout << "fTAC_MM_EXO : " << fTAC_MM_EXO << endl;
- cout << "fTAC_BARREL_EXO : " << fTAC_BARREL_EXO << endl;
- cout << "fTAC_BARREL_CATS1FAG : " << fTAC_BARREL_CATS1FAG << endl;
- cout << "fTAC_HYB_EXO : " << fTAC_HYB_EXO << endl;
- cout << "fTAC_HYB_CATS1FAG : " << fTAC_HYB_CATS1FAG << endl;
- cout << "fTAC_CHAR_EXO : " << fTAC_CHAR_EXO << endl;
- cout << "fTAC_CHAR_CATS1FAG : " << fTAC_CHAR_CATS1FAG << endl;
- cout << "fTAC_CHAR_PLD4 : " << fTAC_CHAR_PLD4 << endl;
- cout << "fTAC_CHAR_GALOTTE : " << fTAC_CHAR_GALOTTE << endl;
- cout << "fTAC_CATS1_CATS2 : " << fTAC_CATS1_CATS2 << endl;
- cout << "fTAC_CATS1_GALOTTE : " << fTAC_CATS1_GALOTTE << endl;
- cout << "fTAC_FAG_CATS2 : " << fTAC_FAG_CATS2 << endl;
-
-
- cout << "TAC_MM_HF_DetectorNbr = " << fTAC_MM_HF_DetectorNbr.size() << endl;
- for (UShort_t i = 0; i < fTAC_MM_HF_DetectorNbr.size(); i++)
- cout << "DetNbr: " << fTAC_MM_HF_DetectorNbr[i] << endl;
-}
diff --git a/NPLib/Detectors/GANIL/TTacData.h b/NPLib/Detectors/GANIL/TTacData.h
deleted file mode 100644
index b7a364121430fb9c38518bfb90b591a416b06a72..0000000000000000000000000000000000000000
--- a/NPLib/Detectors/GANIL/TTacData.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef __TACDATA__
-#define __TACDATA__
-/*****************************************************************************
- * Copyright (C) 2009-2016 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: Benjamin Le Crom contact address: lecrom@ipno.in2p3.fr *
- * *
- * Creation Date : *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * *
- * *
- *---------------------------------------------------------------------------*
- * Comment: *
- * *
- *****************************************************************************/
-#include <vector>
-#include "TObject.h"
-
-
-
-class TTacData : public TObject {
- private:
- // TAC
- UShort_t fTAC_MM_CATS1;
- UShort_t fTAC_CATS12;
- UShort_t fTAC_CATS1_PLD4;
- UShort_t fTAC_CATS1_HF;
- UShort_t fTAC_CATS1_EXO;
- UShort_t fTAC_MM_HF;
- std::vector<UShort_t> fTAC_MM_HF_DetectorNbr;
- UShort_t fTAC_MM_EXO;
- UShort_t fTAC_BARREL_EXO;
- UShort_t fTAC_BARREL_CATS1FAG;
- UShort_t fTAC_HYB_EXO;
- UShort_t fTAC_HYB_CATS1FAG;
- UShort_t fTAC_CHAR_EXO;
- UShort_t fTAC_CHAR_CATS1FAG;
- UShort_t fTAC_CHAR_PLD4;
- UShort_t fTAC_CHAR_GALOTTE;
- UShort_t fTAC_CATS1_CATS2;
- UShort_t fTAC_CATS1_GALOTTE;
- UShort_t fTAC_FAG_CATS2;
-
-
-
- public:
- TTacData();
- virtual ~TTacData();
-
- void Clear();
- void Clear(const Option_t*) {};
- void Dump() const;
-
- ///////////////////// GETTERS ////////////////////////
- // (TAC)
- UShort_t GetTAC_MM_CATS1() {return fTAC_MM_CATS1;}
- UShort_t GetTAC_CATS12() {return fTAC_CATS12;}
- UShort_t GetTAC_CATS1_PLD4() {return fTAC_CATS1_PLD4;}
- UShort_t GetTAC_CATS1_HF() {return fTAC_CATS1_HF;}
- UShort_t GetTAC_CATS1_EXO() {return fTAC_CATS1_EXO;}
- UShort_t GetTAC_MM_HF() {return fTAC_MM_HF;}
- Double_t GetTAC_MM_HF_DetectorNbr(const Int_t i) const {return fTAC_MM_HF_DetectorNbr[i];}
- Double_t GetTAC_MM_EXO() {return fTAC_MM_EXO;}
- Double_t GetTAC_BARREL_EXO() {return fTAC_BARREL_EXO;}
- Double_t GetTAC_BARREL_CATS1FAG() {return fTAC_BARREL_CATS1FAG;}
- Double_t GetTAC_HYB_EXO() {return fTAC_HYB_EXO;}
- Double_t GetTAC_HYB_CATS1FAG() {return fTAC_HYB_CATS1FAG;}
- Double_t GetTAC_CHAR_EXO() {return fTAC_CHAR_EXO;}
- Double_t GetTAC_CHAR_CATS1FAG() {return fTAC_CHAR_CATS1FAG;}
- Double_t GetTAC_CHAR_PLD4() {return fTAC_CHAR_PLD4;}
- Double_t GetTAC_CHAR_GALOTTE() {return fTAC_CHAR_GALOTTE;}
- Double_t GetTAC_CATS1_CATS2() {return fTAC_CATS1_CATS2;}
- Double_t GetTAC_CATS1_GALOTTE() {return fTAC_CATS1_GALOTTE;}
- Double_t GetTAC_FAG_CATS2() {return fTAC_FAG_CATS2;}
-
- ///////////////////// SETTERS ////////////////////////
- // (TAC)
- void SetTAC_MM_CATS1(UShort_t T) {fTAC_MM_CATS1 = T;}
- void SetTAC_CATS12(UShort_t T) {fTAC_CATS12 = T;}
- void SetTAC_CATS1_PLD4(UShort_t T) {fTAC_CATS1_PLD4 = T;}
- void SetTAC_CATS1_HF(UShort_t T) {fTAC_CATS1_HF = T;}
- void SetTAC_CATS1_EXO(UShort_t T) {fTAC_CATS1_EXO = T;}
- void SetTAC_MM_HF(UShort_t T) {fTAC_MM_HF = T;}
- void SetTAC_MM_HF_DetectorNbr(const UShort_t DetNbr) {fTAC_MM_HF_DetectorNbr.push_back(DetNbr);}
- void SetTAC_MM_EXO(UShort_t T) {fTAC_MM_EXO = T;}
- void SetTAC_BARREL_EXO(UShort_t T) {fTAC_BARREL_EXO = T;}
- void SetTAC_BARREL_CATS1FAG(UShort_t T) {fTAC_BARREL_CATS1FAG = T;}
- void SetTAC_HYB_EXO(UShort_t T) {fTAC_HYB_EXO = T;}
- void SetTAC_HYB_CATS1FAG(UShort_t T) {fTAC_HYB_CATS1FAG = T;}
- void SetTAC_CHAR_EXO(UShort_t T) {fTAC_CHAR_EXO = T;}
- void SetTAC_CHAR_CATS1FAG(UShort_t T) {fTAC_CHAR_CATS1FAG = T;}
- void SetTAC_CHAR_PLD4(UShort_t T) {fTAC_CHAR_PLD4 = T;}
- void SetTAC_CHAR_GALOTTE(UShort_t T) {fTAC_CHAR_GALOTTE = T;}
- void SetTAC_CATS1_CATS2(UShort_t T) {fTAC_CATS1_CATS2 = T;}
- void SetTAC_CATS1_GALOTTE(UShort_t T) {fTAC_CATS1_GALOTTE = T;}
- void SetTAC_FAG_CATS2(UShort_t T) {fTAC_FAG_CATS2 = T;}
-
-
- ClassDef(TTacData,3) // TacData structure
-};
-
-#endif
diff --git a/NPLib/Detectors/GANIL/TTacPhysics.cxx b/NPLib/Detectors/GANIL/TTacPhysics.cxx
deleted file mode 100644
index f856f46aa0685cfd92944b510f0f4855bba7262f..0000000000000000000000000000000000000000
--- a/NPLib/Detectors/GANIL/TTacPhysics.cxx
+++ /dev/null
@@ -1,153 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2009-2016 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: L. Lefebvre contact address: lefebvrl@ipno.in2p3.fr *
- * *
- * Creation Date : October 2011 *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * This class hold the Tac Physics *
- * *
- *---------------------------------------------------------------------------*
- * Comment: *
- * *
- * *
- *****************************************************************************/
-
-// NPL
-#include "TTacPhysics.h"
-#include "RootOutput.h"
-#include "RootInput.h"
-#include "NPDetectorFactory.h"
-
-// STL
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <limits>
-#include <stdlib.h>
-using namespace std;
-
-// ROOT
-#include "TChain.h"
-
-// tranform an integer to a string
-string itoa(int value){
- char buffer [33];
- sprintf(buffer,"%d",value);
- return buffer;
-}
-
-ClassImp(TTacPhysics)
-///////////////////////////////////////////////////////////////////////////
-TTacPhysics::TTacPhysics(){
- EventData = new TTacData ;
- EventPhysics = this ;
-}
-
-///////////////////////////////////////////////////////////////////////////
-TTacPhysics::~TTacPhysics(){
-}
-
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::Clear()
- {
- TacNumber.clear() ;
- Time_TAC_1 =0;
- Time_TAC_2 =0;
- Time_TAC_3 =0;
- Time_TAC_4 =0;
-
- }
-
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::ReadConfiguration(NPL::InputParser ) {
-}
-
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::AddParameterToCalibrationManager()
- {
- CalibrationManager* Cal = CalibrationManager::getInstance();
-
- for(int i = 0 ; i < 8 ; i++)
- {
- Cal->AddParameter("TAC", "_T"+ NPL::itoa(i+1),"TAC_T"+ NPL::itoa(i+1)) ;
- }
- }
-
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::InitializeRootInputRaw()
- {
- TChain* inputChain = RootInput::getInstance()->GetChain() ;
- inputChain->SetBranchStatus ( "TAC" , true ) ;
- inputChain->SetBranchStatus ( "fTAC_MM*" , true ) ;
- inputChain->SetBranchAddress( "TAC" , &EventData ) ;
- }
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::InitializeRootInputPhysics()
- {
- TChain* inputChain = RootInput::getInstance()->GetChain();
- inputChain->SetBranchStatus ( "Tac", true );
- inputChain->SetBranchStatus ( "TacNumber", true );
- inputChain->SetBranchStatus ( "Time_TAC_1", true );
- inputChain->SetBranchStatus ( "Time_TAC_2", true );
- inputChain->SetBranchStatus ( "Time_TAC_3", true );
- inputChain->SetBranchStatus ( "Time_TAC_4", true );
-
- inputChain->SetBranchAddress( "Tac", &EventPhysics );
- }
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::InitializeRootOutput()
- {
- TTree* outputTree = RootOutput::getInstance()->GetTree() ;
- outputTree->Branch( "Tac" , "TTacPhysics" , &EventPhysics ) ;
- }
-
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::BuildPhysicalEvent()
- {
- BuildSimplePhysicalEvent() ;
- }
-
-///////////////////////////////////////////////////////////////////////////
-void TTacPhysics::BuildSimplePhysicalEvent()
- {
- for(int i=0;i<8;i++)
- {
- TacNumber.push_back(EventData->GetTAC_MM_HF_DetectorNbr(i));
- }
- Time_TAC_1=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPL::itoa( EventData->GetTAC_MM_HF_DetectorNbr(0) ),EventData->GetTAC_MM_HF() );
- Time_TAC_2=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPL::itoa( EventData->GetTAC_MM_HF_DetectorNbr(1) ),EventData->GetTAC_MM_HF() );
- Time_TAC_3=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPL::itoa( EventData->GetTAC_MM_HF_DetectorNbr(2) ),EventData->GetTAC_MM_HF() );
- Time_TAC_4=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + NPL::itoa( EventData->GetTAC_MM_HF_DetectorNbr(3) ),EventData->GetTAC_MM_HF() );
-
- }
-
-////////////////////////////////////////////////////////////////////////////////
-// Construct Method to be pass to the DetectorFactory //
-////////////////////////////////////////////////////////////////////////////////
-NPL::VDetector* TTacPhysics::Construct(){
- return (NPL::VDetector*) new TTacPhysics();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Registering the construct method to the factory //
-////////////////////////////////////////////////////////////////////////////////
-extern "C"{
-class proxy_tac{
- public:
- proxy_tac(){
- NPL::DetectorFactory::getInstance()->AddToken("Tac","Tac");
- NPL::DetectorFactory::getInstance()->AddDetector("Tac",TTacPhysics::Construct);
- }
-};
-
-proxy_tac p_tac;
-}
-
diff --git a/NPLib/Detectors/GANIL/TTacPhysics.h b/NPLib/Detectors/GANIL/TTacPhysics.h
deleted file mode 100644
index c80861f1da915a3bcf53aec5b9c5688fefa58a41..0000000000000000000000000000000000000000
--- a/NPLib/Detectors/GANIL/TTacPhysics.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef __TacPhysics__
-#define __TacPhysics__
-/*****************************************************************************
- * Copyright (C) 2009-2016 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: L. Lefebvre contact address: lefebvrl@ipno.in2p3.fr *
- * *
- * Creation Date : October 2011 *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * This class hold the Tac Physics *
- * *
- *---------------------------------------------------------------------------*
- * Comment: *
- * *
- * *
- *****************************************************************************/
-
-// STL
-#include <vector>
-using namespace std ;
-
-// ROOT
-#include "TObject.h"
-
-// NPL
-#include "TTacData.h"
-#include "NPVDetector.h"
-#include "NPCalibrationManager.h"
-#include "NPInputParser.h"
-
-class TTacPhysics : public TObject, public NPL::VDetector
-{
- public: // Constructor and Destructor
- TTacPhysics();
- ~TTacPhysics();
-
- public:
- void Clear();
- void Clear(const Option_t*) {};
-
- public: // Calibrated Data
- Double_t Time_TAC_1 ;
- Double_t Time_TAC_2 ;
- Double_t Time_TAC_3 ;
- Double_t Time_TAC_4 ;
- vector<UShort_t> TacNumber;
-
- public: // inherrited from VDetector
- // Read stream at ConfigFile to pick-up parameters of detector (Position,...) using Token
- void ReadConfiguration(NPL::InputParser);
-
-
- // Add Parameter to the CalibrationManger
- void AddParameterToCalibrationManager();
-
- // 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 InitializeRootInputRaw() ;
-
- // Activated associated Branches and link it to the private member DetectorPhysics address
- // 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();
-
- // This method is called at each event read from the Input Tree. Aime is to build treat Raw dat in order to extract physical parameter.
- void BuildPhysicalEvent();
-
- // Same as above, but only the simplest event and/or simple method are used (low multiplicity, faster algorythm but less efficient ...).
- // This method aimed to be used for analysis performed during experiment, when speed is requiered.
- // NB: This method can eventually be the same as BuildPhysicalEvent.
- void BuildSimplePhysicalEvent();
-
- // Same as above but for online analysis
- void BuildOnlinePhysicalEvent() {BuildPhysicalEvent();};
-
- // Give and external TTacData object to TTacPhysics. Needed for online analysis for example.
- void SetRawDataPointer(TTacData* rawDataPointer) {EventData = rawDataPointer;}
-
- // Those two method all to clear the Event Physics or Data
- void ClearEventPhysics() {Clear();}
- void ClearEventData() {EventData->Clear();}
-
- private: // Data not writted in the tree
- TTacData* EventData ;//!
- TTacPhysics* EventPhysics ;//!
-
- public: // Static constructor to be passed to the Detector Factory
- static NPL::VDetector* Construct();
- ClassDef(TTacPhysics,1) // TacPhysics structure
-};
-
-#endif
diff --git a/NPLib/Detectors/GANIL/TTriggerData.cxx b/NPLib/Detectors/GANIL/TTriggerData.cxx
deleted file mode 100644
index 900d040daf323286de6518edb19d754ee0d6c009..0000000000000000000000000000000000000000
--- a/NPLib/Detectors/GANIL/TTriggerData.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2009-2016 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: contact address: *
- * *
- * Creation Date : *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * *
- * *
- * *
- *---------------------------------------------------------------------------*
- * Comment: *
- * *
- * *
- *****************************************************************************/
-#include <iostream>
-using namespace std;
-
-#include "TTriggerData.h"
-
-
-ClassImp(TTriggerData)
-
-TTriggerData::TTriggerData()
-{
- // Default constructor
-
- // (T)
- fTRIG_1 = -1;
- fTRIG_2 = -1;
- fTRIG_3 = -1;
- fTRIG_4 = -1;
- fTRIG_5 = -1;
-}
-
-TTriggerData::~TTriggerData()
-{
-}
-
-void TTriggerData::Clear()
-{
- // (T)
- fTRIG_1 = -1;
- fTRIG_2 = -1;
- fTRIG_3 = -1;
- fTRIG_4 = -1;
- fTRIG_5 = -1;
-}
-
-void TTriggerData::Dump() const
-{
- cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
-
- cout << "TRIG_1 : " << fTRIG_1 << endl;
- cout << "TRIG_2 : " << fTRIG_2 << endl;
- cout << "TRIG_3 : " << fTRIG_3 << endl;
- cout << "TRIG_4 : " << fTRIG_4 << endl;
- cout << "TRIG_5 : " << fTRIG_5 << endl;
-}
diff --git a/NPLib/Detectors/GANIL/TTriggerData.h b/NPLib/Detectors/GANIL/TTriggerData.h
deleted file mode 100644
index dac86ca35429d723bb3434e60c3ec87b69c8e047..0000000000000000000000000000000000000000
--- a/NPLib/Detectors/GANIL/TTriggerData.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef __TRIGGERDATA__
-#define __TRIGGERDATA__
-/*****************************************************************************
- * Copyright (C) 2009-2016 this file is part of the NPTool Project *
- * *
- * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
- * For the list of contributors see $NPTOOL/Licence/Contributors *
- *****************************************************************************/
-
-/*****************************************************************************
- * Original Author: contact address: *
- * *
- * Creation Date : *
- * Last update : *
- *---------------------------------------------------------------------------*
- * Decription: *
- * *
- * *
- *---------------------------------------------------------------------------*
- * Comment: *
- * *
- *****************************************************************************/
-#include <vector>
-
-#include "TObject.h"
-
-class TTriggerData : public TObject
-{
- private:
- // TDC ????
- UShort_t fTRIG_1;
- UShort_t fTRIG_2;
- UShort_t fTRIG_3;
- UShort_t fTRIG_4;
- UShort_t fTRIG_5;
-
- public:
- TTriggerData();
- virtual ~TTriggerData();
-
- void Clear();
- void Clear(const Option_t*) {};
- void Dump() const;
-
- ///////////////////// GETTERS ////////////////////////
- // (T)
- UShort_t GetTRIG1() {return fTRIG_1;}
- UShort_t GetTRIG2() {return fTRIG_2;}
- UShort_t GetTRIG3() {return fTRIG_3;}
- UShort_t GetTRIG4() {return fTRIG_4;}
- UShort_t GetTRIG5() {return fTRIG_5;}
-
-
- ///////////////////// SETTERS ////////////////////////
- // (T)
- void SetTRIG1(UShort_t T) {fTRIG_1 = T;}
- void SetTRIG2(UShort_t T) {fTRIG_2 = T;}
- void SetTRIG3(UShort_t T) {fTRIG_3 = T;}
- void SetTRIG4(UShort_t T) {fTRIG_4 = T;}
- void SetTRIG5(UShort_t T) {fTRIG_5 = T;}
-
- ClassDef(TTriggerData,1) // TriggerData structure
-};
-
-#endif