diff --git a/NPLib/Exogam/TExogamPhysics.cxx b/NPLib/Exogam/TExogamPhysics.cxx
index 7cd04c87b84a9d7a779b5d7d7f02fbffc5f3c8b7..2f7b30e9de71cc12da2864f0f690439f261173cd 100644
--- a/NPLib/Exogam/TExogamPhysics.cxx
+++ b/NPLib/Exogam/TExogamPhysics.cxx
@@ -7,8 +7,8 @@
/*****************************************************************************
* Original Author: Sandra GIRON contact address: giron@ipno.in2p3.fr *
- * *
- * Creation Date : july 2010 *
+ * Benjamin LE CROM lecrom@ipno.in2p3.fr *
+ * Creation Date : march 2014 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
@@ -556,11 +556,19 @@ void TExogamPhysics::ClearSpectra(){
// To be done
}
///////////////////////////////////////////////////////////////////////////
+<<<<<<< HEAD
+map< vector<TString> , TH1*> TExogamPhysics::GetSpectra() {
+ if(m_Spectra)
+ return m_Spectra->GetMapHisto();
+ else{
+ map< vector<TString> , TH1*> empty;
+=======
map< vector<string> , TH1*> TExogamPhysics::GetSpectra() {
if(m_Spectra)
return m_Spectra->GetMapHisto();
else{
map< vector<string> , TH1*> empty;
+>>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
return empty;
}
}
@@ -663,7 +671,37 @@ void TExogamPhysics::InitializeRootInputRaw()
outputList->Add(cristal_mult);
*/
}
-
+
+/////////////////////////////////////////////////////////////////////
+// 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 TExogamPhysics::InitializeRootInputPhysics() {
+ TChain* inputChain = RootInput::getInstance()->GetChain();
+ inputChain->SetBranchStatus( "EventMultiplicty" , true );
+ inputChain->SetBranchStatus( "ECC_Multiplicity" , true );
+ inputChain->SetBranchStatus( "GOCCE_Multiplicity" , true );
+ inputChain->SetBranchStatus( "ECC_CloverNumber" , true );
+ inputChain->SetBranchStatus( "ECC_CristalNumber" , true );
+ inputChain->SetBranchStatus( "GOCCE_CloverNumber" , true );
+ inputChain->SetBranchStatus( "GOCCE_CristalNumber" , true );
+ inputChain->SetBranchStatus( "GOCCE_SegmentNumber" , true );
+ inputChain->SetBranchStatus( "ECC_E" , true );
+ inputChain->SetBranchStatus( "ECC_T" , true );
+ inputChain->SetBranchStatus( "GOCCE_E" , true );
+ inputChain->SetBranchStatus( "CristalNumber" , true );
+ inputChain->SetBranchStatus( "SegmentNumber" , true );
+ inputChain->SetBranchStatus( "CloverNumber" , true );
+ inputChain->SetBranchStatus( "CloverMult" , true );
+ inputChain->SetBranchStatus( "TotalEnergy_lab" , true );
+ inputChain->SetBranchStatus( "Time" , true );
+ inputChain->SetBranchStatus( "DopplerCorrectedEnergy" , true );
+ inputChain->SetBranchStatus( "Position" , true );
+ inputChain->SetBranchStatus( "Theta" , true );
+ inputChain->SetBranchAddress( "EXOGAM" , &EventPhysics );
+
+}
+
+/////////////////////////////////////////////////////////////////////
// Create associated branches and associated private member DetectorPhysics address
void TExogamPhysics::InitializeRootOutput()
diff --git a/NPLib/Exogam/TExogamPhysics.h b/NPLib/Exogam/TExogamPhysics.h
index 266360a16b19f7392af7dcf19a9c9e1dc35c258b..3252c28b6f561782f429933fe55ae471fcb0d872 100644
--- a/NPLib/Exogam/TExogamPhysics.h
+++ b/NPLib/Exogam/TExogamPhysics.h
@@ -9,8 +9,8 @@
/*****************************************************************************
* Original Author: S. Giron contact address: giron@ipno.in2p3.fr *
- * *
- * Creation Date : febuary 2009 *
+ * B. Le Crom lecrom@ipno.in2p3.fr *
+ * Creation Date : march 2014 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
@@ -108,6 +108,9 @@ class TExogamPhysics : public TObject, public NPA::VDetector
// 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() ;
diff --git a/NPLib/Exogam/TExogamSpectra.cxx b/NPLib/Exogam/TExogamSpectra.cxx
index 6b879640c16581762a482f5fa9695668b0ce9c21..954dde526046c9314bfdd36f0e437b52194667d2 100644
--- a/NPLib/Exogam/TExogamSpectra.cxx
+++ b/NPLib/Exogam/TExogamSpectra.cxx
@@ -44,7 +44,6 @@ using namespace NPUNITS;
////////////////////////////////////////////////////////////////////////////////
TExogamSpectra::TExogamSpectra(){
- fNumberOfClover = 0;
fnbinsRaw=16384;
fbinRawMin=0;
fbinRawMax=16384;
@@ -61,13 +60,19 @@ TExogamSpectra::TExogamSpectra(unsigned int NumberOfClover){
<< "TExogamSpectra : Initalising control spectra for "
<< NumberOfClover << " Clover" << endl
<< "************************************************" << endl ;
-
fNumberOfClover = NumberOfClover;
- fNumberOfSegments=16;
+ fNumberOfSegments=4;
fNumberOfCores=4;
InitRawSpectra();
InitPreTreatedSpectra();
InitPhysicsSpectra();
+ fnbinsRaw=4096;
+ fbinRawMin=0;
+ fbinRawMax=16384;
+ fnbinsCal=5000;
+ fbinCalMin=0;
+ fbinCalMax=5000;
+
}
////////////////////////////////////////////////////////////////////////////////
@@ -81,15 +86,13 @@ void TExogamSpectra::InitRawSpectra(){
for (unsigned int j = 0; j < fNumberOfCores; j++) { // loop on number of cores
name = Form("ExogamEnergyRaw_Clover%d_ECC%d", i+1, j+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/RAW");
+ AddHisto1D(name, name, 16384, 0, 16384, "Exogam/ERAW/ECC");
name = Form("ExogamTimeRaw_Clover%d_ECC%d", i+1, j+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/RAW");
+ AddHisto1D(name, name, 16384, 0, 16384, "Exogam/TRAW/ECC");
for (unsigned int k = 0; k < fNumberOfSegments; k++) { // loop on number of segments
name = Form("ExogamEnergyRaw_Clover%d_ECC%d_GOCCE%d", i+1, j+1, k+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/RAW");
- name = Form("ExogamEnergyDC_Clover%d_ECC%d_GOCCE%d", i+1, j+1, k+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/RAW");
+ AddHisto1D(name, name, 16384, 0, 16384, "Exogam/ERAW/GOCCE");
}
}
} // end loop on number of detectors
@@ -103,15 +106,14 @@ void TExogamSpectra::InitPreTreatedSpectra()
for (unsigned int i = 0; i < fNumberOfClover; i++) { // loop on number of detectors
for (unsigned int j = 0; j < fNumberOfCores; j++) { // loop on number of cores
name = Form("ExogamEnergyCal_Clover%d_ECC%d", i+1, j+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/Cal");
+ AddHisto1D(name, name, 5000, 0, 5000, "Exogam/ECal/ECC");
name = Form("ExogamTimeCal_Clover%d_ECC%d", i+1, j+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/Cal");
+ AddHisto1D(name, name, 5000, 0, 5000, "Exogam/TCal/ECC");
for (unsigned int k = 0; k < fNumberOfSegments; k++) { // loop on number of segments
name = Form("ExogamEnergyCal_Clover%d_ECC%d_GOCCE%d", i+1, j+1, k+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/Cal");
- name = Form("ExogamTimeCal_Clover%d_ECC%d_GOCCE%d", i+1, j+1, k+1);
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/Cal");
+ AddHisto1D(name, name, 5000, 0, 5000, "Exogam/ECal/GOCCE");
+
}
}
} // end loop on number of detectors
@@ -121,7 +123,7 @@ void TExogamSpectra::InitPreTreatedSpectra()
void TExogamSpectra::InitPhysicsSpectra(){
string name;
name = "ExogamEnergyAddBack";
- AddHisto1D(name, name, fnbinsRaw, fbinRawMin, fbinRawMax, "Exogam/DC");
+ AddHisto1D(name, name, 5000, 0, 5000, "Exogam/DC");
}
@@ -129,28 +131,52 @@ void TExogamSpectra::InitPhysicsSpectra(){
////////////////////////////////////////////////////////////////////////////////
void TExogamSpectra::FillRawSpectra(TExogamData* RawData){
+<<<<<<< HEAD
+ TString name;
+ TString family;
+ // Energy and Time RAw
+=======
string name;
string family;
// Energy
+>>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
for (unsigned int i = 0; i < RawData->GetECCEMult(); i++) {
- name = Form("ExogamEnergyRaw_Clover%d_ECC%d", RawData->GetECCEClover(i)+1,RawData->GetECCECristal(i)+1);
- family = "Exogam/RAW";
+ name = Form("ExogamEnergyRaw_Clover%d_ECC%d", RawData->GetECCEClover(i)+1,RawData->GetECCECristal(i)+1);
+ family = "Exogam/ERAW/ECC";
GetHisto(family,name)
-> Fill(RawData->GetECCEEnergy(i));
+<<<<<<< HEAD
+ }
+
+ for (unsigned int i = 0; i < RawData->GetGOCCEEMult(); i++) {
+ name = Form("ExogamEnergyRaw_Clover%d_ECC%d_GOCCE%d", RawData->GetGOCCEEClover(i)+1,RawData->GetGOCCEECristal(i)+1,RawData->GetGOCCEESegment(i)+1);
+ family = "Exogam/ERAW/GOCCE";
+=======
name = Form("ExogamEnergyRaw_Clover%d_ECC%d_GOCCE%d", RawData->GetECCEClover(i)+1,RawData->GetECCECristal(i)+1,RawData->GetGOCCEESegment(i)+1);
family = "Exogam/RAW";
+>>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
GetHisto(family,name)
-> Fill(RawData->GetGOCCEEEnergy(i));
}
+<<<<<<< HEAD
+ for (unsigned int i = 0; i < RawData->GetECCTMult(); i++) {
+ name = Form("ExogamTimeRaw_Clover%d_ECC%d", RawData->GetECCTClover(i)+1,RawData->GetECCTCristal(i)+1);
+ family = "Exogam/TRAW/ECC";
+
+ GetHisto(family,name)
+ -> Fill(RawData->GetECCTTime(i));
+ }
+=======
// Time
for (unsigned int i = 0; i < RawData->GetECCTMult(); i++) {
name = Form("ExogamTimeRaw_Clover%d_ECC%d", RawData->GetECCTClover(i)+1,RawData->GetECCTCristal(i)+1);
family = "Exogam/RAW";
+>>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
GetHisto(family,name)
-> Fill(RawData->GetECCTTime(i));
@@ -159,16 +185,41 @@ void TExogamSpectra::FillRawSpectra(TExogamData* RawData){
////////////////////////////////////////////////////////////////////////////////
void TExogamSpectra::FillPreTreatedSpectra(TExogamData* PreTreatedData){
+<<<<<<< HEAD
+ TString name ;
+ TString family;
+ // Energy and Time Cal
+=======
string name ;
string family;
// Energy
+>>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
for (unsigned int i = 0; i < PreTreatedData->GetECCEMult(); i++) {
name = Form("ExogamEnergyCal_Clover%d_ECC%d", PreTreatedData->GetECCEClover(i)+1,PreTreatedData->GetECCECristal(i)+1);
- family = "Exogam/Cal";
+ family = "Exogam/ECal/ECC";
GetHisto(family,name)
-> Fill(PreTreatedData->GetECCEEnergy(i));
+ }
+ for (unsigned int i = 0; i < PreTreatedData->GetGOCCEEMult(); i++) {
+ name = Form("ExogamEnergyCal_Clover%d_ECC%d_GOCCE%d", PreTreatedData->GetGOCCEEClover(i)+1,PreTreatedData->GetGOCCEECristal(i)+1,PreTreatedData->GetGOCCEESegment(i)+1);
+ family = "Exogam/ECal/GOCCE";
+
+ GetHisto(family,name)
+ -> Fill(PreTreatedData->GetGOCCEEEnergy(i));
+ }
+
+<<<<<<< HEAD
+ for (unsigned int i = 0; i < PreTreatedData->GetECCTMult(); i++) {
+ name = Form("ExogamTimeCal_Clover%d_ECC%d", PreTreatedData->GetECCTClover(i)+1,PreTreatedData->GetECCTCristal(i)+1);
+ family = "Exogam/TCal/ECC";
+
+ GetHisto(family,name)
+ -> Fill(PreTreatedData->GetECCTTime(i));
+
+ }
+=======
name = Form("ExogamEnergyCal_Clover%d_ECC%d_GOCCE%d", PreTreatedData->GetECCEClover(i)+1,PreTreatedData->GetECCECristal(i)+1,PreTreatedData->GetGOCCEESegment(i)+1);
family = "Exogam/Cal";
@@ -185,6 +236,7 @@ void TExogamSpectra::FillPreTreatedSpectra(TExogamData* PreTreatedData){
GetHisto(family,name)
-> Fill(PreTreatedData->GetECCTTime(i));
}
+>>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
}
diff --git a/NPLib/MUST2/TMust2Spectra.cxx b/NPLib/MUST2/TMust2Spectra.cxx
index e1c3ee32c81ded8dc7f5cf6e0bbd26d8c2ff3947..d451dee213bf7046ce88091bb456a821624d0f03 100644
--- a/NPLib/MUST2/TMust2Spectra.cxx
+++ b/NPLib/MUST2/TMust2Spectra.cxx
@@ -7,8 +7,8 @@
/*****************************************************************************
* Original Author: N. de Sereville contact address: deserevi@ipno.in2p3.fr *
- * *
- * Creation Date : march 2011 *
+ * B. Le Crom lecrom@ipno.in2p3.fr *
+ * Creation Date : April 2014 *
* Last update : *
*---------------------------------------------------------------------------*
* Decription: *
@@ -276,7 +276,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
GetHisto(family,name)
-> Fill(RawData->GetMMStripXTStripNbr(i),
- RawData->GetMMStripXTTime(i) - 8192);
+ 8192 - RawData->GetMMStripXTTime(i));
}
// STRY_T
for (unsigned int i = 0; i < RawData->GetMMStripYTMult(); i++) {
@@ -285,7 +285,7 @@ void TMust2Spectra::FillRawSpectra(TMust2Data* RawData){
GetHisto(family,name)
-> Fill(RawData->GetMMStripYTStripNbr(i),
- 8192 - RawData->GetMMStripYTTime(i));
+ RawData->GetMMStripYTTime(i) - 8192);
}
// SILI_E
diff --git a/NPLib/Misc/TTacData.cxx b/NPLib/Misc/TTacData.cxx
index 202455319aa96ec95cc1ee0bcf51e151c345de17..95e1bb8895df5a36279bcbfec389daf047ede463 100644
--- a/NPLib/Misc/TTacData.cxx
+++ b/NPLib/Misc/TTacData.cxx
@@ -6,7 +6,7 @@
*****************************************************************************/
/*****************************************************************************
- * Original Author: contact address: *
+ * Original Author: Benjamin Le Crom contact address: lecrom@ipno.in2p3.fr *
* *
* Creation Date : *
* Last update : *
@@ -40,24 +40,25 @@ TTacData::~TTacData()
void TTacData::Clear()
{
// (TAC)
- fTAC_MM_CATS1 = -1;
- fTAC_MM_CATS2 = -1;
- fTAC_PL_CATS1 = -1;
- fTAC_PL_CATS2 = -1;
- fTAC_CATS12 = -1;
- fTAC_PL_GAL = -1;
- fTAC_CATS1_HF = -1;
- fTAC_CATS2_HF = -1;
- fTAC_MM_HF = -1;
- fTAC_MM1_HF = -1;
- fTAC_MM2_HF = -1;
- fTAC_MM3_HF = -1;
- fTAC_MM4_HF = -1;
- fTAC_MM5_HF = -1;
- fTAC_MM6_HF = -1;
- fTAC_MM7_HF = -1;
- fTAC_MM8_HF = -1;
+ 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
@@ -65,22 +66,24 @@ void TTacData::Dump() const
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
// (TAC)
cout << "fTAC_MM_CATS1 : " << fTAC_MM_CATS1 << endl;
- cout << "fTAC_MM_CATS2 : " << fTAC_MM_CATS2 << endl;
- cout << "fTAC_PL_CATS1 : " << fTAC_PL_CATS1 << endl;
- cout << "fTAC_PL_CATS2 : " << fTAC_PL_CATS2 << endl;
- cout << "fTAC_CATS12 : " << fTAC_CATS12 << endl;
- cout << "fTAC_PL_GAL : " << fTAC_PL_GAL << 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_CATS2_HF : " << fTAC_CATS2_HF << endl;
- cout << "fTAC_MM_HF : " << fTAC_MM_HF << endl;
- cout << "fTAC_MM1_HF : " << fTAC_MM1_HF << endl;
- cout << "fTAC_MM2_HF : " << fTAC_MM2_HF << endl;
- cout << "fTAC_MM3_HF : " << fTAC_MM3_HF << endl;
- cout << "fTAC_MM4_HF : " << fTAC_MM4_HF << endl;
- cout << "fTAC_MM5_HF : " << fTAC_MM5_HF << endl;
- cout << "fTAC_MM6_HF : " << fTAC_MM6_HF << endl;
- cout << "fTAC_MM7_HF : " << fTAC_MM7_HF << endl;
- cout << "fTAC_MM8_HF : " << fTAC_MM8_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++)
diff --git a/NPLib/Misc/TTacData.h b/NPLib/Misc/TTacData.h
index e15c86a7eefa24de2b3536309f4e52c80dcae505..fc24623e16ecc608297c6269c006315da2f369d4 100644
--- a/NPLib/Misc/TTacData.h
+++ b/NPLib/Misc/TTacData.h
@@ -8,7 +8,7 @@
*****************************************************************************/
/*****************************************************************************
- * Original Author: contact address: *
+ * Original Author: Benjamin Le Crom contact address: lecrom@ipno.in2p3.fr *
* *
* Creation Date : *
* Last update : *
@@ -29,23 +29,26 @@ class TTacData : public TObject {
private:
// TAC
UShort_t fTAC_MM_CATS1;
- UShort_t fTAC_MM_CATS2;
- UShort_t fTAC_PL_CATS1;
- UShort_t fTAC_PL_CATS2;
UShort_t fTAC_CATS12;
- UShort_t fTAC_PL_GAL;
+ UShort_t fTAC_CATS1_PLD4;
UShort_t fTAC_CATS1_HF;
- UShort_t fTAC_CATS2_HF;
+ UShort_t fTAC_CATS1_EXO;
UShort_t fTAC_MM_HF;
- UShort_t fTAC_MM1_HF;
- UShort_t fTAC_MM2_HF;
- UShort_t fTAC_MM3_HF;
- UShort_t fTAC_MM4_HF;
- UShort_t fTAC_MM5_HF;
- UShort_t fTAC_MM6_HF;
- UShort_t fTAC_MM7_HF;
- UShort_t fTAC_MM8_HF;
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();
@@ -57,45 +60,47 @@ class TTacData : public TObject {
///////////////////// GETTERS ////////////////////////
// (TAC)
- UShort_t GetTAC_MM_CATS1() {return fTAC_MM_CATS1;}
- UShort_t GetTAC_MM_CATS2() {return fTAC_MM_CATS2;}
- UShort_t GetTAC_PL_CATS1() {return fTAC_PL_CATS1;}
- UShort_t GetTAC_PL_CATS2() {return fTAC_PL_CATS2;}
- UShort_t GetTAC_CATS12() {return fTAC_CATS12;}
- UShort_t GetTAC_PL_GAL() {return fTAC_PL_GAL;}
- UShort_t GetTAC_CATS1_HF() {return fTAC_CATS1_HF;}
- UShort_t GetTAC_CATS2_HF() {return fTAC_CATS2_HF;}
- UShort_t GetTAC_MM_HF() {return fTAC_MM_HF;}
- Double_t GetTAC_MM1_HF() {return fTAC_MM1_HF;}
- Double_t GetTAC_MM2_HF() {return fTAC_MM2_HF;}
- Double_t GetTAC_MM3_HF() {return fTAC_MM3_HF;}
- Double_t GetTAC_MM4_HF() {return fTAC_MM4_HF;}
- Double_t GetTAC_MM5_HF() {return fTAC_MM5_HF;}
- Double_t GetTAC_MM6_HF() {return fTAC_MM6_HF;}
- Double_t GetTAC_MM7_HF() {return fTAC_MM7_HF;}
- Double_t GetTAC_MM8_HF() {return fTAC_MM8_HF;}
+ 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_MM_CATS2(UShort_t T) {fTAC_MM_CATS2 = T;}
- void SetTAC_PL_CATS1(UShort_t T) {fTAC_PL_CATS1 = T;}
- void SetTAC_PL_CATS2(UShort_t T) {fTAC_PL_CATS2 = T;}
- void SetTAC_CATS12(UShort_t T) {fTAC_CATS12 = T;}
- void SetTAC_PL_GAL(UShort_t T) {fTAC_PL_GAL = 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_CATS2_HF(UShort_t T) {fTAC_CATS2_HF = T;}
- void SetTAC_MM_HF(UShort_t T) {fTAC_MM_HF = T;}
- void SetTAC_MM1_HF(UShort_t T) {fTAC_MM1_HF = T;}
- void SetTAC_MM2_HF(UShort_t T) {fTAC_MM2_HF = T;}
- void SetTAC_MM3_HF(UShort_t T) {fTAC_MM3_HF = T;}
- void SetTAC_MM4_HF(UShort_t T) {fTAC_MM4_HF = T;}
- void SetTAC_MM5_HF(UShort_t T) {fTAC_MM5_HF = T;}
- void SetTAC_MM6_HF(UShort_t T) {fTAC_MM6_HF = T;}
- void SetTAC_MM7_HF(UShort_t T) {fTAC_MM7_HF = T;}
- void SetTAC_MM8_HF(UShort_t T) {fTAC_MM8_HF = T;}
- void SetTAC_MM_HF_DetectorNbr(const UShort_t DetNbr) {fTAC_MM_HF_DetectorNbr.push_back(DetNbr);}
+ 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,2) // TacData structure
diff --git a/NPLib/Misc/TTacPhysics.cxx b/NPLib/Misc/TTacPhysics.cxx
index 8cc3c362784395d9364504c5d475837d954f2882..251cf6e332730921be1510b8b824c463ac39434f 100644
--- a/NPLib/Misc/TTacPhysics.cxx
+++ b/NPLib/Misc/TTacPhysics.cxx
@@ -64,10 +64,7 @@ void TTacPhysics::Clear()
Time_TAC_2 =0;
Time_TAC_3 =0;
Time_TAC_4 =0;
- Time_TAC_5 =0;
- Time_TAC_6 =0;
- Time_TAC_7 =0;
- Time_TAC_8 =0;
+
}
///////////////////////////////////////////////////////////////////////////
@@ -105,10 +102,7 @@ void TTacPhysics::InitializeRootInputPhysics()
inputChain->SetBranchStatus ( "Time_TAC_2", true );
inputChain->SetBranchStatus ( "Time_TAC_3", true );
inputChain->SetBranchStatus ( "Time_TAC_4", true );
- inputChain->SetBranchStatus ( "Time_TAC_5", true );
- inputChain->SetBranchStatus ( "Time_TAC_6", true );
- inputChain->SetBranchStatus ( "Time_TAC_7", true );
- inputChain->SetBranchStatus ( "Time_TAC_8", true );
+
inputChain->SetBranchAddress( "Tac", &EventPhysics );
}
///////////////////////////////////////////////////////////////////////////
@@ -135,9 +129,6 @@ void TTacPhysics::BuildSimplePhysicalEvent()
Time_TAC_2=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(1) ),EventData->GetTAC_MM2_HF() );
Time_TAC_3=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(2) ),EventData->GetTAC_MM3_HF() );
Time_TAC_4=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(3) ),EventData->GetTAC_MM4_HF() );
- Time_TAC_5=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(4) ),EventData->GetTAC_MM5_HF() );
- Time_TAC_6=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(5) ),EventData->GetTAC_MM6_HF() );
- Time_TAC_7=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(6) ),EventData->GetTAC_MM7_HF() );
- Time_TAC_8=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(7) ),EventData->GetTAC_MM8_HF() );
+
}
diff --git a/NPLib/Misc/TTacPhysics.h b/NPLib/Misc/TTacPhysics.h
index 966f190152452589f9bf463b960561e0fae79810..0edaca5f1a0367f1331e2aff102d5bae9e181d06 100644
--- a/NPLib/Misc/TTacPhysics.h
+++ b/NPLib/Misc/TTacPhysics.h
@@ -49,10 +49,6 @@ class TTacPhysics : public TObject, public NPA::VDetector
Double_t Time_TAC_2 ;
Double_t Time_TAC_3 ;
Double_t Time_TAC_4 ;
- Double_t Time_TAC_5 ;
- Double_t Time_TAC_6 ;
- Double_t Time_TAC_7 ;
- Double_t Time_TAC_8 ;
vector<UShort_t> TacNumber;
public: // inherrited from VDetector