diff --git a/DEF-files/HMS/DC/hdcana_cuts.def b/DEF-files/HMS/DC/hdcana_cuts.def
index 5add84a3159e6f172fdc03285b01e56eac648310..3af34a5e9835ac62bdbfcc30004dda336ed171d9 100644
--- a/DEF-files/HMS/DC/hdcana_cuts.def
+++ b/DEF-files/HMS/DC/hdcana_cuts.def
@@ -11,4 +11,3 @@ CoarseTracking_master 1
 
 Block: CoarseReconstruct
 CourseReconstruct 0
-
diff --git a/DEF-files/HMS/HODO/hhodoana.def b/DEF-files/HMS/HODO/hhodoana.def
new file mode 100644
index 0000000000000000000000000000000000000000..dce19653d69fe935891e872ee97fa5e69ab2e7ff
--- /dev/null
+++ b/DEF-files/HMS/HODO/hhodoana.def
@@ -0,0 +1,3 @@
+# See $ANALYZER/examples/output_example.def for examples
+#
+block H.hod.*
\ No newline at end of file
diff --git a/DEF-files/HMS/HODO/hhodoana_cuts.def b/DEF-files/HMS/HODO/hhodoana_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..3af34a5e9835ac62bdbfcc30004dda336ed171d9
--- /dev/null
+++ b/DEF-files/HMS/HODO/hhodoana_cuts.def
@@ -0,0 +1,13 @@
+Block: RawDecode
+
+Pedestal_event 0
+RawDecode_master 1
+
+Block: Decode
+Decode_master 1
+
+Block: CoarseTracking
+CoarseTracking_master 1
+
+Block: CoarseReconstruct
+CourseReconstruct 0
diff --git a/DEF-files/HMS/TRIG/htrigana.def b/DEF-files/HMS/TRIG/htrigana.def
new file mode 100644
index 0000000000000000000000000000000000000000..7b256280bdee987480ee6d47b3521268c0c566d7
--- /dev/null
+++ b/DEF-files/HMS/TRIG/htrigana.def
@@ -0,0 +1,3 @@
+# See $ANALYZER/examples/output_example.def for examples
+#
+block T.hms.*
diff --git a/DEF-files/HMS/TRIG/htrigana_cuts.def b/DEF-files/HMS/TRIG/htrigana_cuts.def
new file mode 100644
index 0000000000000000000000000000000000000000..3af34a5e9835ac62bdbfcc30004dda336ed171d9
--- /dev/null
+++ b/DEF-files/HMS/TRIG/htrigana_cuts.def
@@ -0,0 +1,13 @@
+Block: RawDecode
+
+Pedestal_event 0
+RawDecode_master 1
+
+Block: Decode
+Decode_master 1
+
+Block: CoarseTracking
+CoarseTracking_master 1
+
+Block: CoarseReconstruct
+CourseReconstruct 0
diff --git a/MAPS/HMS/DETEC/hdc_hhodo_htrig.map b/MAPS/HMS/DETEC/hdc_hhodo_htrig.map
index 1941626d428103b906f5be82a7df73795aed6266..b6afdeaef38165da8fb21b7ac9a80791d0a847ff 100644
--- a/MAPS/HMS/DETEC/hdc_hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/hdc_hhodo_htrig.map
@@ -1,6 +1,6 @@
-! THMS_ID=10       ::  ADC+,ADC-,TDC+,TDC-
-! HDC_ID=11        ::  ADC+,ADC-,TDC+,TDC-
-! HSCIN_ID=13      ::  ADC+,ADC-,TDC+,TDC-
+! THMS_ID=10       ::  TDC
+! HDC_ID=11        ::  TDC
+! HSCIN_ID=13      ::  TDC
 
 
 DETECTOR=10
@@ -1324,14 +1324,14 @@ SLOT=15
   15,   4,   2,   1  ! h2y02A-
 
 SLOT=16
-   0,   4,  10,   1  ! h2y10A-
-   1,   4,   9,   1  ! h2y09A-
-   2,   4,   8,   1  ! h2y08A-
-   3,   4,   7,   1  ! h2y07A-
-   4,   4,   6,   1  ! h2y06A-
-   5,   4,   5,   1  ! h2y05A-
-   6,   4,   4,   1  ! h2y04A-
-   7,   4,   3,   1  ! h2y03A-
+   0,   4,   3,   1  ! h2y03A-
+   1,   4,   4,   1  ! h2y04A-
+   2,   4,   5,   1  ! h2y05A-
+   3,   4,   6,   1  ! h2y06A-
+   4,   4,   7,   1  ! h2y07A-
+   5,   4,   8,   1  ! h2y08A-
+   6,   4,   9,   1  ! h2y09A-
+   7,   4,  10,   1  ! h2y10A-
 
 SLOT=20
    0,   1,   1,   2  ! h1x01T+
diff --git a/SCRIPTS/HMS/replay_hhodo_test_stand.C b/SCRIPTS/HMS/replay_hhodo_test_stand.C
index 12de01928212d263036af7b6c63c38e9572cc60e..78f249d1a70250a8bc2006a026499cb69d35f2da 100644
--- a/SCRIPTS/HMS/replay_hhodo_test_stand.C
+++ b/SCRIPTS/HMS/replay_hhodo_test_stand.C
@@ -1,4 +1,4 @@
-void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
+void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Get RunNumber and MaxEvent if not provided.
   if(RunNumber == 0) {
@@ -32,8 +32,8 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
 
   // Load params for HMS DC test stand configuration
-  gHcParms->Load("PARAM/HMS/DC/hdc_test_stand.param");
-  gHcParms->Load("PARAM/TRIG/thms.param");
+  // gHcParms->Load("PARAM/HMS/DC/hdc_test_stand.param");
+  // gHcParms->Load("PARAM/TRIG/thms.param");
 
   // Load the Hall C style detector map
   gHcDetectorMap = new THcDetectorMap();
@@ -44,14 +44,14 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // gHcDetectorMap->Load("MAPS/HMS/DETEC/htrig.map");
   // Load combined map
   // gHcDetectorMap->Load("MAPS/hdc_htrig.map");
-  gHcDetectorMap->Load("MAPS/HMS/DETEC/hdc_hhodo_htrig.map");
+  gHcDetectorMap->Load("MAPS/HMS/DETEC/hhodo.map");
   
   // Set up the equipment to be analyzed.
   THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
   gHaApps->Add(HMS);
   // Add drift chambers to HMS apparatus
-  THcDC* dc = new THcDC("dc", "Drift Chambers");
-  HMS->AddDetector(dc);
+  // THcDC* dc = new THcDC("dc", "Drift Chambers");
+  // HMS->AddDetector(dc);
   // Add hodoscope to HMS apparatus
   THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
   HMS->AddDetector(hod);
@@ -66,11 +66,11 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // HMS->AddDetector(aerogel);
 
   // Add trigger apparatus
-  THaApparatus* TRG = new THcTrigApp("T", "TRG");
-  gHaApps->Add(TRG);
+  // THaApparatus* TRG = new THcTrigApp("T", "TRG");
+  // gHaApps->Add(TRG);
   // Add trigger detector to trigger apparatus
-  THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
-  TRG->AddDetector(hms);
+  // THcTrigDet* hms = new THcTrigDet("hms", "HMS Trigger Information");
+  // TRG->AddDetector(hms);
   
   //THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("HS", "HC scaler event type 0");
   //hscaler->SetDebugFile("HScaler.txt");
@@ -110,8 +110,10 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/HMS/DC/hdcana.def");
- analyzer->SetCutFile("DEF-files/HMS/DC/hdcana_cuts.def");    // optional
+ // analyzer->SetOdefFile("DEF-files/HMS/DC/hdcana.def");
+ // analyzer->SetCutFile("DEF-files/HMS/DC/hdcana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/HMS/HODO/hhodoana.def");
+ analyzer->SetCutFile("DEF-files/HMS/HODO/hhodoana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/HMS/replay_htrig_test_stand.C b/SCRIPTS/HMS/replay_htrig_test_stand.C
index 12de01928212d263036af7b6c63c38e9572cc60e..ea3326a968a1b703231857eba6e8566c8a724266 100644
--- a/SCRIPTS/HMS/replay_htrig_test_stand.C
+++ b/SCRIPTS/HMS/replay_htrig_test_stand.C
@@ -1,4 +1,4 @@
-void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
+void replay_htrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Get RunNumber and MaxEvent if not provided.
   if(RunNumber == 0) {
@@ -32,7 +32,7 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
 
   // Load params for HMS DC test stand configuration
-  gHcParms->Load("PARAM/HMS/DC/hdc_test_stand.param");
+  // gHcParms->Load("PARAM/HMS/DC/hdc_test_stand.param");
   gHcParms->Load("PARAM/TRIG/thms.param");
 
   // Load the Hall C style detector map
@@ -47,14 +47,14 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcDetectorMap->Load("MAPS/HMS/DETEC/hdc_hhodo_htrig.map");
   
   // Set up the equipment to be analyzed.
-  THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
-  gHaApps->Add(HMS);
+  // THaApparatus* HMS = new THcHallCSpectrometer("H", "HMS");
+  // gHaApps->Add(HMS);
   // Add drift chambers to HMS apparatus
-  THcDC* dc = new THcDC("dc", "Drift Chambers");
-  HMS->AddDetector(dc);
+  // THcDC* dc = new THcDC("dc", "Drift Chambers");
+  // HMS->AddDetector(dc);
   // Add hodoscope to HMS apparatus
-  THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
-  HMS->AddDetector(hod);
+  // THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
+  // HMS->AddDetector(hod);
   // // Add calorimeter to HMS apparatus
   // THcShower* cal = new THcShower("cal", "Calorimeter");
   // HMS->AddDetector(cal);
@@ -110,8 +110,8 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/HMS/DC/hdcana.def");
- analyzer->SetCutFile("DEF-files/HMS/DC/hdcana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/HMS/TRIG/htrigana.def");
+ analyzer->SetCutFile("DEF-files/HMS/TRIG/htrigana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional