Skip to content

Commit cc4bd1f

Browse files
committed
clean up commented code
1 parent 400cdc4 commit cc4bd1f

1 file changed

Lines changed: 2 additions & 41 deletions

File tree

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

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
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;
21-
//import org.hps.recon.tracking.KFKinkData;
2220

2321
import org.hps.recon.tracking.MaterialSupervisor.ScatteringDetectorVolume;
2422
import org.hps.recon.tracking.MaterialSupervisor.SiStripPlane;
@@ -110,7 +108,6 @@ public class KalmanPatRecDriver extends Driver {
110108
private Level logLevel = Level.WARNING; // Set log level from steering
111109
private boolean addKinks;
112110
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
114111
private List<HpsSiSensor> sensors = null; // List of tracker sensors
115112

116113

@@ -150,12 +147,6 @@ public void setAddResiduals(boolean input) {
150147
addResiduals = input;
151148
}
152149

153-
/*
154-
public void setAddIsolations(boolean input) {
155-
addIsolations = input;
156-
}
157-
*/
158-
159150
public void setDoForLayer(boolean input) {
160151
doForLayer = input;
161152
}
@@ -362,9 +353,7 @@ public void process(EventHeader event) {
362353
List<LCRelation> trackResidualsRelations = new ArrayList<LCRelation>();
363354
List<TrackIntersectData> trackIntersects = new ArrayList<TrackIntersectData>();
364355
List<LCRelation> trackIntersectsRelations = new ArrayList<LCRelation>();
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);
356+
368357
ArrayList<KalTrack>[] kPatList = prepareTrackCollections(event, outputFullTracks, trackDataCollection, trackDataRelations, allClstrs, gblStripClusterDataRelations,trackXKinks,trackXKinksRelations,trackZKinks,trackZKinksRelations,trackResiduals, trackResidualsRelations, trackIntersects, trackIntersectsRelations);
369358

370359
int flag = 1 << LCIOConstants.TRBIT_HITS;
@@ -388,11 +377,6 @@ public void process(EventHeader event) {
388377
event.put("KFUnbiasIntRelations", trackIntersectsRelations, LCRelation.class, 0);
389378
}
390379

391-
// if (addIsolations) {
392-
// event.put("KFIsolations", trackIsos, TrackIsolationData.class, 0);
393-
//event.put("KFIsolationsRelations", trackIsosRelations, LCRelation.class, 0);
394-
//}
395-
396380
if (kPlot != null) {
397381
long startTime = System.nanoTime();
398382

@@ -429,7 +413,6 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
429413
List<TrackResidualsData> trackZKinks, List<LCRelation> trackZKinksRelations,
430414
List<TrackResidualsData> trackResiduals, List<LCRelation> trackResidualsRelations,
431415
List<TrackIntersectData> trackIntersects, List<LCRelation> trackIntersectsRelations
432-
// List<TrackIsolationData> trackIsolations, List<LCRelation> trackIsolationsRelations
433416
) {
434417

435418
int evtNumb = event.getEventNumber();
@@ -455,12 +438,6 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
455438
nEvents++;
456439
logger.log(Level.FINE,"KalmanPatRecDriver.process: run time for pattern recognition at event " + evtNumb + " is " + runTime + " milliseconds");
457440

458-
//List<RawTrackerHit> rawhits = event.get(RawTrackerHit.class, "SVTRawTrackerHits");
459-
//if (rawhits == null) {
460-
// logger.log(Level.FINE, String.format("KalmanPatRecDriver.process: the raw hits collection is missing"));
461-
// return null;
462-
//}
463-
464441
int nKalTracks = 0;
465442
for (int topBottom=0; topBottom<2; ++topBottom) {
466443
ArrayList<KalTrack> kPat = kPatList[topBottom];
@@ -483,11 +460,6 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
483460
Track KalmanTrackHPS = KI.createTrack(kTk, true);
484461
if (KalmanTrackHPS == null) continue;
485462

486-
//pT cut
487-
//double [] hParams_check = kTk.originHelixParms();
488-
//double ptInv_check = hParams_check[2];
489-
//double pt = Math.abs(1./ptInv_check);
490-
491463
outputFullTracks.add(KalmanTrackHPS);
492464

493465
List<GBLStripClusterData> clstrs = KI.createGBLStripClusterData(kTk);
@@ -566,10 +538,7 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
566538
int uindex = 0;
567539
int vindex = 1;
568540
int windex = 2;
569-
//And the track isolations
570-
List<Integer> layersIso = new ArrayList<Integer>();
571-
List<Double> iso = new ArrayList<Double>();
572-
List<Float> isot0 = new ArrayList<Float>();
541+
573542
double[] isolationsArray=new double[14];
574543
for(int ilay = 0;ilay<14;ilay++){
575544
Pair<Double[], Double> inter_and_sigma = kTk.unbiasedIntersect(ilay, true);
@@ -580,9 +549,6 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
580549
sigmasInt.add(inter_and_sigma.getSecondElement().floatValue());
581550
//get isolations
582551
Pair<Double,Double> isolation=kTk.getIsoAndT0(ilay);
583-
// layersIso.add(ilay);
584-
// iso.add(isolation.getFirstElement());
585-
// isot0.add(isolation.getSecondElement().floatValue());
586552
isolationsArray[ilay]=isolation.getFirstElement();
587553
}//Loop on layers
588554

@@ -597,11 +563,6 @@ private ArrayList<KalTrack>[] prepareTrackCollections(EventHeader event, List<Tr
597563
TrackIntersectData intersectData = new TrackIntersectData(trackerVolume, layersInt, intersect, sigmasInt);
598564
trackIntersects.add(intersectData);
599565
trackIntersectsRelations.add(new BaseLCRelation(intersectData, KalmanTrackHPS));
600-
/*
601-
TrackIsolationData isoData = new TrackIsolationData(trackerVolume, layersIso,iso, isot0);
602-
trackIsolations.add(isoData);
603-
trackIsolationsRelations.add(new BaseLCRelation(isoData, KalmanTrackHPS));
604-
*/
605566

606567
//Add the Kinks
607568
layers = new ArrayList<Integer>();

0 commit comments

Comments
 (0)