@@ -9,6 +9,8 @@
 import org.jlab.detector.banks.RawDataBank;
 import org.jlab.detector.base.DetectorDescriptor;
 import org.jlab.detector.base.DetectorType;
+import org.jlab.io.banks.BMT_adc;
+import org.jlab.io.banks.BST_adc;
 import org.jlab.io.base.DataEvent;
 import org.jlab.rec.cvt.Constants;
 import org.jlab.rec.cvt.Geometry;
@@ -112,11 +114,11 @@ public void fetch_BMTHits(DataEvent event, Swim swim, IndexedTable status,
                 //if (bankDGTZ.getInt("ADC", i) < 1) {
                     //continue; // gemc assigns strip value -1 for inefficiencies, we only consider strips with values between 1 to the maximum strip number for a given detector
                 //}                
-                int sector  = bankDGTZ.getByte("sector", i);
-                int layer   = bankDGTZ.getByte("layer", i);
-                int strip   = bankDGTZ.getShort("component", i);
-                double ADCtoEdep = bankDGTZ.getInt("ADC", i);
-                double time = bankDGTZ.getFloat("time", i);
+                int sector  = bankDGTZ.getByte(BMT_adc.sector, i);
+                int layer   = bankDGTZ.getByte(BMT_adc.layer, i);
+                int strip   = bankDGTZ.getShort(BMT_adc.component, i);
+                double ADCtoEdep = bankDGTZ.getInt(BMT_adc.ADC, i);
+                double time = bankDGTZ.getFloat(BMT_adc.time, i);
                 int order   = bankDGTZ.trueOrder(i);
                 //if (order == 1) {
                 //    continue;
@@ -260,10 +262,10 @@ public void fetch_SVTHits(DataEvent event, int omitLayer, int omitHemisphere,
             Map<Integer, Double> tdcs = new HashMap<>();
             for (int i = 0; i < rows; i++) {                
                 if(bankDGTZ.getInt("ADC", i) < 0) {
-                    int sector = bankDGTZ.getByte("sector", i);
-                    int layer  = bankDGTZ.getByte("layer", i);
-                    int strip = bankDGTZ.getShort("component", i);
-                    double time = bankDGTZ.getFloat("time", i);
+                    int sector = bankDGTZ.getByte(BST_adc.sector, i);
+                    int layer  = bankDGTZ.getByte(BST_adc.layer, i);
+                    int strip = bankDGTZ.getShort(BST_adc.component, i);
+                    double time = bankDGTZ.getFloat(BST_adc.time, i);
 
                     //if (order == 1) {
                     //    continue;
@@ -286,13 +288,13 @@ public void fetch_SVTHits(DataEvent event, int omitLayer, int omitHemisphere,
                 if (bankDGTZ.getInt("ADC", i) < 0) {
                     continue; // ignore hits TDC hits with ADC==-1 
                 }
-                int order   = bankDGTZ.getByte("order", i);
+                int order   = bankDGTZ.getByte(BST_adc.order, i);
                 int id      = i + 1;
-                int sector  = bankDGTZ.getByte("sector", i);
-                int layer   = bankDGTZ.getByte("layer", i);
-                int strip   = bankDGTZ.getShort("component", i);
-                int ADC     = bankDGTZ.getInt("ADC", i);
-                double time = 0;//bankDGTZ.getFloat("time", i);
+                int sector  = bankDGTZ.getByte(BST_adc.sector, i);
+                int layer   = bankDGTZ.getByte(BST_adc.layer, i);
+                int strip   = bankDGTZ.getShort(BST_adc.component, i);
+                int ADC     = bankDGTZ.getInt(BST_adc.ADC, i);
+                double time = 0;//bankDGTZ.getFloat(BST_adc.time, i);
                 int tdcstrip = 1;
                 if(strip>128) tdcstrip = 129;
                 int key = DetectorDescriptor.generateHashCode(sector, layer, tdcstrip);