Skip to content
Snippets Groups Projects
Commit dc0fe8ce authored by e644's avatar e644
Browse files

Merge branch 'NPTool.dev.prerelease' of https://github.com/adrien-matta/nptool... 

Merge branch 'NPTool.dev.prerelease' of https://github.com/adrien-matta/nptool into NPTool.dev.prerelease

Conflicts:
	NPLib/Exogam/TExogamPhysics.cxx
parents d5c7db11 49b9dea0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 236 additions and 163 deletions
NPAnalysis/MakePhysicalTree/Analysis.cxx
+ 18
− 0
View file @ dc0fe8ce
...@@ -27,8 +27,13 @@ int main(int argc, char** argv) ...@@ -27,8 +27,13 @@ int main(int argc, char** argv)
// Instantiate the detector using a file // Instantiate the detector using a file
NPA::DetectorManager* myDetector = new DetectorManager(); NPA::DetectorManager* myDetector = new DetectorManager();
myDetector->ReadConfigurationFile(detectorfileName); myDetector->ReadConfigurationFile(detectorfileName);
double EGammaDC[4];
RootOutput::getInstance()->GetTree()->Branch("EGammaDC", &EGammaDC, "EGammaDC[4]/D");
float beta=0.17;
// Get the formed Chained Tree and Treat it // Get the formed Chained Tree and Treat it
TChain* Chain = RootInput:: getInstance() -> GetChain(); TChain* Chain = RootInput:: getInstance() -> GetChain();
TExogamPhysics *Exo = (TExogamPhysics*) myDetector -> GetDetector("EXOGAM") ;
// Get number of events to treat // Get number of events to treat
cout << endl << "///////// Starting Analysis ///////// "<< endl; cout << endl << "///////// Starting Analysis ///////// "<< endl;
...@@ -61,6 +66,19 @@ int main(int argc, char** argv) ...@@ -61,6 +66,19 @@ int main(int argc, char** argv)
Put your code here Put your code here
************************************************/ ************************************************/
for(int i=0; i<4; i++) EGammaDC[i]=0;
for(int i=0; i<Exo->TotalEnergy_lab.size(); i++)
{
float mytheta=Exo->GetSegmentAnglePhi(Exo->CloverNumber[i], Exo->CristalNumber[i], Exo->SegmentNumber[i]);
float myphi=Exo->GetSegmentAngleTheta(Exo->CloverNumber[i], Exo->CristalNumber[i], Exo->SegmentNumber[i]);
//myv(Exo->TotalEnergy_lab[i]*sin(mytheta)*sin(myphi),Exo->TotalEnergy_lab[i]*sin(mytheta)*cos(myphi) , Exo->TotalEnergy_lab[i]*cos(mytheta),(Exo->TotalEnergy_lab)[i]);
//cout<<Exo->TotalEnergy_lab[i]<<endl;
EGammaDC[i]=Exo->TotalEnergy_lab[i]*(1-beta*cos(mytheta*TMath::DegToRad()))/sqrt(1-beta*beta);
//TVector3 boost= imp4.BoostVector();
//myv.Boost(-boost);
//DopplerCorrectedEnergy.push_back(myv.T());
//h_DopplerCorrectedEnergy->Fill(myv.T());
}
RootOutput::getInstance()->GetTree()->Fill(); RootOutput::getInstance()->GetTree()->Fill();
} }
......
NPAnalysis/MakePhysicalTree/Analysis.h
+ 1
− 0
View file @ dc0fe8ce
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "TPlasticData.h" #include "TPlasticData.h"
#include "TMust2Data.h" #include "TMust2Data.h"
#include "TMust2Physics.h" #include "TMust2Physics.h"
#include "TExogamPhysics.h"
#include "TSSSDPhysics.h" #include "TSSSDPhysics.h"
#include "TPlasticPhysics.h" #include "TPlasticPhysics.h"
#include "GaspardTracker.h" #include "GaspardTracker.h"
......
NPAnalysis/MakePhysicalTree/RunToTreat.txt
+ 2
− 2
View file @ dc0fe8ce
TTreeName TTreeName
S1107Data AutoTree
RootFileName RootFileName
/Users/adrienmatta/Desktop/S1107/data2251*.root /data/e628X/e628/acquisition/run_root/run_1070.root
NPAnalysis/must2/Analysis.cxx
+ 1
− 1
View file @ dc0fe8ce
...@@ -51,7 +51,7 @@ int main(int argc,char** argv) ...@@ -51,7 +51,7 @@ int main(int argc,char** argv)
Double_t BeamEnergyNominal = myReaction->GetBeamEnergy() * MeV; Double_t BeamEnergyNominal = myReaction->GetBeamEnergy() * MeV;
cout << "Nominal beam energy (MeV): " << BeamEnergyNominal << endl; cout << "Nominal beam energy (MeV): " << BeamEnergyNominal << endl;
// Slow beam at target middle // Slow beam at target middle
Double_t BeamEnergy = Fe60TargetCD2.Slow(BeamEnergyNominal, myDetector->GetTargetThickness()/2 * micrometer, 0); Double_t BeamEnergy = BeamTargetCD2.Slow(BeamEnergyNominal, myDetector->GetTargetThickness()/2 * micrometer, 0);
cout << "Middle-target beam energy (MeV): " << BeamEnergy << endl; cout << "Middle-target beam energy (MeV): " << BeamEnergy << endl;
// Set energy beam at target middle // Set energy beam at target middle
myReaction->SetBeamEnergy(BeamEnergy); myReaction->SetBeamEnergy(BeamEnergy);
......
NPAnalysis/must2/Analysis.h
+ 4
− 4
View file @ dc0fe8ce
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "DetectorManager.h" #include "DetectorManager.h"
#include "NPOptionManager.h" #include "NPOptionManager.h"
#include "TMust2Physics.h" #include "TMust2Physics.h"
#include "TExogamPhysics.h"
// STL C++ // STL C++
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
...@@ -109,7 +109,7 @@ namespace ENERGYLOSS ...@@ -109,7 +109,7 @@ namespace ENERGYLOSS
{ {
// Beam Energy Loss // Beam Energy Loss
EnergyLoss Fe60TargetCD2 = EnergyLoss ("Fe60[0.0]_CD2.G4table", EnergyLoss BeamTargetCD2 = EnergyLoss ("O18[0.0]_CD2.G4table",
"G4Table" , "G4Table" ,
1000 ); 1000 );
...@@ -169,13 +169,13 @@ namespace ENERGYLOSS ...@@ -169,13 +169,13 @@ namespace ENERGYLOSS
3, 3,
1.008 ); 1.008 );
EnergyLoss protonTargetC = EnergyLoss ("proton_carbone.txt" , /*EnergyLoss protonTargetC = EnergyLoss ("proton_carbone.txt" ,
"LISE" , "LISE" ,
1000 , 1000 ,
3 , 3 ,
1.008 ); 1.008 );
/*
EnergyLoss protonTargetCD2 = EnergyLoss ("proton_cd2.txt" , EnergyLoss protonTargetCD2 = EnergyLoss ("proton_cd2.txt" ,
"LISE" , "LISE" ,
1000 , 1000 ,
......
NPAnalysis/must2/Calibration.txt
+ 18
− 12
View file @ dc0fe8ce
CalibrationFilePath CalibrationFilePath
calibration/Cal_Str_X_E_MM1.cal /home/e628/nptool/NPAnalysis/Exogam/calibration_Exogam_Seg.cal
calibration/Cal_Str_X_E_MM2.cal /home/e628/nptool/NPAnalysis/Exogam/calibration_Exogam_ECC.cal
calibration/Cal_Str_X_E_MM3.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_X_T1_E/Cal_Str_X_E_MM1.cal
calibration/Cal_Str_X_E_MM4.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_X_T2_E/Cal_Str_X_E_MM2.cal
calibration/Cal_Str_Y_E_MM1.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_X_T3_E/Cal_Str_X_E_MM3.cal
calibration/Cal_Str_Y_E_MM2.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_X_T4_E/Cal_Str_X_E_MM4.cal
calibration/Cal_Str_Y_E_MM3.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_Y_T1_E/Cal_Str_Y_E_MM1.cal
calibration/Cal_Str_Y_E_MM4.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_Y_T2_E/Cal_Str_Y_E_MM2.cal
calibration/Cal_SSSD_E_1.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_Y_T3_E/Cal_Str_Y_E_MM3.cal
calibration/Cal_SSSD_E_2.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Energy/Calibration/calib_run1007/Test_Y_T4_E/Cal_Str_Y_E_MM4.cal
calibration/Cal_SSSD_E_3.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_X_T_MM1.cal
calibration/Cal_SSSD_E_4.cal /home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_X_T_MM2.cal
/home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_X_T_MM3.cal
/home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_X_T_MM4.cal
/home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_Y_T_MM1.cal
/home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_Y_T_MM2.cal
/home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_Y_T_MM3.cal
/home/e628/nptool/NPAnalysis/must2/macro/Calibration/Time/Coeff/Cal_Str_Y_T_MM4.cal
NPAnalysis/must2/macro/Calibration/Energy/EnergyCalibrator.h
+ 5
− 5
View file @ dc0fe8ce
...@@ -37,14 +37,14 @@ EnergyLoss EL_Al("./EnergyLossTable/alpha_Al.G4table" , "G4Table", 100) ; ...@@ -37,14 +37,14 @@ EnergyLoss EL_Al("./EnergyLossTable/alpha_Al.G4table" , "G4Table", 100) ;
EnergyLoss EL_Si("./EnergyLossTable/alpha_Si.G4table" , "G4Table", 100) ; EnergyLoss EL_Si("./EnergyLossTable/alpha_Si.G4table" , "G4Table", 100) ;
// Information about the calibration condition (use Latex marks-up) // Information about the calibration condition (use Latex marks-up)
const TString xy = "X" ; const TString xy = "Y" ;
const TString Experiment = "RRC66"; const TString Experiment = "Test";
const TString Run_Period = "june 2010, Riken RIPS, Run 13-22"; const TString Run_Period = "december 2013";
const TString Operator = "Adrien MATTA"; const TString Operator = "e628 e644 e657 teams";
const TString Source = "3 alpha peaks $^{239}$Pu, $^{241}$Am, $^{244}$Cm"; const TString Source = "3 alpha peaks $^{239}$Pu, $^{241}$Am, $^{244}$Cm";
const TString Comment = "Source at 0$^{\\circ}$ facing Telescope 1,2,3,4"; const TString Comment = "Source at 0$^{\\circ}$ facing Telescope 1,2,3,4";
const char* frun = "RC66_run_13-22"; const char* frun = "run_1007";
//const TString Experiment = "RIBF57"; //const TString Experiment = "RIBF57";
//const TString Run_Period = "April 2010, Riken BigRIPS, Run 3"; //const TString Run_Period = "April 2010, Riken BigRIPS, Run 3";
......
NPAnalysis/must2/macro/Calibration/Energy/ExtractRawHisto_E.C
+ 5
− 5
View file @ dc0fe8ce
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
#include "TBranch.h" #include "TBranch.h"
#include "TH1F.h" #include "TH1F.h"
#include "../NPLib/include/TMust2Data.h" #include "/home/e628/nptool/NPLib/include/TMust2Data.h"
#include "../NPLib/include/RootInput.h" #include "/home/e628/nptool/NPLib/include/RootInput.h"
#define NBTELESCOPE 8 #define NBTELESCOPE 4
#define NBSTRIPS 128 #define NBSTRIPS 128
#define NBSILI 16 #define NBSILI 16
void ExtractMust2Histos(const char* fname = "run_13-22") void ExtractMust2Histos(const char* fname = "run_1007")
{ {
RootInput* Input = RootInput::getInstance("RunToTreat.txt"); RootInput* Input = RootInput::getInstance("RunToTreat.txt");
...@@ -36,7 +36,7 @@ void ExtractMust2Histos(const char* fname = "run_13-22") ...@@ -36,7 +36,7 @@ void ExtractMust2Histos(const char* fname = "run_13-22")
Chain->SetBranchAddress("MUST2",&rawMust2); Chain->SetBranchAddress("MUST2",&rawMust2);
// open the output ROOT file // open the output ROOT file
TString outFileName = "./Histograms/"; TString outFileName = "/data/e628X/e628/acquisition/spectre/Histograms/";
outFileName += fname; outFileName += fname;
outFileName += "_RawMust2Histos.root"; outFileName += "_RawMust2Histos.root";
cout<< outFileName<< endl; cout<< outFileName<< endl;
......
NPAnalysis/must2/macro/Calibration/Energy/RunToTreat.txt
+ 13
− 10
View file @ dc0fe8ce
TTreeName TTreeName
AutoTree AutoTree
RootFileName RootFileName
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0013.root %/data/e628X/e628/acquisition/run_root/run_1007_1.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0014.root %/data/e628X/e628/acquisition/run_root/run_1007_2.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0015.root %/data/e628X/e628/acquisition/run_root/run_1007_3.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0016.root %/data/e628X/e628/acquisition/run_root/run_1007_4.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0017.root %/data/e628X/e628/acquisition/run_root/run_1007_5.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0018.root %/data/e628X/e628/acquisition/run_root/run_1007_6.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0019.root %/data/e628X/e628/acquisition/run_root/run_1007_7.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0020.root %/data/e628X/e628/acquisition/run_root/run_1007_8.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0021.root %/data/e628X/e628/acquisition/run_root/run_1007_9.root
/media/51abf4be-f48e-4407-85ae-a4b8e0c480c3/NPTool/NPTool.dev/Outputs/Converted/run_0022.root %/data/e628X/e628/acquisition/run_root/run_1007_10.root
%/data/e628X/e628/acquisition/run_root/run_1007_11.root
%/data/e628X/e628/acquisition/run_root/run_1007_12.root
NPAnalysis/must2/macro/Calibration/Time/ExtractRawHisto_T.C
+ 11
− 4
View file @ dc0fe8ce
...@@ -16,18 +16,25 @@ ...@@ -16,18 +16,25 @@
#include "TBranch.h" #include "TBranch.h"
#include "TH1F.h" #include "TH1F.h"
//#include "TMust2Data.h"
//#include "/home/e628/nptool/NPLib/include/TMust2Data.h"///
//#include "/home/e628/nptool/NPLib/include/RootInput.h"////
#include "TMust2Data.h" #include "TMust2Data.h"
#include "RootInput.h"
#define NBTELESCOPE 8 #define NBTELESCOPE 4
#define NBSTRIPS 128 #define NBSTRIPS 128
#define NBSILI 16 #define NBSILI 16
void ExtractMust2Histos(const char* fname = "run_0040") void ExtractMust2Histos(const char* fname = "run_033")
{ {
// open the ROOT file to process // open the ROOT file to process
TString path = gSystem->Getenv("RUN_NPT_ROOT"); //TString path = gSystem->Getenv("RUN_NPT_ROOT");//
path+="/runGRU/"; // path+="/data/e644X/e644/acquisition/run_root/";
// path+="/runGRU/";//
TString path = "/data/e644X/e644/acquisition/run_root/";
TString inFileName = fname; TString inFileName = fname;
inFileName += ".root"; inFileName += ".root";
TFile *inFile = new TFile(path + inFileName); TFile *inFile = new TFile(path + inFileName);
......
NPAnalysis/must2/macro/Calibration/Time/TimeCalibrator.C
+ 3
− 3
View file @ dc0fe8ce
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "TF1.h" #include "TF1.h"
using namespace std; using namespace std;
#define TELESCOPE_START 1 #define TELESCOPE_START 4
#define TELESCOPE_END 4 #define TELESCOPE_END 4
#define STRIP_START 1 #define STRIP_START 1
#define STRIP_END 128 #define STRIP_END 128
...@@ -31,8 +31,8 @@ Double_t pol2 (Double_t *,Double_t *); ...@@ -31,8 +31,8 @@ Double_t pol2 (Double_t *,Double_t *);
ofstream peaks_file, calib_file, dispersion_file,calib_online_file; ofstream peaks_file, calib_file, dispersion_file,calib_online_file;
void TimeCalibrator(const char* frun = "run_0042", TString xy = "Y",Int_t void TimeCalibrator(const char* frun = "run_033", TString xy = "Y",Int_t
npeak= 49) npeak= 30)//49
{ {
// open the ROOT file to process // open the ROOT file to process
TString path = "./Histograms/"; TString path = "./Histograms/";
......
NPLib/CATS/TCATSPhysics.cxx
+ 0
− 1
View file @ dc0fe8ce
...@@ -485,7 +485,6 @@ void TCATSPhysics::AddCATS(TVector3 C_X1_Y1, TVector3 C_X28_Y1, TVector3 C_X1_Y2 ...@@ -485,7 +485,6 @@ void TCATSPhysics::AddCATS(TVector3 C_X1_Y1, TVector3 C_X28_Y1, TVector3 C_X1_Y2
// Moving StripCenter to 1.1 corner (strip center!) : // Moving StripCenter to 1.1 corner (strip center!) :
Strip_1_1 = C_X1_Y1 + (U+V) * (StripPitch/2) ; Strip_1_1 = C_X1_Y1 + (U+V) * (StripPitch/2) ;
for( int i = 0 ; i < 28 ; i++ ) for( int i = 0 ; i < 28 ; i++ )
{ {
lineX.clear() ; lineX.clear() ;
......
NPLib/CATS/TCATSSpectra.cxx
+ 2
− 2
View file @ dc0fe8ce
...@@ -143,11 +143,11 @@ void TCATSSpectra::InitPhysicsSpectra(){ ...@@ -143,11 +143,11 @@ void TCATSSpectra::InitPhysicsSpectra(){
family = "CATS/PHY/POS"; family = "CATS/PHY/POS";
for (unsigned int i = 0; i < fNumberOfCats; ++i) { // loop on number of cats for (unsigned int i = 0; i < fNumberOfCats; ++i) { // loop on number of cats
name = Form("CATS%d_POS", i+1); name = Form("CATS%d_POS", i+1);
AddHisto2D(name, name,100,-50,50,100,-50,50,family); AddHisto2D(name, name,500,-50,50,500,-50,50,family);
} }
name = "TARGET_POS"; name = "TARGET_POS";
AddHisto2D(name, name,100,-50,50,100,-50,50,family); AddHisto2D(name, name,500,-50,50,500,-50,50,family);
name = "TRAJECTORY_XZ"; name = "TRAJECTORY_XZ";
AddHisto2D(name, name,100,-50,50,100,-50,50,family); AddHisto2D(name, name,100,-50,50,100,-50,50,family);
......
NPLib/Exogam/TExogamPhysics.cxx
+ 47
− 7
View file @ dc0fe8ce
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
/***************************************************************************** /*****************************************************************************
* Original Author: Sandra GIRON contact address: giron@ipno.in2p3.fr * * Original Author: Sandra GIRON contact address: giron@ipno.in2p3.fr *
* * * Benjamin LE CROM lecrom@ipno.in2p3.fr *
* Creation Date : july 2010 * * Creation Date : march 2014 *
* Last update : * * Last update : *
*---------------------------------------------------------------------------* *---------------------------------------------------------------------------*
* Decription: * * Decription: *
...@@ -397,10 +397,15 @@ void TExogamPhysics::BuildPhysicalEvent() ...@@ -397,10 +397,15 @@ void TExogamPhysics::BuildPhysicalEvent()
double TExogamPhysics::DopplerCorrection(double E, double Theta) double TExogamPhysics::DopplerCorrection(double E, double Theta)
{ {
double Pi = 3.141592654 ; double Pi = 3.141592654 ;
TString filename = "configs/beta.txt";
ifstream file;
//cout << filename << endl;
file.open(filename);
if(!file) cout << filename << " was not opened" << endl;
double E_corr = 0; double E_corr = 0;
//double beta = 0.197; // baptiste value double beta = 0.;
double beta = 0.17; //beta for 18O@15MeV/u file>>beta;
double gamma = 1./ sqrt(1-beta*beta); double gamma = 1./ sqrt(1-beta*beta);
E_corr = gamma * E * ( 1. - beta * cos(Theta*Pi/180.)); E_corr = gamma * E * ( 1. - beta * cos(Theta*Pi/180.));
...@@ -552,7 +557,12 @@ void TExogamPhysics::ClearSpectra(){ ...@@ -552,7 +557,12 @@ void TExogamPhysics::ClearSpectra(){
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
map< vector<TString> , TH1*> TExogamPhysics::GetSpectra() { map< vector<TString> , TH1*> TExogamPhysics::GetSpectra() {
return m_Spectra->GetMapHisto(); if(m_Spectra)
return m_Spectra->GetMapHisto();
else{
map< vector<TString> , TH1*> empty;
return empty;
}
} }
void TExogamPhysics::AddClover(string AngleFile) void TExogamPhysics::AddClover(string AngleFile)
...@@ -562,7 +572,7 @@ void TExogamPhysics::AddClover(string AngleFile) ...@@ -562,7 +572,7 @@ void TExogamPhysics::AddClover(string AngleFile)
// TString filename = Form("posz42_simu50mm/angles_exogam_clover%d.txt",NumberOfClover); // TString filename = Form("posz42_simu50mm/angles_exogam_clover%d.txt",NumberOfClover);
// TString filename = Form("posz42_exp_stat_demiring/angles_exogam_clover%d.txt",NumberOfClover); // TString filename = Form("posz42_exp_stat_demiring/angles_exogam_clover%d.txt",NumberOfClover);
string path = "posz42_exp_stat_demiring/"; string path = "configs/";
TString filename = path + AngleFile; TString filename = path + AngleFile;
cout << filename << endl; cout << filename << endl;
...@@ -653,7 +663,37 @@ void TExogamPhysics::InitializeRootInputRaw() ...@@ -653,7 +663,37 @@ void TExogamPhysics::InitializeRootInputRaw()
outputList->Add(cristal_mult); 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 // Create associated branches and associated private member DetectorPhysics address
void TExogamPhysics::InitializeRootOutput() void TExogamPhysics::InitializeRootOutput()
......
NPLib/Exogam/TExogamPhysics.h
+ 13
− 9
View file @ dc0fe8ce
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
/***************************************************************************** /*****************************************************************************
* Original Author: S. Giron contact address: giron@ipno.in2p3.fr * * Original Author: S. Giron contact address: giron@ipno.in2p3.fr *
* * * B. Le Crom lecrom@ipno.in2p3.fr *
* Creation Date : febuary 2009 * * Creation Date : march 2014 *
* Last update : * * Last update : *
*---------------------------------------------------------------------------* *---------------------------------------------------------------------------*
* Decription: * * Decription: *
...@@ -108,6 +108,9 @@ class TExogamPhysics : public TObject, public NPA::VDetector ...@@ -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 // In this method mother Branches (Detector) AND daughter leaf (fDetector_parameter) have to be activated
void InitializeRootInputRaw() ; 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 // Create associated branches and associated private member DetectorPhysics address
void InitializeRootOutput() ; void InitializeRootOutput() ;
...@@ -126,12 +129,6 @@ class TExogamPhysics : public TObject, public NPA::VDetector ...@@ -126,12 +129,6 @@ class TExogamPhysics : public TObject, public NPA::VDetector
double DopplerCorrection(double Energy, double Theta); double DopplerCorrection(double Energy, double Theta);
// Give and external TMustData object to TMust2Physics. Needed for online analysis for example.
void SetRawDataPointer(TExogamData* rawDataPointer) {EventData = rawDataPointer;}
// Retrieve raw and pre-treated data
TExogamData* GetRawData() const {return EventData;}
TExogamData* GetPreTreatedData() const {return PreTreatedData;}
// Those two method all to clear the Event Physics or Data // Those two method all to clear the Event Physics or Data
void ClearEventPhysics() {Clear();} void ClearEventPhysics() {Clear();}
void ClearEventData() {EventData->Clear();} void ClearEventData() {EventData->Clear();}
...@@ -165,7 +162,14 @@ class TExogamPhysics : public TObject, public NPA::VDetector ...@@ -165,7 +162,14 @@ class TExogamPhysics : public TObject, public NPA::VDetector
Double_t GetSegmentAnglePhi(int Clover, int Cristal, int Segment) {return(Clover_Angles_Theta_Phi[Clover][Cristal][Segment][1]);}; Double_t GetSegmentAnglePhi(int Clover, int Cristal, int Segment) {return(Clover_Angles_Theta_Phi[Clover][Cristal][Segment][1]);};
Double_t GetSegmentAngleTheta(int Clover, int Cristal, int Segment) {return(Clover_Angles_Theta_Phi[Clover][Cristal][Segment][0]);}; Double_t GetSegmentAngleTheta(int Clover, int Cristal, int Segment) {return(Clover_Angles_Theta_Phi[Clover][Cristal][Segment][0]);};
// Give and external TMustData object to TExogamPhysics. Needed for online analysis for example.
void SetRawDataPointer(TExogamData* rawDataPointer) {EventData = rawDataPointer;}
// Retrieve raw and pre-treated data
TExogamData* GetRawData() const {return EventData;}
TExogamData* GetPreTreatedData() const {return PreTreatedData;}
private: // Spectra Class private: // Spectra Class
TExogamSpectra* m_Spectra;//! TExogamSpectra* m_Spectra;//!
......
NPLib/MUST2/TMust2Spectra.cxx
+ 2
− 2
View file @ dc0fe8ce
...@@ -99,7 +99,7 @@ void TMust2Spectra::InitRawSpectra(){ ...@@ -99,7 +99,7 @@ void TMust2Spectra::InitRawSpectra(){
// CSI_E_RAW // CSI_E_RAW
name = Form("MM%d_CSI_E_RAW", i+1); name = Form("MM%d_CSI_E_RAW", i+1);
AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 512, 0, 8192, "MUST2/RAW/CSIE"); AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 512, 0, 16384, "MUST2/RAW/CSIE");
// CSI_T_RAW // CSI_T_RAW
name = Form("MM%d_CSI_T_RAW", i+1); name = Form("MM%d_CSI_T_RAW", i+1);
...@@ -154,7 +154,7 @@ void TMust2Spectra::InitPreTreatedSpectra() ...@@ -154,7 +154,7 @@ void TMust2Spectra::InitPreTreatedSpectra()
// CSI_E_CAL // CSI_E_CAL
name = Form("MM%d_CSI_E_CAL", i+1); name = Form("MM%d_CSI_E_CAL", i+1);
AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 500, 0, 50, "MUST2/CAL/CSIE"); AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 500, 0, 500, "MUST2/CAL/CSIE");
// CSI_T_CAL // CSI_T_CAL
name = Form("MM%d_CSI_T_CAL", i+1); name = Form("MM%d_CSI_T_CAL", i+1);
......
NPLib/Misc/TTacData.cxx
+ 36
− 33
View file @ dc0fe8ce
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*****************************************************************************/ *****************************************************************************/
/***************************************************************************** /*****************************************************************************
* Original Author: contact address: * * Original Author: Benjamin Le Crom contact address: lecrom@ipno.in2p3.fr *
* * * *
* Creation Date : * * Creation Date : *
* Last update : * * Last update : *
...@@ -40,24 +40,25 @@ TTacData::~TTacData() ...@@ -40,24 +40,25 @@ TTacData::~TTacData()
void TTacData::Clear() void TTacData::Clear()
{ {
// (TAC) // (TAC)
fTAC_MM_CATS1 = -1; fTAC_MM_CATS1 = -1;
fTAC_MM_CATS2 = -1; fTAC_CATS12 = -1;
fTAC_PL_CATS1 = -1; fTAC_CATS1_PLD4 = -1;
fTAC_PL_CATS2 = -1; fTAC_CATS1_HF = -1;
fTAC_CATS12 = -1; fTAC_CATS1_EXO = -1;
fTAC_PL_GAL = -1; fTAC_MM_HF = -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_HF_DetectorNbr.clear(); 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 void TTacData::Dump() const
...@@ -65,22 +66,24 @@ void TTacData::Dump() const ...@@ -65,22 +66,24 @@ void TTacData::Dump() const
cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl; cout << "XXXXXXXXXXXXXXXXXXXXXXXX New Event XXXXXXXXXXXXXXXXX" << endl;
// (TAC) // (TAC)
cout << "fTAC_MM_CATS1 : " << fTAC_MM_CATS1 << endl; cout << "fTAC_MM_CATS1 : " << fTAC_MM_CATS1 << endl;
cout << "fTAC_MM_CATS2 : " << fTAC_MM_CATS2 << endl; cout << "fTAC_CATS12 : " << fTAC_CATS12 << endl;
cout << "fTAC_PL_CATS1 : " << fTAC_PL_CATS1 << endl; cout << "fTAC_CATS1_PLD4 : " << fTAC_CATS1_PLD4 << 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_CATS1_HF : " << fTAC_CATS1_HF << endl; cout << "fTAC_CATS1_HF : " << fTAC_CATS1_HF << endl;
cout << "fTAC_CATS2_HF : " << fTAC_CATS2_HF << endl; cout << "fTAC_CATS1_EXO : " << fTAC_CATS1_EXO << endl;
cout << "fTAC_MM_HF : " << fTAC_MM_HF << endl; cout << "fTAC_MM_HF : " << fTAC_MM_HF << endl;
cout << "fTAC_MM1_HF : " << fTAC_MM1_HF << endl; cout << "fTAC_MM_EXO : " << fTAC_MM_EXO << endl;
cout << "fTAC_MM2_HF : " << fTAC_MM2_HF << endl; cout << "fTAC_BARREL_EXO : " << fTAC_BARREL_EXO << endl;
cout << "fTAC_MM3_HF : " << fTAC_MM3_HF << endl; cout << "fTAC_BARREL_CATS1FAG : " << fTAC_BARREL_CATS1FAG << endl;
cout << "fTAC_MM4_HF : " << fTAC_MM4_HF << endl; cout << "fTAC_HYB_EXO : " << fTAC_HYB_EXO << endl;
cout << "fTAC_MM5_HF : " << fTAC_MM5_HF << endl; cout << "fTAC_HYB_CATS1FAG : " << fTAC_HYB_CATS1FAG << endl;
cout << "fTAC_MM6_HF : " << fTAC_MM6_HF << endl; cout << "fTAC_CHAR_EXO : " << fTAC_CHAR_EXO << endl;
cout << "fTAC_MM7_HF : " << fTAC_MM7_HF << endl; cout << "fTAC_CHAR_CATS1FAG : " << fTAC_CHAR_CATS1FAG << endl;
cout << "fTAC_MM8_HF : " << fTAC_MM8_HF << 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; cout << "TAC_MM_HF_DetectorNbr = " << fTAC_MM_HF_DetectorNbr.size() << endl;
for (UShort_t i = 0; i < fTAC_MM_HF_DetectorNbr.size(); i++) for (UShort_t i = 0; i < fTAC_MM_HF_DetectorNbr.size(); i++)
......
NPLib/Misc/TTacData.h
+ 52
− 47
View file @ dc0fe8ce
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/***************************************************************************** /*****************************************************************************
* Original Author: contact address: * * Original Author: Benjamin Le Crom contact address: lecrom@ipno.in2p3.fr *
* * * *
* Creation Date : * * Creation Date : *
* Last update : * * Last update : *
...@@ -29,23 +29,26 @@ class TTacData : public TObject { ...@@ -29,23 +29,26 @@ class TTacData : public TObject {
private: private:
// TAC // TAC
UShort_t fTAC_MM_CATS1; 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_CATS12;
UShort_t fTAC_PL_GAL; UShort_t fTAC_CATS1_PLD4;
UShort_t fTAC_CATS1_HF; UShort_t fTAC_CATS1_HF;
UShort_t fTAC_CATS2_HF; UShort_t fTAC_CATS1_EXO;
UShort_t fTAC_MM_HF; 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; 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: public:
TTacData(); TTacData();
...@@ -57,45 +60,47 @@ class TTacData : public TObject { ...@@ -57,45 +60,47 @@ class TTacData : public TObject {
///////////////////// GETTERS //////////////////////// ///////////////////// GETTERS ////////////////////////
// (TAC) // (TAC)
UShort_t GetTAC_MM_CATS1() {return fTAC_MM_CATS1;} UShort_t GetTAC_MM_CATS1() {return fTAC_MM_CATS1;}
UShort_t GetTAC_MM_CATS2() {return fTAC_MM_CATS2;} UShort_t GetTAC_CATS12() {return fTAC_CATS12;}
UShort_t GetTAC_PL_CATS1() {return fTAC_PL_CATS1;} UShort_t GetTAC_CATS1_PLD4() {return fTAC_CATS1_PLD4;}
UShort_t GetTAC_PL_CATS2() {return fTAC_PL_CATS2;} UShort_t GetTAC_CATS1_HF() {return fTAC_CATS1_HF;}
UShort_t GetTAC_CATS12() {return fTAC_CATS12;} UShort_t GetTAC_CATS1_EXO() {return fTAC_CATS1_EXO;}
UShort_t GetTAC_PL_GAL() {return fTAC_PL_GAL;} UShort_t GetTAC_MM_HF() {return fTAC_MM_HF;}
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;}
Double_t GetTAC_MM_HF_DetectorNbr(const Int_t i) const {return fTAC_MM_HF_DetectorNbr[i];} 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 //////////////////////// ///////////////////// SETTERS ////////////////////////
// (TAC) // (TAC)
void SetTAC_MM_CATS1(UShort_t T) {fTAC_MM_CATS1 = T;} void SetTAC_MM_CATS1(UShort_t T) {fTAC_MM_CATS1 = T;}
void SetTAC_MM_CATS2(UShort_t T) {fTAC_MM_CATS2 = T;} void SetTAC_CATS12(UShort_t T) {fTAC_CATS12 = T;}
void SetTAC_PL_CATS1(UShort_t T) {fTAC_PL_CATS1 = T;} void SetTAC_CATS1_PLD4(UShort_t T) {fTAC_CATS1_PLD4 = 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_CATS1_HF(UShort_t T) {fTAC_CATS1_HF = 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_CATS1_EXO(UShort_t T) {fTAC_CATS1_EXO = T;}
void SetTAC_MM_HF(UShort_t T) {fTAC_MM_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_MM_HF_DetectorNbr(const UShort_t DetNbr) {fTAC_MM_HF_DetectorNbr.push_back(DetNbr);}
void SetTAC_MM2_HF(UShort_t T) {fTAC_MM2_HF = T;} void SetTAC_MM_EXO(UShort_t T) {fTAC_MM_EXO = T;}
void SetTAC_MM3_HF(UShort_t T) {fTAC_MM3_HF = T;} void SetTAC_BARREL_EXO(UShort_t T) {fTAC_BARREL_EXO = T;}
void SetTAC_MM4_HF(UShort_t T) {fTAC_MM4_HF = T;} void SetTAC_BARREL_CATS1FAG(UShort_t T) {fTAC_BARREL_CATS1FAG = T;}
void SetTAC_MM5_HF(UShort_t T) {fTAC_MM5_HF = T;} void SetTAC_HYB_EXO(UShort_t T) {fTAC_HYB_EXO = T;}
void SetTAC_MM6_HF(UShort_t T) {fTAC_MM6_HF = T;} void SetTAC_HYB_CATS1FAG(UShort_t T) {fTAC_HYB_CATS1FAG = T;}
void SetTAC_MM7_HF(UShort_t T) {fTAC_MM7_HF = T;} void SetTAC_CHAR_EXO(UShort_t T) {fTAC_CHAR_EXO = T;}
void SetTAC_MM8_HF(UShort_t T) {fTAC_MM8_HF = T;} void SetTAC_CHAR_CATS1FAG(UShort_t T) {fTAC_CHAR_CATS1FAG = T;}
void SetTAC_MM_HF_DetectorNbr(const UShort_t DetNbr) {fTAC_MM_HF_DetectorNbr.push_back(DetNbr);} 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 ClassDef(TTacData,2) // TacData structure
......
NPLib/Misc/TTacPhysics.cxx
+ 3
− 12
View file @ dc0fe8ce
...@@ -64,10 +64,7 @@ void TTacPhysics::Clear() ...@@ -64,10 +64,7 @@ void TTacPhysics::Clear()
Time_TAC_2 =0; Time_TAC_2 =0;
Time_TAC_3 =0; Time_TAC_3 =0;
Time_TAC_4 =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() ...@@ -105,10 +102,7 @@ void TTacPhysics::InitializeRootInputPhysics()
inputChain->SetBranchStatus ( "Time_TAC_2", true ); inputChain->SetBranchStatus ( "Time_TAC_2", true );
inputChain->SetBranchStatus ( "Time_TAC_3", true ); inputChain->SetBranchStatus ( "Time_TAC_3", true );
inputChain->SetBranchStatus ( "Time_TAC_4", 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 ); inputChain->SetBranchAddress( "Tac", &EventPhysics );
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
...@@ -135,9 +129,6 @@ void TTacPhysics::BuildSimplePhysicalEvent() ...@@ -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_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_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_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() );
} }
NPLib/Misc/TTacPhysics.h
+ 0
− 4
View file @ dc0fe8ce
...@@ -49,10 +49,6 @@ class TTacPhysics : public TObject, public NPA::VDetector ...@@ -49,10 +49,6 @@ class TTacPhysics : public TObject, public NPA::VDetector
Double_t Time_TAC_2 ; Double_t Time_TAC_2 ;
Double_t Time_TAC_3 ; Double_t Time_TAC_3 ;
Double_t Time_TAC_4 ; 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; vector<UShort_t> TacNumber;
public: // inherrited from VDetector public: // inherrited from VDetector
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment