1313import org .jlab .geom .component .ScintillatorPaddle ;
1414import org .jlab .groot .data .H1F ;
1515import org .jlab .groot .data .H2F ;
16+ import org .jlab .io .banks .ECAL__adc ;
17+ import org .jlab .io .banks .ECAL__tdc ;
1618import org .jlab .io .base .DataBank ;
1719import org .jlab .io .base .DataEvent ;
1820import org .jlab .utils .groups .IndexedList ;
@@ -338,12 +340,11 @@ public static List<ECStrip> readStripsHipo(DataEvent event, int run, ConstantsM
338340 if (event .hasBank ("ECAL::tdc" )==true ){
339341 RawDataBank bank = new RawDataBank ("ECAL::tdc" );
340342 bank .read (event );
341- //DataBank bank = event.getBank("ECAL::tdc");
342343 for (int i = 0 ; i < bank .rows (); i ++){
343- int is = bank .getByte (" sector" ,i );
344- int il = bank .getByte (" layer" ,i );
345- int ip = bank .getShort (" component" ,i );
346- int tdc = bank .getInt (" TDC" ,i );
344+ int is = bank .getByte (ECAL__tdc . sector ,i );
345+ int il = bank .getByte (ECAL__tdc . layer ,i );
346+ int ip = bank .getShort (ECAL__tdc . component ,i );
347+ int tdc = bank .getInt (ECAL__tdc . TDC ,i );
347348
348349 int istatus = status .getIntValue ("status" ,is ,il ,ip );
349350
@@ -359,14 +360,14 @@ public static List<ECStrip> readStripsHipo(DataEvent event, int run, ConstantsM
359360 if (event .hasBank ("ECAL::adc" )==true ){
360361 RawDataBank bank = new RawDataBank ("ECAL::adc" );
361362 bank .read (event );
362- //DataBank bank = event.getBank("ECAL::adc");
363363 for (int i = 0 ; i < bank .rows (); i ++){
364- int is = bank .getByte ("sector" , i );
365- int il = bank .getByte ("layer" , i );
366- int ip = bank .getShort ("component" , i );
367- int adc = bank .getInt ("ADC" , i );
368- float t = bank .getFloat ("time" , i ) + (float ) tmf .getDoubleValue ("offset" ,is ,il ,ip ) // TDC-FADC offset (sector, layer, PMT)
369- + (float ) fo .getDoubleValue ("offset" ,is ,il ,0 ); // TDC-FADC offset (sector, layer)
364+ int is = bank .getByte (ECAL__adc .sector , i );
365+ int il = bank .getByte (ECAL__adc .layer , i );
366+ int ip = bank .getShort (ECAL__adc .component , i );
367+ int adc = bank .getInt (ECAL__adc .ADC , i );
368+ float t = bank .getFloat (ECAL__adc .time , i )
369+ + (float ) tmf .getDoubleValue ("offset" ,is ,il ,ip ) // TDC-FADC offset (sector, layer, PMT)
370+ + (float ) fo .getDoubleValue ("offset" ,is ,il ,0 ); // TDC-FADC offset (sector, layer)
370371
371372 int istatus = status .getIntValue ("status" ,is ,il ,ip );
372373
0 commit comments