cleanup

Author: baltzell

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

@@ -719,8 +719,6 @@ public void initEvent(DataEvent event){
             if(evioEvent.getHandler().getStructure()!=null){
                 try {
 
-                    codaDecoder.cacheBranches(evioEvent);
-
                     dataList = codaDecoder.getDataEntries( (EvioDataEvent) event);
 
                     List<FADCData> fadcPacked = codaDecoder.getADCEntries((EvioDataEvent) event);

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

@@ -79,16 +79,15 @@ public void setTriggerBits(long triggerBits) {
     }
 
     /**
-     * Load map by crate(?). 
+     * Load map by crate. 
      *
      * @param event 
      */
-    void cacheBranches(EvioDataEvent event) {
+    private void cacheBranches(EvioDataEvent event) {
         branchMap = new TreeMap<>();
-        for (EvioTreeBranch branch : CodaDecoders.getEventBranches(event)) {
+        for (EvioTreeBranch branch : CodaDecoders.getEventBranches(event))
             if (!branchMap.containsKey(branch.getTag()))
                 branchMap.put(branch.getTag(), branch);
-        }
     }
 
     /**
@@ -99,6 +98,8 @@ void cacheBranches(EvioDataEvent event) {
      * @return
      */
     public List<DetectorDataDgtz> getDataEntries(EvioDataEvent event){
+
+        cacheBranches(event);
 
         //int event_size = event.getHandler().getStructure().getByteBuffer().array().length;
         // This had been inserted to accommodate large EVIO events that