diff --git a/NPLib/Detectors/Sofia/GladFieldMap.cxx b/NPLib/Detectors/Sofia/GladFieldMap.cxx index ef72f6f80493f3af6d7593857d5b3c9af71faad3..00cca76dbb30867eeb8c1563520c691867889d31 100644 --- a/NPLib/Detectors/Sofia/GladFieldMap.cxx +++ b/NPLib/Detectors/Sofia/GladFieldMap.cxx @@ -48,7 +48,7 @@ GladFieldMap::GladFieldMap() { m_bin = 50; m_Current = 2135.; m_Scale = m_Current/3583.81; - m_Glad_Entrance = TVector3(0,0,-1.135*m); + m_Glad_Entrance = TVector3(0,0,-1.1135*m); m_Glad_TurningPoint = TVector3(0,0,0); m_Tilt = -14.*deg; m_B = m_Scale*m_Bmax; diff --git a/Projects/s455/Analysis.cxx b/Projects/s455/Analysis.cxx index 4085ae48f3da62c0cb8f81de260095c42350a7f0..e1eaa314772617e9abfd8f9a58b61017f30b0e17 100644 --- a/Projects/s455/Analysis.cxx +++ b/Projects/s455/Analysis.cxx @@ -104,8 +104,8 @@ void Analysis::Init(){ m_GladField = new GladFieldMap(); m_GladField->SetCurrent(2135.); //m_GladField->SetGladEntrance(0, 0.02*m, 2.774*m + 0.5405*m); - m_GladField->SetGladEntrance(0, 0, -1.135*m); - //m_GladField->SetGladTurningPoint(0, 0.02*m, 2.774*m + 0.5405*m + 1.135*m); + m_GladField->SetGladEntrance(0, 0, -1.1135*m); + //m_GladField->SetGladTurningPoint(0, 0.02*m, 2.774*m + 0.5405*m + 1.1135*m); m_GladField->SetGladTurningPoint(0, 0, 0); m_GladField->SetGladTiltAngle(-14.*deg); m_GladField->LoadMap("GladFieldMap_50mm.dat"); @@ -610,11 +610,8 @@ void Analysis::FissionFragmentAnalysis(int which_cathode){ } } - // *** 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; + + DistanceATToG = DistanceStartToG - DistancePlasticToCathode[which_cathode-1]; double Theta0 = 20.*deg;//m_GladField->GetCentralTheta(); double XA = 0; double ZA = DistanceStartToA - DistanceStartToG; @@ -900,6 +897,10 @@ void Analysis::End(){ //////////////////////////////////////////////////////////////////////////////// void Analysis::InitParameter(){ + DistanceStartToG = 2.774*m + 0.5405*m + 1.1135*m; + DistanceStartToA = 2.3155*m; + DistanceStartToMW2 = 2.651*m; + DistancePlasticToCathode[0] = 285;//Distance to Pb1 DistancePlasticToCathode[1] = 385;//Distance to Pb2 DistancePlasticToCathode[2] = 335.;//Distance to C diff --git a/Projects/s455/Analysis.h b/Projects/s455/Analysis.h index acd91cb9a98578ca3169f4d24452b3b44a220fa9..995d3a2c506e4ae4bcd0109cd07118a187482559 100644 --- a/Projects/s455/Analysis.h +++ b/Projects/s455/Analysis.h @@ -88,6 +88,10 @@ class Analysis: public NPL::VAnalysis{ double fZBeta_p1; double DistancePlasticToCathode[3]; + double DistanceStartToG; + double DistanceStartToA; + double DistanceStartToMW2; + double DistanceATToG; TCutG* cut_Pb1[14]; TCutG* cut_Pb2[14];