diff --git a/Projects/s455/Analysis.cxx b/Projects/s455/Analysis.cxx index f60e2823c8e4fccd709853ccd234d689590920b2..0f5c187a4ea707e6a7a08988427f11837e02cfc3 100644 --- a/Projects/s455/Analysis.cxx +++ b/Projects/s455/Analysis.cxx @@ -484,13 +484,13 @@ void Analysis::InitParameter(){ fDCC = -10000; fK_LS2 = -30e-8; - fRunID = 8; + fRunID = 5; // Beam parameter // fZBeta_p0 = 1; fZBeta_p1 = 0; - // FF paramter // + // FF parameter // fZff_p0 = 2.80063; fZff_p1 = 6.91985e-2; fZff_p2 = 1.01598e-7; @@ -502,14 +502,17 @@ void Analysis::InitParameter(){ fZbeam_p1 = 0.674945; fZbeam_p2 = -8.32085e-6; - fZBeta_p0 = 2.73; - fZBeta_p1 = 74.7153; + fZBeta_p0 = 72.946; + fZBeta_p1 = 6.0644; } if(fRunID==3){ fBrho0 = 10.8183; // 182Hg fZbeam_p0 = -2737.25; fZbeam_p1 = 0.452017; fZbeam_p2 = -3.48831e-6; + + fZBeta_p0 = 76.6738; + fZBeta_p1 = 1.60128; } if(fRunID==4){ fBrho0 = 10.9558; // 184Hg @@ -522,18 +525,27 @@ void Analysis::InitParameter(){ fZbeam_p0 = -2858.72; fZbeam_p1 = 0.454064; fZbeam_p2 = -3.36443e-6; + + fZBeta_p0 = 71.0975; + fZBeta_p1 = 10.7007; } if(fRunID==6){ fBrho0 = 10.9476; // 189Pb fZbeam_p0 = 1590.66; fZbeam_p1 = 0.0956455; fZbeam_p2 = 3.84585e-6; + + fZBeta_p0 = 74.6063; + fZBeta_p1 = 6.4635; } if(fRunID==7){ fBrho0 = 10.6814; // 175Pt fZbeam_p0 = 459.68; fZbeam_p1 = 0.162277; fZbeam_p2 = 3.10164e-6; + + fZBeta_p0 = 66.9433; + fZBeta_p1 = 10.8664; } if(fRunID==8){ fBrho0 = 11.0864; // 204Fr @@ -549,24 +561,36 @@ void Analysis::InitParameter(){ fZbeam_p0 = -1752.27; fZbeam_p1 = 0.346018; fZbeam_p2 = -8.64673e-7; + + fZBeta_p0 = 63.9575; + fZBeta_p1 = 25.1988; } if(fRunID==10){ fBrho0 = 11.0955; // 199At run 423 & 424 fZbeam_p0 = -116.425; fZbeam_p1 = 0.218256; fZbeam_p2 = 1.62399e-6; + + fZBeta_p0 = 61.3889; + fZBeta_p1 = 25.8908; } if(fRunID==11){ fBrho0 = 10.9970; // 199At run 425 & 426 fZbeam_p0 = -116.425; fZbeam_p1 = 0.218256; fZbeam_p2 = 1.62399e-6; + + fZBeta_p0 = 61.3889; + fZBeta_p1 = 25.8908; } if(fRunID==12){ fBrho0 = 10.8697; //197At fZbeam_p0 = -2683.52; fZbeam_p1 = 0.422551; fZbeam_p2 = -2.44471e-6; + + fZBeta_p0 = 62.9188; + fZBeta_p1 = 22.8827; } if(fRunID==13){ fBrho0 = 11.3418; // 216Th diff --git a/Projects/s455/calibration/SofSci/SofSci_physics.cal b/Projects/s455/calibration/SofSci/SofSci_physics.cal index be44a7ac2729820c1bdbf63f1fd53cfcf321fd38..e8cb13bb55b597dc930e2bf5171bf7e21754cea2 100644 --- a/Projects/s455/calibration/SofSci/SofSci_physics.cal +++ b/Projects/s455/calibration/SofSci/SofSci_physics.cal @@ -1,4 +1,4 @@ -SofSci_TOF2INV_V -8.0425 0.00737389 +SofSci_TOF2INV_V -8.04267 0.00737389 SofSci_LENGTH_S2 135.614 -SofSci_DET1_POSPAR 45.0 80.0 +SofSci_DET1_POSPAR 90.0 54.6 SofSci_DET2_POSPAR 943.287 86.652 diff --git a/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal b/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal index 75ecd84299d10f90d1474365a21b3cea145c2c23..80e81ae3897bce71419200ca0b7240f56bc754df 100644 --- a/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal +++ b/Projects/s455/calibration/SofTrim/SofTrim_SectionAlign.cal @@ -1,3 +1,3 @@ -SofTrim_SEC1_ALIGN -348.015 1.03199 +SofTrim_SEC1_ALIGN 14.3427 1.02007 SofTrim_SEC2_ALIGN 0 1 -SofTrim_SEC3_ALIGN 2496.29 0.984162 +SofTrim_SEC3_ALIGN -2905.47 1.2027 diff --git a/Projects/s455/configs/ConfigSofSci.dat b/Projects/s455/configs/ConfigSofSci.dat index fb8753a900afc67a0204c4db2adc22d2678c034b..6ad1eb327ccc0c4916a2fad9f7f8a85b449e621a 100644 --- a/Projects/s455/configs/ConfigSofSci.dat +++ b/Projects/s455/configs/ConfigSofSci.dat @@ -4,5 +4,5 @@ ConfigSofSci DET2_POSNS_MIN -20 DET2_POSNS_MAX 20 RAWTOF_MIN 1628 - RAWTOF_MAX 1636 + RAWTOF_MAX 1637 diff --git a/Projects/s455/macro/GetChargeDist.C b/Projects/s455/macro/GetChargeDist.C index b81f469e00ea7cfdc7e9d763e572a531a438a539..0fc40b52c95ace0128ec62f3b30679b8a03fea73 100644 --- a/Projects/s455/macro/GetChargeDist.C +++ b/Projects/s455/macro/GetChargeDist.C @@ -88,7 +88,7 @@ void GetChargeDist(string nucleus_name){ cut_beam->SetName("cut_beam"); cut_beam->SetVarX("fBeam_AoQ"); cut_beam->SetVarY("fBeam_Z"); - double Rx=0.005; + double Rx=0.006; double Ry=0.5; AoQ = AoQ;// + 0.001; double Zcenter = Z;// - 0.5; @@ -307,6 +307,7 @@ void LoadRootFiles(string iso){ if(iso=="178Hg" || iso=="179Hg" || iso=="180Hg" || iso=="181Hg"){ chain->Add("../../../Outputs/Analysis/180Hg_1.root"); chain->Add("../../../Outputs/Analysis/180Hg_2.root"); + chain->Add("../../../Outputs/Analysis/175Pt.root"); } //*** Au isotopes ***//