diff --git a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def index ed29b288f569e2a345d449094c9c906fc5caf238..c0e460cd0eb14f31d7777bf5d56414010c134bb9 100644 --- a/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def +++ b/DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def @@ -10,3 +10,5 @@ block H.hod.* block H.cal.* block H.gtr.* block H.kin.* +block H.rb.* +block H.react.* diff --git a/DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def b/DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def new file mode 100644 index 0000000000000000000000000000000000000000..89198281b5013895acc8d369cdf4d2384e0a50f9 --- /dev/null +++ b/DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def @@ -0,0 +1,4 @@ +TH1F hreactx 'HMS React x; React x (cm);' H.react.x 100 -5 5 +TH1F hreacty 'HMS React x; React y (cm);' H.react.y 100 -5 5 +TH1F hreactz 'HMS React x; React z (cm);' H.react.z 100 -15 15 + diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def b/DEF-files/HMS/PRODUCTION/hstackana_production.def index 9301c0d60c9dc730166704f9d4fb70d440fea2bc..77b0b8d825bc772e867ca7b91949a9780ba46d9d 100644 --- a/DEF-files/HMS/PRODUCTION/hstackana_production.def +++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def @@ -15,5 +15,6 @@ #include "DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def" #include "DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def" #include "DEF-files/HMS/PRODUCTION/EPICS/hepics_vars.def" +#include "DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def" diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C index 226a42cc7a3b81cfc19532c29bab80507da05867..ed8f98d9b214c638a04be4873ddaeb40c1f061b2 100644 --- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C +++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms.C @@ -51,7 +51,7 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) { TRG->AddDetector(hms); // Set up the equipment to be analyzed. - THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS"); + THcHallCSpectrometer* HMS = new THcHallCSpectrometer("H", "HMS"); gHaApps->Add(HMS); // Add drift chambers to HMS apparatus THcDC* dc = new THcDC("dc", "Drift Chambers"); @@ -75,6 +75,8 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) { // Add Rastered Beam Apparatus THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline"); gHaApps->Add(beam); + THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb"); + gHaPhysics->Add(hrp); // Add Ideal Beam Apparatus // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline"); // gHaApps->Add(beam); @@ -89,8 +91,10 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) { THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180"); gHaEvtHandlers->Add(hcepics); // Add handler for scaler events - THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 1"); - hscaler->AddEvtType(1); + THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H", "Hall C scaler event type 2"); + hscaler->AddEvtType(2); + hscaler->AddEvtType(129); + hscaler->SetDelayedType(129); hscaler->SetUseFirstEvent(kTRUE); gHaEvtHandlers->Add(hscaler); @@ -108,7 +112,7 @@ void replay_production_hms(Int_t RunNumber=0, Int_t MaxEvent=0) { // Define the run(s) that we want to analyze. // We just set up one, but this could be many. - THaRun* run = new THaRun( pathList, Form(RunFileNamePattern, RunNumber) ); + THcRun* run = new THcRun( pathList, Form(RunFileNamePattern, RunNumber) ); // Set to read in Hall C run database parameters run->SetRunParamClass("THcRunParameters");