Skip to content

Commit 400cdc4

Browse files
bloodyyugobloodyyugo
committed
use the double array in TrackData to store the isolations instead
1 parent 36f0523 commit 400cdc4

2 files changed

Lines changed: 22 additions & 115 deletions

File tree

‎tracking/src/main/java/org/hps/recon/tracking/TrackIsolationData.java‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎tracking/src/main/java/org/hps/recon/tracking/kalman/KalmanPatRecDriver.java‎

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.hps.recon.tracking.TrackData;
1818
import org.hps.recon.tracking.TrackIntersectData;
1919
import org.hps.recon.tracking.TrackResidualsData;
20-
import org.hps.recon.tracking.TrackIsolationData;
20+
//import org.hps.recon.tracking.TrackIsolationData;
2121
//import org.hps.recon.tracking.KFKinkData;
2222

2323
import org.hps.recon.tracking.MaterialSupervisor.ScatteringDetectorVolume;
@@ -110,7 +110,7 @@ public class KalmanPatRecDriver extends Driver {
110110
private Level logLevel = Level.WARNING; // Set log level from steering
111111
private boolean addKinks;
112112
private boolean addResiduals; // If true add the hit-on-track residuals to the LCIO event
113-
private boolean addIsolations; // If true add the hit-on-track isolations to the LCI0 even
113+
// private boolean addIsolations; // If true add the hit-on-track isolations to the LCI0 even
114114
private List<HpsSiSensor> sensors = null; // List of tracker sensors
115115

116116

@@ -150,9 +150,11 @@ public void setAddResiduals(boolean input) {
150150
addResiduals = input;
151151
}
152152

153+
/*
153154
public void setAddIsolations(boolean input) {
154155
addIsolations = input;
155156
}
157+
*/
156158

157159
public void setDoForLayer(boolean input) {
158160
doForLayer = input;
@@ -360,15 +362,10 @@ public void process(EventHeader event) {
360362
List<LCRelation> trackResidualsRelations = new ArrayList<LCRelation>();
361363
List<TrackIntersectData> trackIntersects = new ArrayList<TrackIntersectData>();
362364
List<LCRelation> trackIntersectsRelations = new ArrayList<LCRelation>();
363-
List<TrackIsolationData> trackIsos = new ArrayList<TrackIsolationData>();
364-
List<LCRelation> trackIsosRelations = new ArrayList<LCRelation>();
365-
ArrayList<KalTrack>[] kPatList = prepareTrackCollections(event, outputFullTracks, trackDataCollection, trackDataRelations, allClstrs, gblStripClusterDataRelations,trackXKinks,trackXKinksRelations,trackZKinks,trackZKinksRelations,trackResiduals, trackResidualsRelations, trackIntersects, trackIntersectsRelations, trackIsos, trackIsosRelations);
366-
367-
// ArrayList<KalTrack>[] kPatList = prepareTrackCollections(event, outputFullTracks, trackDataCollection, trackDataRelations, allClstrs, gblStripClusterDataRelations, trackResiduals, trackResidualsRelations);
368-
//mg debug why the track data relations (and others I think) are screwed
369-
// for (LCRelation tdRel: trackDataRelations){
370-
// System.out.println(tdRel.getFrom()+" ---> " +tdRel.getTo());
371-
// }
365+
// List<TrackIsolationData> trackIsos = new ArrayList<TrackIsolationData>();
366+
//List<LCRelation> trackIsosRelations = new ArrayList<LCRelation>();
367+
//ArrayList<KalTrack>[] kPatList = prepareTrackCollections(event, outputFullTracks, trackDataCollection, trackDataRelations, allClstrs, gblStripClusterDataRelations,trackXKinks,trackXKinksRelations,trackZKinks,trackZKinksRelations,trackResiduals, trackResidualsRelations, trackIntersects, trackIntersectsRelations, trackIsos, trackIsosRelations);
368+
ArrayList<KalTrack>[] kPatList = prepareTrackCollections(event, outputFullTracks, trackDataCollection, trackDataRelations, allClstrs, gblStripClusterDataRelations,trackXKinks,trackXKinksRelations,trackZKinks,trackZKinksRelations,trackResiduals, trackResidualsRelations, trackIntersects, trackIntersectsRelations);
372369

373370
int flag = 1 << LCIOConstants.TRBIT_HITS;
374371
event.put(outputFullTrackCollectionName, outputFullTracks, Track.class, flag);
@@ -391,10 +388,10 @@ public void process(EventHeader event) {
391388
event.put("KFUnbiasIntRelations", trackIntersectsRelations, LCRelation.class, 0);
392389
}
393390

394-
if (addIsolations) {
395-
event.put("KFIsolations", trackIsos, TrackIsolationData.class, 0);
396-
event.put("KFIsolationsRelations", trackIsosRelations, LCRelation.class, 0);
397-
}
391+
// if (addIsolations) {
392+
// event.put("KFIsolations", trackIsos, TrackIsolationData.class, 0);
393+
//event.put("KFIsolationsRelations", trackIsosRelations, LCRelation.class, 0);
394+
//}
398395

399396
if (kPlot != null) {
400397
long startTime = System.nanoTime();
@@ -431,8 +428,8 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
431428
List<TrackResidualsData> trackXKinks, List<LCRelation> trackXKinksRelations,
432429
List<TrackResidualsData> trackZKinks, List<LCRelation> trackZKinksRelations,
433430
List<TrackResidualsData> trackResiduals, List<LCRelation> trackResidualsRelations,
434-
List<TrackIntersectData> trackIntersects, List<LCRelation> trackIntersectsRelations,
435-
List<TrackIsolationData> trackIsolations, List<LCRelation> trackIsolationsRelations
431+
List<TrackIntersectData> trackIntersects, List<LCRelation> trackIntersectsRelations
432+
// List<TrackIsolationData> trackIsolations, List<LCRelation> trackIsolationsRelations
436433
) {
437434

438435
int evtNumb = event.getEventNumber();
@@ -514,9 +511,6 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
514511
//if tanLamda<0 set bottom
515512
if (KalmanTrackHPS.getTrackStates().get(0).getTanLambda() < 0) trackerVolume = 1;
516513

517-
//TODO: compute isolations
518-
double qualityArray[] = new double[1];
519-
qualityArray[0] = -1;
520514

521515
//Get the track momentum and convert it into detector frame and float values
522516
Hep3Vector momentum = new BasicHep3Vector(KalmanTrackHPS.getTrackStates().get(0).getMomentum());
@@ -576,7 +570,7 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
576570
List<Integer> layersIso = new ArrayList<Integer>();
577571
List<Double> iso = new ArrayList<Double>();
578572
List<Float> isot0 = new ArrayList<Float>();
579-
573+
double[] isolationsArray=new double[14];
580574
for(int ilay = 0;ilay<14;ilay++){
581575
Pair<Double[], Double> inter_and_sigma = kTk.unbiasedIntersect(ilay, true);
582576
layersInt.add(ilay);
@@ -586,13 +580,14 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
586580
sigmasInt.add(inter_and_sigma.getSecondElement().floatValue());
587581
//get isolations
588582
Pair<Double,Double> isolation=kTk.getIsoAndT0(ilay);
589-
layersIso.add(ilay);
590-
iso.add(isolation.getFirstElement());
591-
isot0.add(isolation.getSecondElement().floatValue());
583+
// layersIso.add(ilay);
584+
// iso.add(isolation.getFirstElement());
585+
// isot0.add(isolation.getSecondElement().floatValue());
586+
isolationsArray[ilay]=isolation.getFirstElement();
592587
}//Loop on layers
593588

594589
//Add the Track Data
595-
TrackData KFtrackData = new TrackData(trackerVolume, (float) kTk.getTime(), qualityArray, momentum_f, (float) origin_bFieldY, (float) target_bFieldY, (float) ecal_bFieldY, (float) svtCenter_bFieldY);
590+
TrackData KFtrackData = new TrackData(trackerVolume, (float) kTk.getTime(), isolationsArray, momentum_f, (float) origin_bFieldY, (float) target_bFieldY, (float) ecal_bFieldY, (float) svtCenter_bFieldY);
596591
trackDataCollection.add(KFtrackData);
597592
trackDataRelations.add(new BaseLCRelation(KFtrackData, KalmanTrackHPS));
598593

@@ -602,10 +597,11 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
602597
TrackIntersectData intersectData = new TrackIntersectData(trackerVolume, layersInt, intersect, sigmasInt);
603598
trackIntersects.add(intersectData);
604599
trackIntersectsRelations.add(new BaseLCRelation(intersectData, KalmanTrackHPS));
600+
/*
605601
TrackIsolationData isoData = new TrackIsolationData(trackerVolume, layersIso,iso, isot0);
606602
trackIsolations.add(isoData);
607603
trackIsolationsRelations.add(new BaseLCRelation(isoData, KalmanTrackHPS));
608-
604+
*/
609605

610606
//Add the Kinks
611607
layers = new ArrayList<Integer>();
@@ -627,13 +623,6 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
627623
TrackResidualsData kinkZData = new TrackResidualsData(trackerVolume,layers,Zkinks,sigmas);
628624
trackZKinks.add(kinkZData);
629625
trackZKinksRelations.add(new BaseLCRelation(kinkZData, KalmanTrackHPS));
630-
/*
631-
if (KalmanTrackHPS.getTrackerHits().size() != residuals.size()) {
632-
System.out.println("KalmanPatRecDriver::Residuals consistency check failed.");
633-
System.out.printf("Track has %d hits while I have %d residuals \n", KalmanTrackHPS.getTrackerHits().size(), residuals.size());
634-
}
635-
*/
636-
637626
} // end of loop on tracks
638627
} // end of loop on trackers
639628

0 commit comments

Comments
 (0)