Add a new item called as indexTDC into HitBasedTrkg::Hits

Author: tongtongcao

etc/bankdefs/hipo4/dc.json

@@ -6,6 +6,7 @@
     "info": "reconstructed hits using DC wire positions",
     "entries": [
        {"name":"id",          "type":"S", "info":"id of the hit"},
+       {"name": "indexTDC",    "type":"S", "info":"inex in the bank DC::TDC"},
        {"name":"status",      "type":"S", "info":"id of the hit"},       
        {"name":"sector",      "type":"B", "info":"DC sector"},
        {"name":"superlayer",  "type":"B", "info":"DC superlayer (1...6)"},

reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java

@@ -44,7 +44,7 @@ public class HitReader {
     private int run = 0;
     private long tiTimeStamp = 0;
     private DataEvent event = null;
-    
+        
     private IndexedTable tt          = null;
     private IndexedTable reverseTT   = null;
     private IndexedTable dcrbjitters = null;
@@ -341,6 +341,7 @@ private void fetch_DCHits(Clas12NoiseAnalysis noiseAnalysis,
                     hit.calc_CellSize(detector);
                     double posError = hit.get_CellSize() / Math.sqrt(12.);
                     hit.set_DocaErr(posError);
+                    hit.set_IndexTDC(index);
                     this._DCHits.add(hit);
                 }
             }

reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/RecoBankWriter.java

@@ -55,6 +55,48 @@ public void updateListsWithClusterInfo(List<FittedHit> fhits,
         fhits.removeAll(rmHits);
         fhits.addAll(addHits);
     }
+    
+    public DataBank fillHitsBank(DataEvent event, List<FittedHit> hitlist) {
+        String name = bankNames.getHitsBank();
+        
+        int rejCnt = 0;
+        for (int i = 0; i < hitlist.size(); i++) {
+//            if (hitlist.get(i).get_Id() == -1 /*|| hitlist.get(i).get_Id()==0*/) { //PASS1
+            if (hitlist.get(i).get_Id() == -1 || hitlist.get(i).get_Id()==0) {
+                rejCnt++;
+            }
+        }
+        DataBank bank = event.createBank(name, hitlist.size()-rejCnt);
+        rejCnt=0;
+        for (int i = 0; i < hitlist.size(); i++) {
+//            if (hitlist.get(i).get_Id() == -1 /*|| hitlist.get(i).get_Id()==0*/) { //PASS1
+            if (hitlist.get(i).get_Id() == -1 || hitlist.get(i).get_Id()==0) {
+                rejCnt++;
+                continue;
+        }
+        bank.setShort("id", i-rejCnt, (short) hitlist.get(i).get_Id());
+        bank.setShort("indexTDC", i-rejCnt, (short) hitlist.get(i).get_IndexTDC());
+        bank.setShort("status", i-rejCnt, (short) hitlist.get(i).get_QualityFac());
+        bank.setByte("superlayer", i-rejCnt, (byte) hitlist.get(i).get_Superlayer());
+        bank.setByte("layer", i-rejCnt, (byte) hitlist.get(i).get_Layer());
+        bank.setByte("sector", i-rejCnt, (byte) hitlist.get(i).get_Sector());
+        bank.setShort("wire", i-rejCnt, (short) hitlist.get(i).get_Wire());
+        bank.setFloat("docaError", i-rejCnt, (float) hitlist.get(i).get_DocaErr());
+        bank.setFloat("trkDoca", i-rejCnt, (float) hitlist.get(i).get_ClusFitDoca());
+        bank.setFloat("LocX", i-rejCnt, (float) hitlist.get(i).get_lX());
+        bank.setFloat("LocY", i-rejCnt, (float) hitlist.get(i).get_lY());
+        bank.setFloat("X", i-rejCnt, (float) hitlist.get(i).get_X());
+        bank.setFloat("Z", i-rejCnt, (float) hitlist.get(i).get_Z());
+        bank.setByte("LR", i-rejCnt, (byte) hitlist.get(i).get_LeftRightAmb());
+        bank.setShort("clusterID", i-rejCnt, (short) hitlist.get(i).get_AssociatedClusterID());
+        bank.setInt("TDC",i-rejCnt,hitlist.get(i).get_TDC());
+        bank.setByte("jitter",i, (byte) hitlist.get(i).getJitter());
+        
+        }
+
+        return bank;
+
+    }
 
     public DataBank fillHBHitsBank(DataEvent event, List<FittedHit> hitlist) {
         String name = bankNames.getHitsBank();
@@ -831,6 +873,7 @@ public List<FittedHit> createRawHitList(List<Hit> hits) {
                     hit.get_Layer(), hit.get_Wire(), hit.get_TDC(), hit.getJitter(),
                     hit.get_Id());
             fhit.set_Id(hit.get_Id());
+            fhit.set_IndexTDC(hit.get_IndexTDC());
             fhit.set_DocaErr(hit.get_DocaErr());
             fhits.add(fhit);
         }

reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterFinder.java

@@ -265,7 +265,8 @@ public List<FittedCluster> FindHitBasedClusters(List<Hit> allhits, ClusterCleane
                         fhit.set_AssociatedClusterID(clus.get_Id());
                     else{
                         try{
-                            FittedHit newHit = fhit.clone();                        
+                            FittedHit newHit = fhit.clone();
+                            newHit.set_IndexTDC(fhit.get_IndexTDC());
                             newHit.set_Id(idSharedHits++);
                             newHit.set_AssociatedClusterID(clus.get_Id());
                             rmHits.add(fhit);

reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/FittedCluster.java

@@ -35,6 +35,7 @@ public FittedCluster(Cluster rawCluster) {
             fhit.set_DocaErr(rawCluster.get(i).get_DocaErr());
             fhit.set_CellSize(rawCluster.get(i).get_CellSize());
             fhit.set_Id(rawCluster.get(i).get_Id());
+            fhit.set_IndexTDC(rawCluster.get(i).get_IndexTDC());
 
             this.add(fhit);
         }

reconstruction/dc/src/main/java/org/jlab/rec/dc/hit/FittedHit.java

@@ -1112,6 +1112,7 @@ public FittedHit clone() throws CloneNotSupportedException {
             hitClone.set_CellSize(this.get_CellSize());
             hitClone.set_AssociatedClusterID(this.get_AssociatedClusterID());
             hitClone.set_AssociatedHBTrackID(this.get_AssociatedHBTrackID());
+            hitClone.set_IndexTDC(this.get_IndexTDC());
             hitClone.betaFlag = this.betaFlag;
 
         return hitClone;

reconstruction/dc/src/main/java/org/jlab/rec/dc/hit/Hit.java

@@ -21,6 +21,7 @@ public class Hit implements Comparable<Hit> {
     private int _Id;
     private double _cellSize;
     private double _DocaErr;
+    private int _indexTDC = -1;
     // class implements Comparable interface to allow for sorting a collection of hits by wire number values
     public int NNTrkId;
     public int NNClusId;
@@ -49,6 +50,22 @@ public Hit(int sector, int superlayer, int layer, int wire, int TDC, int jitter,
 
     }
 
+        
+    /**
+     *
+     * @return index in DC::TDC bank
+     */
+    public int get_IndexTDC(){
+        return _indexTDC;
+    }
+    
+     /**
+     *
+     * @param index in DC::TDC bank
+     */  
+    public void set_IndexTDC(int index){
+        this._indexTDC = index;
+    }
 
     /**
      *

reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBClustering.java

@@ -86,12 +86,9 @@ public boolean processDataEvent(DataEvent event) {
             List<FittedHit> fhits = rbc.createRawHitList(hits);
             /* 13 */
             rbc.updateListsWithClusterInfo(fhits, clusters);
-            rbc.fillAllHBBanks(event,
-                    fhits,
-                    clusters,
-                    null,
-                    null,
-                    null);
+            event.appendBanks(rbc.fillHitsBank(event, fhits),
+                    rbc.fillHBClustersBank(event, clusters)
+            );
         }
 
         return true;