diff --git a/DBASE/COIN/STD/standard.kinematics b/DBASE/COIN/STD/standard.kinematics index 3870246c4d2d1878ac4e36f215b42b74c9880c65..bf059256cfd5904257db6492b9fe218316d41c1d 100644 --- a/DBASE/COIN/STD/standard.kinematics +++ b/DBASE/COIN/STD/standard.kinematics @@ -194,10 +194,10 @@ hpartmass = 0.00051099 1929 gpbeam = 6.405 gtargmass_amu = 1.00794 -htheta_lab = -22.01 -ptheta_lab = 33.07 -hpcentral = 4.284 -ppcentral = 2.925*0.985 +htheta_lab = -35.0 +ptheta_lab = 22.04 +hpcentral = 2.869 +ppcentral = 4.38*0.985 ppartmass = 0.93827231 hpartmass = 0.00051099 diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics index 58b5809c555ef1fec20f7b4d83319ae96dc6c23c..08bd2e2fffa86582b4db7bb5da4d18613f08066b 100644 --- a/DBASE/SHMS/STD/standard.kinematics +++ b/DBASE/SHMS/STD/standard.kinematics @@ -386,7 +386,7 @@ gpbeam = 10.59 gtargmass_amu= 12.0107 ppartmass = 0.00051099 ptheta_lab =7.50 -ppcentral = 2 +ppcentral = 9.8 2249-2253 gpbeam = 10.59 diff --git a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def index 602732599235a5bd65c1eb04ae57d78a3e1e91ec..40b27591902d7e8376dcf9bb74b1dc8404ce9ecc 100644 --- a/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def +++ b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def @@ -56,7 +56,7 @@ TH1F pdc2v1_ddist 'SHMS 2V1 Drift Distance; Drift Distance (cm); Number of Entri # SHMS DC TRACKING VARIABLES AT FOCAL PLANE #------------------------------------------- -TH1F pdc_trk_mom 'SHMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 6 +TH1F pdc_trk_mom 'SHMS DC Track Momentum; P (GeV); Number of Entires / 10 MeV' P.tr.p 600 0 10 TH1F pdc_trk_beta 'SHMS DC Track Beta; Beta (GeV); Number of Entires' P.tr.beta 300 -1.5 1.5 TH2F pdc_xfp_vs_yfp 'SHMS DC X_{fp} vs Y_{fp}; Y_{fp} (cm) / 1 cm; X_{fp} (cm) / 1 cm' P.dc.y_fp P.dc.x_fp 100 -50 50 100 -50 50 TH2F pdc_xpfp_vs_ypfp 'SHMS DC X'_{fp} vs Y'_{fp}; Y'_{fp} / 0.002 rad; X'_{fp} / 0.002 rad' P.dc.yp_fp P.dc.xp_fp 100 -.1 .1 100 -.1 .1 diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def index 649cf2847035b465fc5e6c4544ee5430d07c467a..fd5a8528f7a931a21c4bd8a8bf659641069fbfc8 100644 --- a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def +++ b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def @@ -176,7 +176,7 @@ shmsGoodBetanotrk P.hod.betanotrack > 0.5 && P.hod.betanotrack < 1.4 shmsScinShould shmsScinGood && shmsGoodBetanotrk && !shmsDCany_large shmsScinShoulde shmsScinShould && P.cal.etotnorm > 0.6 && P.cal.etotnorm < 1.6 && P.hgcer.npeSum > 0.5 -shmsScinShouldh shmsScinShould && P.cal.etotnorm <= 0.6 && P.cal.etotnorm > 0. && P.hgcer.npeSum < 0.2 +shmsScinShouldh shmsScinShould && P.cal.etotnorm > 0. && P.hgcer.npeSum < 0.5 shmsScinDid shmsScinShould && P.dc.ntrack > 0 shmsScinDide shmsScinShoulde && P.dc.ntrack > 0 shmsScinDidh shmsScinShouldh && P.dc.ntrack > 0 diff --git a/SCRIPTS/COIN/MONITOR/Bean_counter.C b/SCRIPTS/COIN/MONITOR/Bean_counter.C index e44439ce4d147765c09aefdb15c1c8cb2d86b922..82cbe1b9105bdefb1bb3e50216fbbcc95d9f56e2 100644 --- a/SCRIPTS/COIN/MONITOR/Bean_counter.C +++ b/SCRIPTS/COIN/MONITOR/Bean_counter.C @@ -78,7 +78,12 @@ void Bean_counter(Int_t runNumber, Int_t targ){ tt->SetBranchAddress("H.cal.etottracknorm", &hcaletot); tt->SetBranchAddress("H.cer.npeSum", &hcernpe); tt->SetBranchAddress("H.kin.primary.W", &pkinW); - tt->SetBranchAddress("P.kin.secondary.emiss", &pEm); + if (targ == 1) { + tt->SetBranchAddress("P.kin.secondary.emiss", &pEm); + } + else if (targ == 2){ + tt->SetBranchAddress("P.kin.secondary.emiss_nuc", &pEm); } + tt->SetBranchAddress("P.kin.secondary.pmiss", &pPm); tt->SetBranchAddress("P.hod.goodstarttime", &PhodStatus); @@ -187,7 +192,7 @@ void Bean_counter(Int_t runNumber, Int_t targ){ } else if (targ == 2) { - if (sqrt(pPm*pPm) < 0.4) + if (sqrt(pPm*pPm) < 0.6) { h_hdelta->Fill(hdelta); h_hxptar->Fill(HgtrPh); diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor.root b/SCRIPTS/COIN/MONITOR/coin_monitor.root index fb2268045b3ed6a56c4dbbeed0d9451376b088bc..300b5f30d968cf8fc3ca7174f88f04298820501b 100644 Binary files a/SCRIPTS/COIN/MONITOR/coin_monitor.root and b/SCRIPTS/COIN/MONITOR/coin_monitor.root differ diff --git a/TEMPLATES/COIN/PRODUCTION/coin_production.template b/TEMPLATES/COIN/PRODUCTION/coin_production.template index 83d2e2f54115365552aef5bb83129fd6211229c7..ff42f22f2dd0af901970ba7663e9a5b2300cb539 100644 --- a/TEMPLATES/COIN/PRODUCTION/coin_production.template +++ b/TEMPLATES/COIN/PRODUCTION/coin_production.template @@ -475,6 +475,8 @@ f1pspacepoints : {f1PSpacePoints.npassed} f2pspacepoints : {f2PSpacePoints.npassed} ptest1=p hits/planes, f sp : {pTest1.npassed} ptest2=p sp, f stubs : {pTest2.npassed} +pdcanylarge : {shmsDCany_large.npassed} +pgoodbetanotrk : {shmsGoodBetanotrk.npassed} pdid : {shmsScinDid.npassed} pdide : {shmsScinDide.npassed} pdidh : {shmsScinDidh.npassed} @@ -612,6 +614,10 @@ f1hspacepoints : {f1HSpacePoints.npassed} f2hspacepoints : {f2HSpacePoints.npassed} htest1=p hits/planes, f sp : {hTest1.npassed} htest2=p sp, f stubs : {hTest2.npassed} +hdcanylarge : {hmsDCany_large.npassed} +hdc16hits : {hmsDC1Planes6hits.npassed} +hdc26hits : {hmsDC2Planes6hits.npassed} +hgoodbetanotrk : {HMSGoodBetanotrk.npassed} hdid : {HMSScinDid.npassed} hdide : {HMSScinDide.npassed} hdidh : {HMSScinDidh.npassed}