cleanup

Author: baltzell

.github/workflows/ci.yml

@@ -96,7 +96,7 @@ jobs:
       - name: build
         run: |
           ./build-coatjava.sh --no-progress -T${{ env.nthreads }}
-          ./bin/install-clara -b -c ./coatjava ./clara
+          ./bin/install-clara -c ./coatjava ./clara
       - name: tar # tarball to preserve permissions
         run: |
           tar czvf coatjava.tar.gz coatjava

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

@@ -37,11 +37,8 @@ public class DetectorEventDecoder {
     private TranslationTable translator = new TranslationTable();
 
     public DetectorEventDecoder(boolean development){
-        if(development==true){
-            this.initDecoderDev();
-        } else {
-            this.initDecoder();
-        }
+        if(development==true) this.initDecoderDev();
+        else this.initDecoder();
     }
 
     public void setTimestamp(String timestamp) {
@@ -58,10 +55,9 @@ public void setVariation(String variation) {
 
     public void setRunNumber(int run){
         if (run != this.runNumber) {
-            // Load a global translation table:
             translator = new TranslationTable();
             for (int i=0; i<keysTrans.size(); i++)
-                translator.add(keysTrans.get(i), translationManager.getConstants(runNumber, tablesTrans.get(i)));
+                translator.add(keysTrans.get(i), translationManager.getConstants(run, tablesTrans.get(i)));
         }
         this.runNumber = run;
     }

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

@@ -11,6 +11,9 @@ public class TranslationTable extends IndexedTable {
 
     public TranslationTable() {
         super(3,new String[]{"sector/I","layer/I","component/I","order/I","type/I"});
+        String[] x = new String[entryMap.keySet().size()];
+        for (String name : entryMap.keySet())
+            x[entryMap.get(name)] = name + "/" + entryTypes.get(name);
     };
 
     public void add(DetectorType dt, IndexedTable it) {

common-tools/clas-utils/src/main/java/org/jlab/utils/groups/IndexedTable.java

@@ -22,16 +22,15 @@
 public class IndexedTable extends DefaultTableModel {
 
     public static final IndexGenerator DEFAULT_GENERATOR = new IndexGenerator();
+
+    protected Map<String,Integer>     entryMap   = new LinkedHashMap<>();
+    protected Map<String,String>      entryTypes = new LinkedHashMap<>();
 
     private IndexedList<IndexedEntry> entries    = null;
-    private Map<String,Integer>       entryMap   = new LinkedHashMap<>();
-    private Map<String,String>        entryTypes = new LinkedHashMap<>();
     private List<String>              entryNames = new ArrayList<>();
     private List<String>              indexNames = new ArrayList<>();
     private String                    precisionFormat = "%.6f";
-    
     private Map<Integer,List<RowConstraint>>  constrains = new HashMap<>(); 
-    
     private int DEBUG_MODE = 0;
 
     public IndexedTable(int indexCount){