Merge pull request #24 from baltzell/development

Actually use the new waveform conversion approach for AHDC

Author: mpaolone

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

@@ -14,7 +14,7 @@
 import org.jlab.detector.helicity.HelicityBit;
 import org.jlab.detector.helicity.HelicitySequence;
 import org.jlab.detector.helicity.HelicityState;
-import org.jlab.detector.pulse.Mode3;
+import org.jlab.detector.pulse.ModeAHDC;
 
 import org.jlab.logging.DefaultLogger;
 
@@ -47,8 +47,8 @@ public class CLASDecoder4 {
     private HipoDataEvent               hipoEvent = null;
     private boolean              isRunNumberFixed = false;
     private int                  decoderDebugMode = 0;
-    private SchemaFactory        schemaFactory = new SchemaFactory();
-    private Mode3 mode3 = new Mode3();
+    private SchemaFactory        schemaFactory    = new SchemaFactory();
+    private ModeAHDC ahdcExtractor                = new ModeAHDC();
 
     public CLASDecoder4(boolean development){
         codaDecoder = new CodaEventDecoder();
@@ -248,7 +248,7 @@ public List<DetectorDataDgtz>  getEntriesSCALER(DetectorType type,
     }
 
     public void extractPulses(Event event) {
-        mode3.update(6, null, event, schemaFactory, "AHDC::wf", "AHDC::adc");
+        ahdcExtractor.update(6, null, event, schemaFactory, "AHDC::wf", "AHDC::adc");
     }
 
     public Bank getDataBankWF(String name, DetectorType type) {

etc/bankdefs/hipo4/data.json

@@ -1,4 +1,23 @@
 [
+  {
+    "name" : "AHDC::wf",
+    "group": 22400,
+    "item" : 10,
+    "info": "Waveform bank for the AHDC",
+    "entries":[
+      { "name":"sector"    , "type":"B", "info":"sector"},
+      { "name":"layer"     , "type":"B", "info":"layer (1-6)"},
+      { "name":"component" , "type":"S", "info":"strips"},
+      { "name":"order"     , "type":"B", "info":"order: 0 - ADCL , 1 - ADCR"},
+      { "name":"timestamp" , "type":"L", "info":"timestamp"},
+      { "name":"s1"        , "type":"S", "info":"sample #1"},
+      { "name":"s2"        , "type":"S", "info":"sample #2"},
+      { "name":"s3"        , "type":"S", "info":"sample #3"},
+      { "name":"s4"        , "type":"S", "info":"sample #4"},
+      { "name":"s5"        , "type":"S", "info":"sample #5"},
+      { "name":"s6"        , "type":"S", "info":"sample #6"}
+    ]
+  },
   {
     "name" : "AHDC::adc",
     "group": 22400,
@@ -42,27 +61,7 @@
       { "name":"time"      , "type":"F", "info":"time from pulse fit"},
       { "name":"ped"       , "type":"S", "info":"pedestal from pulse analysis"},
       { "name":"integral"  , "type":"I", "info":"ADC integral (sum over the pulse)"},
-      { "name":"timestamp" , "type":"L", "info":"timestamp"},
-      { "name":"id"        , "type":"S", "info":"link to BMT::wf"}
-    ]
-  },
-  {
-    "name" : "BMT::wf",
-    "group": 20100,
-    "item" : 12,
-    "info": "WF bank for the Barrel MicroMegas Tracker",
-    "entries":[
-      { "name":"sector"    , "type":"B", "info":"sector"},
-      { "name":"layer"     , "type":"B", "info":"layer (1-6)"},
-      { "name":"component" , "type":"S", "info":"strips"},
-      { "name":"order"     , "type":"B", "info":"order: 0 - ADCL , 1 - ADCR"},
-      { "name":"timestamp" , "type":"L", "info":"timestamp"},
-      { "name":"s1"        , "type":"S", "info":"sample #1"},
-      { "name":"s2"        , "type":"S", "info":"sample #2"},
-      { "name":"s3"        , "type":"S", "info":"sample #3"},
-      { "name":"s4"        , "type":"S", "info":"sample #4"},
-      { "name":"s5"        , "type":"S", "info":"sample #5"},
-      { "name":"s6"        , "type":"S", "info":"sample #6"}
+      { "name":"timestamp" , "type":"L", "info":"timestamp"}
     ]
   },
   {