one more modification to AHDC wire numbering to have first wire either at phi=0 or +half cell, set wirelines in HitReader (#571)

Co-authored-by: Raffaella De Vita <[email protected]>

Author: baltzell

common-tools/clas-geometry/src/main/java/org/jlab/geom/detector/alert/AHDC/AlertDCFactory.java

@@ -129,14 +129,12 @@ public AlertDCLayer createLayer(ConstantProvider cp, int sectorId, int superlaye
 		double zl     = 300.0d;
 
 		// Create AHDC sense wires
-		for (int iw = 0; iw < numWires; iw++) {
+		for (int wireId = 0; wireId < numWires; wireId++) {
 
-                        // start at phi=180
-                        double wirePhiIndex = (numWires/2) + iw - 0.5*(layerId-1); 
-
-                        // the wire id is such that the wire number = (wireId+1) is the first wqual or greater than numWires/2
-                        int wireId = iw + (int) (numWires/2);
-                        if(wireId>numWires-1) wireId -= numWires;
+                        // start at phi=0
+                        // in each layer the first wire is the first at phi>=0, i.e.
+                        // 0.5 0 0.5 0 0.5 0.5 0 0.5 for layer 1 to 8
+                        double wirePhiIndex = wireId + 0.5*(numWires%2) + 0.5*layerId*(1-2*(numWires%2)); 
 
                         // The point given by (wx, wy, wz) is the origin of the current wire.
 			double wx = R_layer * Math.cos(alphaW_layer * wirePhiIndex);

reconstruction/alert/src/main/java/org/jlab/rec/ahdc/Hit/HitReader.java

@@ -5,19 +5,20 @@
 import org.jlab.io.base.DataBank;
 import org.jlab.io.base.DataEvent;
 import org.jlab.detector.banks.RawDataBank;
+import org.jlab.geom.detector.alert.AHDC.AlertDCDetector;
 import org.jlab.rec.alert.constants.CalibrationConstantsLoader;
 
 public class HitReader {
 
 	private ArrayList<Hit>     _AHDCHits;
 	private ArrayList<TrueHit> _TrueAHDCHits;
 
-        public HitReader(DataEvent event, boolean simulation) {
-		fetch_AHDCHits(event);
+        public HitReader(DataEvent event, AlertDCDetector detector, boolean simulation) {
+		fetch_AHDCHits(event, detector);
 		if (simulation) fetch_TrueAHDCHits(event);
 	}
 
-	public void fetch_AHDCHits(DataEvent event) {
+	public final void fetch_AHDCHits(DataEvent event, AlertDCDetector detector) {
 		ArrayList<Hit> hits = new ArrayList<>();
 
 		if (event.hasBank("AHDC::adc")) {
@@ -58,14 +59,16 @@ public void fetch_AHDCHits(DataEvent event) {
 					// TO BE DONE
 					//double doca       = bankDGTZ.getShort("ped", i) / 1000.0;
 					double doca = p0 + p1*Math.pow(time,1.0) + p2*Math.pow(time,2.0) + p3*Math.pow(time,3.0) + p4*Math.pow(time,4.0) + p5*Math.pow(time, 5.0);
-					hits.add(new Hit(id, superlayer, layer, wire, doca, adc, time));
+					Hit h = new Hit(id, superlayer, layer, wire, doca, adc, time);
+                                        h.setWirePosition(detector);
+                                        hits.add(h);
 				}
 			}
 		}
 		this.set_AHDCHits(hits);
 	}
 
-	public void fetch_TrueAHDCHits(DataEvent event) {
+	public final void fetch_TrueAHDCHits(DataEvent event) {
 		ArrayList<TrueHit> truehits = new ArrayList<>();
 
 		DataBank bankSIMU = event.getBank("MC::True");

reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java

@@ -27,7 +27,7 @@
 import java.io.File;
 import java.util.*;
 import org.jlab.detector.calib.utils.DatabaseConstantProvider;
-import org.jlab.geom.base.Detector;
+import org.jlab.geom.detector.alert.AHDC.AlertDCDetector;
 import org.jlab.geom.detector.alert.AHDC.AlertDCFactory;
 
 /** AHDCEngine reconstruction service.
@@ -61,7 +61,7 @@ public class AHDCEngine extends ReconstructionEngine {
     /// \todo better name... mode for what?
     private Mode mode = Mode.CV_Track_Finding;
 
-    private Detector factory = null;
+    private AlertDCDetector factory = null;
 
     public AHDCEngine() {
         super("ALERT", "ouillon", "1.0.1");
@@ -146,7 +146,7 @@ public boolean processDataEvent(DataEvent event) {
 
         if (event.hasBank("AHDC::adc")) {
             // I) Read raw hit
-            HitReader hitRead = new HitReader(event, simulation);
+            HitReader hitRead = new HitReader(event, factory, simulation);
 
             ArrayList<Hit>     AHDC_Hits     = hitRead.get_AHDCHits();
             if(simulation){