diff --git a/NPLib/Detectors/Sofia/TSofFissionFragment.cxx b/NPLib/Detectors/Sofia/TSofFissionFragment.cxx
index f79cc7528003b11310ead2f8191f4dc86f58a2bf..ccad1267ec62a6890c48645482d29c727884883b 100644
--- a/NPLib/Detectors/Sofia/TSofFissionFragment.cxx
+++ b/NPLib/Detectors/Sofia/TSofFissionFragment.cxx
@@ -81,6 +81,7 @@ void TSofFissionFragment::Clear() {
fFF_Zsum = -1;
fFF_iZsum = -1;
+ fFF_Cathode = -1;
}
diff --git a/NPLib/Detectors/Sofia/TSofFissionFragment.h b/NPLib/Detectors/Sofia/TSofFissionFragment.h
index 785e7eef550f7b77b36a42bc68741e95681bad05..e4b43382d33c3391e3c9373c3a32f44f0c5ebfd9 100644
--- a/NPLib/Detectors/Sofia/TSofFissionFragment.h
+++ b/NPLib/Detectors/Sofia/TSofFissionFragment.h
@@ -71,6 +71,7 @@ class TSofFissionFragment : public TObject {
vector<double> fFF_deff2;
double fFF_Zsum;
int fFF_iZsum;
+ int fFF_Cathode;
//////////////////////////////////////////////////////////////
// Constructor and destructor
@@ -94,6 +95,7 @@ class TSofFissionFragment : public TObject {
// add //! to avoid ROOT creating dictionnary for the methods
public:
////////////////////// SETTERS ////////////////////////
+ inline void SetCathode(int val){fFF_Cathode = val;};//!
inline void SetZsum(double val){fFF_Zsum = val;};//!
inline void SetiZsum(int val){fFF_iZsum = val;};//!
inline void SetPlastic(int val){fFF_Plastic.push_back(val);};//!
@@ -139,6 +141,7 @@ class TSofFissionFragment : public TObject {
/*int GetMultMwpc1() {return fFF_PosY1.size();}//!
int GetMultMwpc2() {return fFF_PosY2.size();}//!
int GetMultMwpc3() {return fFF_PosY3.size();}//!*/
+ inline int GetCathode() const {return fFF_Cathode;}//!
inline double GetZsum() const {return fFF_Zsum;}//!
inline int GetiZsum() const {return fFF_iZsum;}//!
inline int GetPlastic(int i) const {return fFF_Plastic[i];}//!
diff --git a/Projects/Strasse/reaction/C12_p2p.reaction b/Projects/Strasse/reaction/C12_p2p.reaction
index 35905b5ae139d39012956b1fb02a46a3be533851..03be548931a5e7a94eedc077211d607bff73912f 100755
--- a/Projects/Strasse/reaction/C12_p2p.reaction
+++ b/Projects/Strasse/reaction/C12_p2p.reaction
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Beam
Particle= 12C
- Energy= 4800 MeV
+ Energy= 3200 MeV
SigmaEnergy= 0 MeV
SigmaThetaX= 0.1 deg
SigmaPhiY= 0.1 deg
diff --git a/Projects/s455/Analysis.cxx b/Projects/s455/Analysis.cxx
index bf174527c2094ad1b76698878cc8b43466d2f5cd..4085ae48f3da62c0cb8f81de260095c42350a7f0 100644
--- a/Projects/s455/Analysis.cxx
+++ b/Projects/s455/Analysis.cxx
@@ -110,7 +110,7 @@ void Analysis::Init(){
m_GladField->SetGladTiltAngle(-14.*deg);
m_GladField->LoadMap("GladFieldMap_50mm.dat");
m_GladField->SetBin(50);
- m_GladField->SetTimeStep(0.8);
+ m_GladField->SetTimeStep(0.4);
m_GladField->SetCentralTheta(-20.*deg);
//double Z_MWPC3 = 7.852*m;
@@ -122,7 +122,7 @@ void Analysis::Init(){
InitParameter();
InitOutputBranch();
LoadSpline();
-
+ LoadActiveTargetCuts();
}
////////////////////////////////////////////////////////////////////////////////
@@ -139,8 +139,28 @@ void Analysis::TreatEvent(){
SofTofW->SetStartTime(start_time);
SofTofW->BuildPhysicalEvent();
- FissionFragmentAnalysis();
- //BeamFragmentAnalysis();
+ if(SofAt->Energy.size()==3 || SofAt->Energy.size()==4){
+ double Anode1 = SofAt->Energy[0];
+ double Anode2 = SofAt->Energy[1];
+ double Anode3 = SofAt->Energy[2];
+ int k= fRunID-1;
+ int which_cathode = 0;
+
+ if(cut_Pb1[k]->IsInside(Anode1,Anode2)){
+ which_cathode = 1;
+ }
+ else if(cut_Pb2[k]->IsInside(Anode2,Anode3)){
+ which_cathode = 2;
+ }
+ else if(cut_C[k]->IsInside(Anode2,Anode3)){
+ which_cathode = 3;
+ }
+ else
+ return;
+
+ FissionFragmentAnalysis(which_cathode);
+ //BeamFragmentAnalysis();
+ }
}
}
@@ -180,7 +200,7 @@ void Analysis::BeamFragmentAnalysis(){
}
////////////////////////////////////////////////////////////////////////////////
-void Analysis::FissionFragmentAnalysis(){
+void Analysis::FissionFragmentAnalysis(int which_cathode){
unsigned int softofw_size = SofTofW->PlasticNbr.size();
unsigned int softwim_size = SofTwim->SectionNbr.size();
@@ -590,9 +610,9 @@ void Analysis::FissionFragmentAnalysis(){
}
}
-
// *** Calculation Theta_out *** //
double DistanceStartToG = 2.774*m + 0.5405*m +1.135*m;
+ double DistanceATToG = 2.774*m + 0.5405*m +1.135*m - DistancePlasticToCathode[which_cathode-1];
double DistanceStartToA = 2.3155*m;
double DistanceStartToMW2 = 2.651*m;
double Theta0 = 20.*deg;//m_GladField->GetCentralTheta();
@@ -606,7 +626,8 @@ void Analysis::FissionFragmentAnalysis(){
double Z3lab = 0;;
double Tilt = 14.*deg;//;
TVector3 vZ = TVector3(0,0,1);
- TVector3 vStart = TVector3(0,0,-DistanceStartToG);
+ //TVector3 vStart = TVector3(0,0,-DistanceStartToG);
+ TVector3 vStart = TVector3(0,0,-DistanceATToG);
double XC = 0;
double ZC = 0;
double XB = 0;
@@ -615,8 +636,9 @@ void Analysis::FissionFragmentAnalysis(){
double ZD = 0;
double MagB = m_GladField->GetB()/1000;
for(int i=0; i<2; i++){
- XA = TofHit[i].DT;
- if(XA != -1e6){
+ XA = TofHit[i].DT;
+ if(XA != -1e6 && SofBeamID->GetBeta()>0){
+
TVector3 vG = TVector3(0,0,ZG);
TVector3 vA = TVector3(XA,0,ZA);
// *** Extroplate to C position *** //
@@ -665,12 +687,11 @@ void Analysis::FissionFragmentAnalysis(){
TofHit[i].xd = XD;
TofHit[i].zd = ZD;
TVector3 vD = TVector3(XD,0,ZD);
-
+
// *** Extrapolate position of the rho point *** //
TofHit[i].BrhoX = XB - TofHit[i].rho*cos(TofHit[i].theta_in);
TofHit[i].BrhoZ = ZB + TofHit[i].rho*sin(TofHit[i].theta_in);
TVector3 vBrho = TVector3(TofHit[i].BrhoX, 0, TofHit[i].BrhoZ);
-
TVector3 v3lab = TVector3(X3lab,0,Z3lab);
TVector3 v1 = TVector3(XB,0,ZB)-vStart;
@@ -680,12 +701,19 @@ void Analysis::FissionFragmentAnalysis(){
double Path2 = TofHit[i].rho*TofHit[i].omega;
double Path3 = v3.Mag();
//double PathLength = Path1 + Path2 + Path3 + 740. + 50.;
+
double PathLength = m_GladField->GetFlightPath(vStart, TofHit[i].Brho, vA, dir) + 740. + 50;
PathLength = PathLength/1000.;
+ double BeamTimeOffset = DistancePlasticToCathode[which_cathode-1]/(SofBeamID->GetBeta()*NPUNITS::c_light);
+
+ TofHit[i].tof = TofHit[i].tof - BeamTimeOffset;
TofHit[i].flight_path = PathLength;
TofHit[i].velocity = PathLength/TofHit[i].tof;
TofHit[i].beta = TofHit[i].velocity * m/ns / NPUNITS::c_light;
+ TofHit[i].gamma = 1. / sqrt(1 - pow(TofHit[i].beta,2));
+ TofHit[i].AoQ = TofHit[i].Brho / (3.10716 * TofHit[i].beta * TofHit[i].gamma);
+ TofHit[i].A = TofHit[i].AoQ * TofHit[i].iZ;
TofHit[i].x2twim = XA;
double Z = TofHit[i].Esec;
@@ -709,10 +737,6 @@ void Analysis::FissionFragmentAnalysis(){
TofHit[i].deff1 = (vO-vB).Mag();
TofHit[i].deff2 = (vD-vO).Mag();
- TofHit[i].gamma = 1. / sqrt(1 - pow(TofHit[i].beta,2));
- TofHit[i].AoQ = TofHit[i].Brho / (3.10716 * TofHit[i].beta * TofHit[i].gamma);
- TofHit[i].A = TofHit[i].AoQ * TofHit[i].iZ;
-
}
}
@@ -753,6 +777,7 @@ void Analysis::FissionFragmentAnalysis(){
SofFF->SetFlightPath(TofHit[i].flight_path);
}
+ SofFF->SetCathode(which_cathode);
SofFF->SetZsum(TofHit[0].Z+TofHit[1].Z);
SofFF->SetiZsum(TofHit[0].iZ+TofHit[1].iZ);
}
@@ -874,6 +899,11 @@ void Analysis::End(){
////////////////////////////////////////////////////////////////////////////////
void Analysis::InitParameter(){
+
+ DistancePlasticToCathode[0] = 285;//Distance to Pb1
+ DistancePlasticToCathode[1] = 385;//Distance to Pb2
+ DistancePlasticToCathode[2] = 335.;//Distance to C
+
fLS2_0 = 135.614;
fDS2 = 8000;
fDCC = -10000;
@@ -1012,6 +1042,38 @@ void Analysis::InitParameter(){
}
+////////////////////////////////////////////////////////////////////////////////
+void Analysis::LoadActiveTargetCuts()
+{
+ TString element[14] = {"180Hg_1", "180Hg_2", "182Hg", "184Hg", "187Pb", "189Pb", "175Pt", "204Fr", "207Fr", "199At_1", "199At_2", "197At", "216Th", "221Pa"};
+
+ TFile* file;
+ TString filename1[14];
+ TString filename2[14];
+ TString filename3[14];
+ cout << "/// Loading Active Target cuts..." << endl;
+ for(int i=0; i<14; i++){
+ filename1[i]= "./macro/cuts/"+element[i]+"/cut_Pb1.root";
+ filename2[i]= "./macro/cuts/"+element[i]+"/cut_Pb2.root";
+ filename3[i]= "./macro/cuts/"+element[i]+"/cut_C.root";
+
+ file = new TFile(filename1[i],"read");
+ cout << "- " << filename1[i] << endl;
+ cut_Pb1[i] = (TCutG*) file->FindObjectAny("cut_Pb1");
+ cut_Pb1[i]->SetName(element[i]+"_Pb1");
+
+ file = new TFile(filename2[i],"read");
+ cout << "- " << filename2[i] << endl;
+ cut_Pb2[i] = (TCutG*) file->FindObjectAny("cut_Pb2");
+ cut_Pb2[i]->SetName(element[i]+"_Pb2");
+
+ file = new TFile(filename3[i],"read");
+ cout << "- " << filename3[i] << endl;
+ cut_C[i] = (TCutG*) file->FindObjectAny("cut_C");
+ cut_C[i]->SetName(element[i]+"_C");
+ }
+}
+
////////////////////////////////////////////////////////////////////////////////
void Analysis::ReInitValue(){
SofBeamID->Clear();
diff --git a/Projects/s455/Analysis.h b/Projects/s455/Analysis.h
index 7b54a0a4bbee29741c9b8141cff2593316d958b0..acd91cb9a98578ca3169f4d24452b3b44a220fa9 100644
--- a/Projects/s455/Analysis.h
+++ b/Projects/s455/Analysis.h
@@ -50,8 +50,9 @@ class Analysis: public NPL::VAnalysis{
void InitParameter();
void ReInitValue();
void BeamAnalysis();
- void FissionFragmentAnalysis();
+ void FissionFragmentAnalysis(int which_cathode);
void BeamFragmentAnalysis();
+ void LoadActiveTargetCuts();
static NPL::VAnalysis* Construct();
@@ -86,6 +87,12 @@ class Analysis: public NPL::VAnalysis{
double fZBeta_p0;
double fZBeta_p1;
+ double DistancePlasticToCathode[3];
+
+ TCutG* cut_Pb1[14];
+ TCutG* cut_Pb2[14];
+ TCutG* cut_C[14];
+
TRandom3 rand;
TSpline3* fcorr_z_beta[4];