diff --git a/Projects/AlPhaPha/2024/Analysis.cxx b/Projects/AlPhaPha/2024/Analysis.cxx
index 5b68044c500ae8c47dd70824fb86748075efabac..3f63f509f49a699e2ab2b9e4105e9f3ec1162b3a 100644
--- a/Projects/AlPhaPha/2024/Analysis.cxx
+++ b/Projects/AlPhaPha/2024/Analysis.cxx
@@ -461,7 +461,6 @@ void Analysis::VamosAnalysis(){
PositionOnTarget = TVector3(XTarget,YTarget,ZTarget);
PositionOnTargetLin = TVector3(XTargetLin,YTargetLin,ZTarget);
- double Brho_ref = 1.15;
if( MTOF_FP0_T0VM == 1 ){
@@ -484,104 +483,24 @@ void Analysis::VamosAnalysis(){
// T13 //
double path1 = FPMW->GetDetectorPositionZ(0)/10./cos(FPMW->Theta_in)/cos(FPMW->Phi_in);
double path2 = (FPMW->GetDetectorPositionZ(2)-7600)/10./cos(FPMW->Thetaf);
- FF_D13 = FF_Path - path1 + path2;
- FF_T13 = T13 - 20 + m_T13_Offset[FPMWPat];
- FF_V13 = (FF_D13/FF_T13)*(1-3e-5*FF_Y3);
- FF_Beta13 = FF_V13/29.9792458;
- FF_Gamma13 = 1./sqrt(1.0 - FF_Beta13*FF_Beta13);
- FF_AoQ13 = 1.0*(FF_Brho/3.10761/FF_Beta13/FF_Gamma13);
- FF_Etot13 = IC->Etot;
- FF_M113 = FF_Etot13/931.5016/(FF_Gamma13-1);
- FF_Q13 = FF_M113/FF_AoQ13;
- //FF_Q13 = m_Q_p0[FPMW_Section] + m_Q_p1[FPMW_Section]*FF_Q13;
- int iQ13 = (int) round(FF_Q13);
- FF_Mass13 = iQ13*FF_AoQ13;
- //FF_Mass = int(FF_Q+0.5)*FF_AoQ;
-
- Vamos_Time_Target = FF_T13 - FPMW->GetDetectorPositionZ(0)/10./FF_V13;
-
- // T14 //
- path1 = FPMW->GetDetectorPositionZ(0)/10./cos(FPMW->Theta_in)/cos(FPMW->Phi_in);
- path2 = (FPMW->GetDetectorPositionZ(3)-7600)/10./cos(FPMW->Thetaf);
- FF_D14 = FF_Path - path1 + path2;
- FF_T14 = T14 - 11 + m_T14_Offset[FPMWPat];
- FF_V14 = FF_D14/FF_T14;
- double FF_Beta14 = FF_V14/29.9792458;
- double FF_Gamma14 = 1./sqrt(1.0 - FF_Beta14*FF_Beta14);
- FF_AoQ14 = 1.0*(FF_Brho/3.10761/FF_Beta14/FF_Gamma14);
- double FF_Etot14 = IC->Etot;
- FF_M114 = FF_Etot14/931.5016/(FF_Gamma14-1);
- FF_Q14 = FF_M114/FF_AoQ14;
- //FF_Q14 = m_Q_p0[FPMW_Section] + m_Q_p1[FPMW_Section]*FF_Q14;
- int iQ14 = (int) round(FF_Q14);
- FF_Mass14 = iQ14*FF_AoQ14;
-
- // T23 //
- path1 = FPMW->GetDetectorPositionZ(1)/10./cos(FPMW->Theta_in)/cos(FPMW->Phi_in);
- path2 = (FPMW->GetDetectorPositionZ(2)-7600)/10./cos(FPMW->Thetaf);
- FF_D23 = FF_Path - path1 + path2;
- FF_T23 = T23 + 72;
- FF_V23 = FF_D23/FF_T23;
- double FF_Beta23 = FF_V23/29.9792358;
- double FF_Gamma23 = 1./sqrt(1.0 - FF_Beta23*FF_Beta23);
- FF_AoQ23 = 1.0*(FF_Brho/3.10761/FF_Beta23/FF_Gamma23);
- double FF_Etot23 = IC->Etot;
- FF_M123 = FF_Etot23/931.5016/(FF_Gamma23-1);
- FF_Q23 = FF_M123/FF_AoQ23;
- //FF_Q23 = m_Q_p0[FPMW_Section] + m_Q_p1[FPMW_Section]*FF_Q23;
- int iQ23 = (int) round(FF_Q23);
- FF_Mass23 = iQ23*FF_AoQ23;
-
- // T24 //
- path1 = FPMW->GetDetectorPositionZ(1)/10./cos(FPMW->Theta_in)/cos(FPMW->Phi_in);
- path2 = (FPMW->GetDetectorPositionZ(3)-7600)/10./cos(FPMW->Thetaf);
- FF_D24 = FF_Path - path1 + path2;
- FF_T24 = T24 + 81.7;
- FF_V24 = FF_D24/FF_T24;
- double FF_Beta24 = FF_V24/29.9792458;
- double FF_Gamma24 = 1./sqrt(1.0 - FF_Beta24*FF_Beta24);
- FF_AoQ24 = 1.0*(FF_Brho/3.10761/FF_Beta24/FF_Gamma24);
- double FF_Etot24 = IC->Etot;
- FF_M124 = FF_Etot24/931.5016/(FF_Gamma24-1);
- FF_Q24 = FF_M124/FF_AoQ24;
- //FF_Q24 = m_Q_p0[FPMW_Section] + m_Q_p1[FPMW_Section]*FF_Q24;
- int iQ24 = (int) round(FF_Q24);
- FF_Mass24 = iQ24*FF_AoQ24;
-
-
- double FF_Dav = 0.5*(FF_D13+FF_D14);
- double FF_Tav = 0.5*(FF_T13+FF_T14);
- double FF_Vav = FF_Dav/FF_Tav;
- double FF_Betaav = FF_Vav/29.9792458;
- double FF_Gammaav = 1./sqrt(1.0 - FF_Betaav*FF_Betaav);
- double FF_AoQav = 1.0*(FF_Brho/3.10761/FF_Betaav/FF_Gammaav);
- double FF_Etotav = 0.5*(FF_Etot13 + FF_Etot14);
- double FF_M1av = FF_Etotav/931.5016/(FF_Gammaav-1);
- FF_Qav = FF_M1av/FF_AoQav;
- FF_Qav = m_Q_p0[FPMW_Section] + m_Q_p1[FPMW_Section]*FF_Qav;
- int iQav = (int) round(FF_Qav);
- FF_Massav = iQav*FF_AoQav;
- //FF_Massav = int(FF_Qav+0.5)*FF_AoQav;
-
+
//Online
- //double D1 = fPath-(15.35)/cos(fTP_Theta/1000.)+(789.44-760.)/cos(fTf/1000.);
-
double Toff[20] = {0, 588.0, 588.5, 587.95, 588.04, 587.72, 587.92, 587.9, 587.9, 588.66, 588.80, 588.67, 588.64, 588.75, 588.47, 588.65, 588.65, 588.67, 589.05, 590.3};
- double T1 = - MTOF_FP0_T0V[FPMWPat] + Toff[FPMWPat];
- double D1 = FF_Path - path1 + path2;
- double V1 = D1/T1;
- double Beta1 = V1/29.9792458;
- double Gamma1 = 1./sqrt(1.0-Beta1*Beta1);
+ FF_T13 = - MTOF_FP0_T0V[0] + Toff[FPMWPat];
+ FF_D13 = FF_Path - path1 + path2;
+ FF_V13 = FF_D13/FF_T13;
+ FF_Beta13 = FF_V13/29.9792458;
+ FF_Gamma13 = 1./sqrt(1.0-FF_Beta13*FF_Beta13);
- AoQ = 1.0*(FF_Brho*(3.107*Beta1*Gamma1));
- M1 = IC->EtotInit/(931.5016*(Gamma1-1.));
- Q = M1/AoQ;
+ FF_AoQ13 = (FF_Brho/(3.107*FF_Beta13*FF_Gamma13));
+ FF_M13 = IC->EtotInit/(931.5016*(FF_Gamma13-1.));
+ FF_Q13 = FF_M13/FF_AoQ13;
- Mass = int(Q+0.5)*AoQ;
+ FF_Mass13 = int(FF_Q13+0.5)*FF_AoQ13;
}
}
@@ -643,44 +562,9 @@ void Analysis::InitOutputBranch(){
RootOutput::getInstance()->GetTree()->Branch("FF_Beta13",&FF_Beta13,"FF_Beta13/D");
RootOutput::getInstance()->GetTree()->Branch("FF_Gamma13",&FF_Gamma13,"FF_Gamma13/D");
RootOutput::getInstance()->GetTree()->Branch("FF_Q13",&FF_Q13,"FF_Q13/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_M113",&FF_M113,"FF_M113/D");
+ RootOutput::getInstance()->GetTree()->Branch("FF_M13",&FF_M13,"FF_M13/D");
RootOutput::getInstance()->GetTree()->Branch("FF_Mass13",&FF_Mass13,"FF_Mass13/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_D14",&FF_D14,"FF_D14/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_T14",&FF_T14,"FF_T14/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_V14",&FF_V14,"FF_V14/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_AoQ14",&FF_AoQ14,"FF_AoQ14/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_Q14",&FF_Q14,"FF_Q14/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_M114",&FF_M114,"FF_M114/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_Mass14",&FF_Mass14,"FF_Mass14/D");
-
- RootOutput::getInstance()->GetTree()->Branch("FF_D23",&FF_D23,"FF_D23/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_T23",&FF_T23,"FF_T23/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_V23",&FF_V23,"FF_V23/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_AoQ23",&FF_AoQ23,"FF_AoQ23/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_Q23",&FF_Q23,"FF_Q23/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_M123",&FF_M123,"FF_M123/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_Mass23",&FF_Mass23,"FF_Mass23/D");
-
- RootOutput::getInstance()->GetTree()->Branch("FF_D24",&FF_D24,"FF_D24/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_T24",&FF_T24,"FF_T24/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_V24",&FF_V24,"FF_V24/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_AoQ24",&FF_AoQ24,"FF_AoQ24/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_Q24",&FF_Q24,"FF_Q24/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_M124",&FF_M124,"FF_M124/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_Mass24",&FF_Mass24,"FF_Mass24/D");
-
-
- //Mass online
- RootOutput::getInstance()->GetTree()->Branch("AoQ",&AoQ,"AoQ/D");
- RootOutput::getInstance()->GetTree()->Branch("M1",&M1,"M1/D");
- RootOutput::getInstance()->GetTree()->Branch("Q",&Q,"Q/D");
- RootOutput::getInstance()->GetTree()->Branch("Mass",&Mass,"Mass/D");
-
- RootOutput::getInstance()->GetTree()->Branch("FF_Qav",&FF_Qav,"FF_Qav/D");
- RootOutput::getInstance()->GetTree()->Branch("FF_Massav",&FF_Massav,"FF_Massav/D");
-
- RootOutput::getInstance()->GetTree()->Branch("FF_Etot13",&FF_Etot13,"FF_Etot13/D");
RootOutput::getInstance()->GetTree()->Branch("FPMW_Section",&FPMW_Section,"FPMW_Section/I");
RootOutput::getInstance()->GetTree()->Branch("theta_lab_fission",&theta_lab_fission,"theta_lab_fission/D");
@@ -734,6 +618,16 @@ void Analysis::InitInputBranch(){
RootInput::getInstance()->GetChain()->SetBranchStatus("MTOF_FP1_T1VN",true);
RootInput::getInstance()->GetChain()->SetBranchAddress("MTOF_FP1_T1VN",&MTOF_FP1_T1VN);
+ RootInput::getInstance()->GetChain()->SetBranchStatus("MTOF_FP0_T0V",true);
+ RootInput::getInstance()->GetChain()->SetBranchAddress("MTOF_FP0_T0V",&MTOF_FP0_T0V);
+ RootInput::getInstance()->GetChain()->SetBranchStatus("MTOF_FP0_T1V",true);
+ RootInput::getInstance()->GetChain()->SetBranchAddress("MTOF_FP0_T1V",&MTOF_FP0_T1V);
+ RootInput::getInstance()->GetChain()->SetBranchStatus("MTOF_FP1_T0V",true);
+ RootInput::getInstance()->GetChain()->SetBranchAddress("MTOF_FP1_T0V",&MTOF_FP1_T0V);
+ RootInput::getInstance()->GetChain()->SetBranchStatus("MTOF_FP1_T1V",true);
+ RootInput::getInstance()->GetChain()->SetBranchAddress("MTOF_FP1_T1V",&MTOF_FP1_T1V);
+
+
RootInput::getInstance()->GetChain()->SetBranchStatus("MTOF_FP0_T0VM",true);
RootInput::getInstance()->GetChain()->SetBranchAddress("MTOF_FP0_T0VM",&MTOF_FP0_T0VM);
RootInput::getInstance()->GetChain()->SetBranchStatus("MTOF_FP0_T1VM",true);
@@ -802,38 +696,10 @@ void Analysis::ReInitValue(){
FF_Beta13 = -1;
FF_Gamma13 = -1;
FF_Q13 = -1;
- FF_M113 = -1;
+ FF_M13 = -1;
FF_Mass13 = -1;
- FF_Etot13 = -1;
FPMW_Section = -1;
- FF_D14 = -1;
- FF_T14 = -1;
- FF_V14 = -1;
- FF_Q14 = -1;
- FF_M114 = -1;
- FF_AoQ14 = -1;
- FF_Mass14 = -1;
-
- FF_D23 = -1;
- FF_T23 = -1;
- FF_V23 = -1;
- FF_Q23 = -1;
- FF_M123 = -1;
- FF_AoQ23 = -1;
- FF_Mass23 = -1;
-
- FF_D24 = -1;
- FF_T24 = -1;
- FF_V24 = -1;
- FF_Q24 = -1;
- FF_M124 = -1;
- FF_AoQ24 = -1;
- FF_Mass24 = -1;
-
- FF_Qav = -1;
- FF_Massav = -1;
-
theta_lab_fission = -100;
theta_cm_fission = -100;
theta_240Pu = -100;
diff --git a/Projects/AlPhaPha/2024/Analysis.h b/Projects/AlPhaPha/2024/Analysis.h
index c4e5df738ae42458e51798e3a7f61b5fe1b4e83f..713fa25548e996701c17d08ce15d0fa401825add 100644
--- a/Projects/AlPhaPha/2024/Analysis.h
+++ b/Projects/AlPhaPha/2024/Analysis.h
@@ -134,42 +134,10 @@ class Analysis: public NPL::VAnalysis{
double FF_Beta13;
double FF_Gamma13;
double FF_Q13;
- double FF_M113;
+ double FF_M13;
double FF_Mass13;
double FF_Etot13;
- double FF_D14;
- double FF_T14;
- double FF_V14;
- double FF_Q14;
- double FF_M114;
- double FF_AoQ14;
- double FF_Mass14;
-
- double FF_D23;
- double FF_T23;
- double FF_V23;
- double FF_Q23;
- double FF_M123;
- double FF_AoQ23;
- double FF_Mass23;
-
- double FF_D24;
- double FF_T24;
- double FF_V24;
- double FF_Q24;
- double FF_M124;
- double FF_AoQ24;
- double FF_Mass24;
-
- double M1;
- double Q;
- double AoQ;
- double Mass;
-
- double FF_Qav;
- double FF_Massav;
-
double Exo_cosa;
double Exo_E;
double Exo_EDC_vamos;
diff --git a/Projects/AlPhaPha/conversion/2024/.convert.h.swp b/Projects/AlPhaPha/conversion/2024/.convert.h.swp
deleted file mode 100644
index 6a91abe1127718b78ed23af811770f82ae4d48b2..0000000000000000000000000000000000000000
Binary files a/Projects/AlPhaPha/conversion/2024/.convert.h.swp and /dev/null differ