Merge pull request #23 from baltzell/development

fix bad merge conflict

Author: mpaolone

common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java

@@ -443,6 +443,7 @@ public Event getDataEvent(){
         Event event = new Event();
 
         String[]         wfBankNames = new String[]{"AHDC::wf"};
+        DetectorType[]   wfBankTypes = new DetectorType[]{DetectorType.AHDC};
         String[]        adcBankNames = new String[]{"FTOF::adc","ECAL::adc","FTCAL::adc",
                                                     "FTHODO::adc", "FTTRK::adc",
                                                     "HTCC::adc","BST::adc","CTOF::adc",