diff --git a/SCRIPTS/replay_hms.C b/SCRIPTS/replay_hms.C
index 5ccc9a8277e318fbf17cc8264ddba0b9e377707a..1090f5c19b4dd26f2e759a9b11a43e29ad01fb17 100644
--- a/SCRIPTS/replay_hms.C
+++ b/SCRIPTS/replay_hms.C
@@ -1,106 +1,111 @@
void replay_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
- //
- //
- if(RunNumber == 0) {
- cout << "Enter a Run Number (-1 to exit): ";
- cin >> RunNumber;
- if( RunNumber<=0 ) break;
- }
- if(MaxEvent == 0) {
- cout << "\nNumber of Events to analyze: ";
- cin >> MaxEvent;
- if(MaxEvent == 0) {
- cerr << "...Invalid entry\n";
- exit;
- }
- }
-
- char* RunFileNamePattern="raw/test_%d.dat";
- const char* ROOTFileNamePattern = "ROOTfiles/hms1190_%d.root";
- //
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
-
- gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
- // g_ctp_parm_filename and g_decode_map_filename should now be defined
-
- gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
- gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
-
-
- // Generate db_cratemap to correspond to map file contents
+ // Get RunNumber and MaxEvent if not provided.
+ if(RunNumber == 0) {
+ cout << "Enter a Run Number (-1 to exit): ";
+ cin >> RunNumber;
+ if( RunNumber<=0 ) break;
+ }
+ if(MaxEvent == 0) {
+ cout << "\nNumber of Events to analyze: ";
+ cin >> MaxEvent;
+ if(MaxEvent == 0) {
+ cerr << "...Invalid entry\n";
+ exit;
+ }
+ }
+
+ // Create file name patterns.
+ char* RunFileNamePattern = "raw/test_%d.dat";
+ const char* ROOTFileNamePattern = "ROOTfiles/hms1190_%d.root";
+ // Add variables to global list.
+ gHcParms->Define("gen_run_number", "Run Number", RunNumber);
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
+
+ // Load varibles from files to global list.
+ gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
+
+ // g_ctp_parm_filename and g_decode_map_filename should now be defined.
+ gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
+ gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+
+ // Generate db_cratemap to correspond to map file contents via Pearl script.
//char command[100];
- // sprintf(command,"MAPS/make_cratemap.pl < %s > db_cratemap.dat",gHcParms->GetString("g_decode_map_filename"));
+ //sprintf(
+ // command,
+ // "MAPS/make_cratemap.pl < %s > MAPS/db_cratemap.dat",
+ // gHcParms->GetString("g_decode_map_filename")
+ //);
//system(command);
- // for now used pre made crate map
-
- // Load the Hall C style detector map
- gHcDetectorMap=new THcDetectorMap();
- gHcDetectorMap->Load(gHcParms->GetString("g_decode_map_filename"));
-
- // Set up the equipment to be analyzed.
-
- THaApparatus* HMS = new THcHallCSpectrometer("H","HMS");
- gHaApps->Add( HMS );
-
- // HMS->AddDetector( new THcHodoscope("hod", "Hodoscope" ));
- //HMS->AddDetector( new THcShower("cal", "Shower" ));
- //THcCherenkov* cherenkov = new THcCherenkov("cher", "Gas Cerenkov" );
- // HMS->AddDetector( cherenkov );
- HMS->AddDetector( new THcDC("dc", "Drift Chambers" ));
- //THcAerogel* aerogel = new THcAerogel("aero", "Aerogel Cerenkov" );
- //HMS->AddDetector( aerogel );
- //
- //THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("HS","HC scaler event type 0");
- // hscaler->SetDebugFile("HScaler.txt");
- //gHaEvtHandlers->Add (hscaler);
- //
- //
-
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- char RunFileName[100];
- sprintf(RunFileName,RunFileNamePattern,RunNumber);
- THaRun* run = new THaRun(RunFileName);
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- run->SetEventRange(1,MaxEvent);// Physics Event number, does not
- // include scaler or control events
- run->SetNscan(1);
- run->SetDataRequired(0x7);
- run->Print();
-
- // Define the analysis parameters
- TString ROOTFileName = Form(ROOTFileNamePattern,RunNumber);
- analyzer->SetCountMode( 2 ); // 0 = counter is # of physics triggers
- //1 = counter is # of all decode reads
- //2= counter is event number
- analyzer->SetEvent( event );
- analyzer->SetOutFile( ROOTFileName.Data() );
- analyzer->SetOdefFile("DEF-files/hdcana.def");
- analyzer->SetCutFile("DEF-files/hdcana_cuts.def"); // optional
-
- // File to record cuts accounting information
- // analyzer->SetSummaryFile("summary_example.log"); // optional
-
- analyzer->Process(run); // start the actual analysis
- // analyzer->PrintReport("TEMPLATES/dcana.template",Form("REPORT_OUTPUT/replay_hms_%05d.report",RunNumber));
+
+ // Load the Hall C style detector map
+ gHcDetectorMap = new THcDetectorMap();
+ gHcDetectorMap->Load(gHcParms->GetString("g_decode_map_filename"));
+
+
+ // Set up the equipment to be analyzed.
+ THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
+ gHaApps->Add(HMS);
+
+ HMS->AddDetector(new THcDC("dc", "Drift Chambers"));
+
+ // Additional detectors:
+ //HMS->AddDetector(new THcHodoscope("hod", "Hodoscope"));
+ //HMS->AddDetector(new THcShower("cal", "Shower"));
+ //
+ //THcCherenkov* cherenkov = new THcCherenkov("cher", "Gas Cerenkov");
+ //HMS->AddDetector(cherenkov);
+ //THcAerogel* aerogel = new THcAerogel("aero", "Aerogel Cerenkov");
+ //HMS->AddDetector(aerogel);
+ //
+ //THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("HS", "HC scaler event type 0");
+ //hscaler->SetDebugFile("HScaler.txt");
+ //gHaEvtHandlers->Add(hscaler);
+
+
+ // Set up the analyzer - we use the standard one,
+ // but this could be an experiment-specific one as well.
+ // The Analyzer controls the reading of the data, executes
+ // tests/cuts, loops over Acpparatus's and PhysicsModules,
+ // and executes the output routines.
+ THcAnalyzer* analyzer = new THcAnalyzer;
+
+ // A simple event class to be output to the resulting tree.
+ // Creating your own descendant of THaEvent is one way of
+ // defining and controlling the output.
+ THaEvent* event = new THaEvent;
+
+ // Define the run(s) that we want to analyze.
+ // We just set up one, but this could be many.
+ char RunFileName[100];
+ sprintf(RunFileName, RunFileNamePattern, RunNumber);
+ THaRun* run = new THaRun(RunFileName);
+
+ // Eventually need to learn to skip over, or properly analyze
+ // the pedestal events
+ run->SetEventRange(1, MaxEvent); // Physics Event number, does not
+ // include scaler or control events.
+ run->SetNscan(1);
+ run->SetDataRequired(0x7);
+ run->Print();
+
+ // Define the analysis parameters
+ TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber);
+ analyzer->SetCountMode(2); // 0 = counter is # of physics triggers
+ // 1 = counter is # of all decode reads
+ // 2 = counter is event number
+ analyzer->SetEvent(event);
+ analyzer->SetOutFile(ROOTFileName.Data());
+ analyzer->SetOdefFile("DEF-files/hdcana.def");
+ analyzer->SetCutFile("DEF-files/hdcana_cuts.def"); // optional
+ // File to record cuts accounting information
+ //analyzer->SetSummaryFile("summary_example.log"); // optional
+
+ // Start the actual analysis.
+ analyzer->Process(run);
+ // Create report file from template.
+ //analyzer->PrintReport( // optional
+ // "TEMPLATES/dcana.template",
+ // Form("REPORT_OUTPUT/replay_hms_%05d.report", RunNumber)
+ //);
}