Author: [log in to unmask]
Date: Thu Jan 7 16:17:52 2016
New Revision: 4107
Log:
Use standalone GBL jar.
Added:
java/branches/gbl-standalone-branch/recon/src/main/java/org/hps/recon/filtering/SvtRawHitMultiplicityFilter.java
- copied unchanged from r4106, java/trunk/recon/src/main/java/org/hps/recon/filtering/SvtRawHitMultiplicityFilter.java
java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSReconNoReadout.lcsim
- copied unchanged from r4106, java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSReconNoReadout.lcsim
Removed:
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/GblData.java
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/GblPoint.java
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/GblTrajectory.java
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/MilleBinary.java
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/matrix/
Modified:
java/branches/gbl-standalone-branch/ (props changed)
java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/production/FilterHitsPerSensor.lcsim
java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim
java/branches/gbl-standalone-branch/tracking/pom.xml
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java
java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java
java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/GblResidualDriver.java
java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/GBLDriver.java
java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/HpsGblFitter.java
Modified: java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/production/FilterHitsPerSensor.lcsim
=============================================================================
--- java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/production/FilterHitsPerSensor.lcsim (original)
+++ java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/production/FilterHitsPerSensor.lcsim Thu Jan 7 16:17:52 2016
@@ -7,14 +7,14 @@
<execute>
<driver name="CleanupDriver"/>
<driver name="EventMarkerDriver"/>
+ <driver name="RawHitsPerSensorFilter"/>
<!-- SVT reconstruction drivers -->
+ <!--
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
-
- <!-- filter driver -->
- <driver name="HitsPerSensorFilter"/>
-
+ <driver name="ClustersPerSensorFilter"/>
+ -->
<!-- write and cleanup -->
<driver name="LCIOWriter"/>
</execute>
@@ -39,7 +39,11 @@
<driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
<neighborDeltaT>8.0</neighborDeltaT>
</driver>
- <driver name="HitsPerSensorFilter" type="org.hps.recon.filtering.SvtHitMultiplicityFilter"/>
+ <driver name="RawHitsPerSensorFilter" type="org.hps.recon.filtering.SvtRawHitMultiplicityFilter">
+ <minHitsPerSensor>1</minHitsPerSensor>
+ <maxHitsPerSensor>2</maxHitsPerSensor>
+ </driver>
+ <driver name="ClustersPerSensorFilter" type="org.hps.recon.filtering.SvtHitMultiplicityFilter"/>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
Modified: java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim
=============================================================================
--- java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim (original)
+++ java/branches/gbl-standalone-branch/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim Thu Jan 7 16:17:52 2016
@@ -56,7 +56,7 @@
<driver name="GBLOutputDriver" />
<driver name="GBLRefitterDriver" />
<driver name="TrackDataDriver" />
- <!--<driver name="GblResidualEcalDriver" />-->
+ <driver name="GblResidualEcalDriver" />
<!--<driver name="TrackExtrapolationTestDriver"/>-->
<driver name="ReconParticleDriver" />
<!--<driver name="TrackingReconstructionPlots" />-->
@@ -162,13 +162,13 @@
<outputFileName>${outputFile}.root</outputFileName>
</driver>
<driver name="AlignmentFilterDriver" type="org.hps.recon.filtering.SvtAlignmentFilter"/>
- <driver name="GblResidualEcalDriver" type="org.hps.users.phansson.ECalExtrapolationDriver"/>
+ <driver name="GblResidualEcalDriver" type="org.hps.users.phansson.GblResidualDriver"/>
<driver name="TrackExtrapolationTestDriver" type="org.hps.users.phansson.TrackExtrapolationTestDriver"/>
<driver name="TrackingReconstructionPlots" type="org.hps.users.phansson.TrackingReconstructionPlots">
<showPlots>False</showPlots>
</driver>
<driver name="TimerDriver1" type="org.hps.util.TimerDriver"/>
- <driver name="GeomChecker" type="org.hps.users.phansson.TrackingGeometryChecker"/>
+ <driver name="GeomChecker" type="org.hps.users.phansson.tools.TrackingGeometryChecker"/>
</drivers>
</lcsim>
Modified: java/branches/gbl-standalone-branch/tracking/pom.xml
=============================================================================
--- java/branches/gbl-standalone-branch/tracking/pom.xml (original)
+++ java/branches/gbl-standalone-branch/tracking/pom.xml Thu Jan 7 16:17:52 2016
@@ -46,5 +46,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hps.gbl</groupId>
+ <artifactId>gbl</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java
=============================================================================
--- java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java (original)
+++ java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java Thu Jan 7 16:17:52 2016
@@ -7,11 +7,12 @@
import java.util.logging.Logger;
import org.apache.commons.math3.util.Pair;
+import org.hps.gbl.GblTrajectory;
+import org.hps.gbl.matrix.Matrix;
+import org.hps.gbl.matrix.SymMatrix;
+import org.hps.gbl.matrix.Vector;
import org.hps.recon.tracking.HpsHelicalTrackFit;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.recon.tracking.gbl.matrix.Matrix;
-import org.hps.recon.tracking.gbl.matrix.SymMatrix;
-import org.hps.recon.tracking.gbl.matrix.Vector;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelixUtils;
@@ -238,7 +239,7 @@
Hep3Vector refPointVec = HelixUtils.PointOnHelix(helicalTrackFit, pathLength);
double[] refPoint = new double[]{refPointVec.x(), refPointVec.y()};
- LOGGER.info("pathLength " + pathLength + " -> refPointVec " + refPointVec.toString());
+ LOGGER.finest("pathLength " + pathLength + " -> refPointVec " + refPointVec.toString());
// Propagate the helix to new reference point
double[] helixParametersAtPoint = TrackUtils.getParametersAtNewRefPoint(refPoint, helicalTrackFit);
@@ -276,7 +277,7 @@
}
}
}
- LOGGER.info("corrected helix covariance:\n" + cov);
+ LOGGER.finest("corrected helix covariance:\n" + cov);
double parameters_gbl[] = helicalTrackFitAtIPCorrected.parameters();
Modified: java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java
=============================================================================
--- java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java (original)
+++ java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/GblUtils.java Thu Jan 7 16:17:52 2016
@@ -1,6 +1,4 @@
package org.hps.recon.tracking.gbl;
-
-import java.util.logging.Logger;
import hep.physics.matrix.BasicMatrix;
import hep.physics.vec.BasicHep3Matrix;
@@ -9,11 +7,13 @@
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+import java.util.logging.Logger;
+
+import org.hps.gbl.matrix.Matrix;
+import org.hps.gbl.matrix.Vector;
import org.hps.recon.tracking.HpsHelicalTrackFit;
import org.hps.recon.tracking.MaterialSupervisor;
import org.hps.recon.tracking.MultipleScattering;
-import org.hps.recon.tracking.gbl.matrix.Matrix;
-import org.hps.recon.tracking.gbl.matrix.Vector;
import org.lcsim.constants.Constants;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
Modified: java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java
=============================================================================
--- java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java (original)
+++ java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/HpsGblRefitter.java Thu Jan 7 16:17:52 2016
@@ -3,6 +3,7 @@
import static java.lang.Math.abs;
import static java.lang.Math.sin;
import static java.lang.Math.sqrt;
+import static org.hps.recon.tracking.gbl.MakeGblTracks.makeCorrectedTrack;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
@@ -16,13 +17,13 @@
import java.util.logging.Logger;
import org.apache.commons.math3.util.Pair;
+import org.hps.gbl.GblPoint;
+import org.hps.gbl.GblTrajectory;
+import org.hps.gbl.MilleBinary;
+import org.hps.gbl.matrix.Matrix;
+import org.hps.gbl.matrix.SymMatrix;
+import org.hps.gbl.matrix.Vector;
import org.hps.recon.tracking.TrackUtils;
-
-import static org.hps.recon.tracking.gbl.MakeGblTracks.makeCorrectedTrack;
-
-import org.hps.recon.tracking.gbl.matrix.Matrix;
-import org.hps.recon.tracking.gbl.matrix.SymMatrix;
-import org.hps.recon.tracking.gbl.matrix.Vector;
import org.hps.util.BasicLogFormatter;
import org.lcsim.constants.Constants;
import org.lcsim.event.EventHeader;
Modified: java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java
=============================================================================
--- java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java (original)
+++ java/branches/gbl-standalone-branch/tracking/src/main/java/org/hps/recon/tracking/gbl/MakeGblTracks.java Thu Jan 7 16:17:52 2016
@@ -13,12 +13,11 @@
import java.util.logging.Logger;
import org.apache.commons.math3.util.Pair;
+import org.hps.gbl.GblTrajectory;
import org.hps.recon.tracking.CoordinateTransformations;
-import org.hps.recon.tracking.HpsHelicalTrackFit;
import org.hps.recon.tracking.MultipleScattering;
import org.hps.recon.tracking.TrackType;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.recon.tracking.gbl.matrix.Matrix;
import org.lcsim.constants.Constants;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
@@ -46,7 +45,11 @@
public class MakeGblTracks {
private final static Logger LOGGER = Logger.getLogger(MakeGblTracks.class.getPackage().getName());
-
+ static {
+ LOGGER.setLevel(Level.WARNING);
+ }
+
+
private MakeGblTracks() {
}
@@ -105,12 +108,7 @@
// Add the track to the list of tracks
// tracks.add(trk);
- LOGGER.info(String.format("helix chi2 %f ndf %d gbl chi2 %f ndf %d\n", helicalTrackFit.chisqtot(), helicalTrackFit.ndf()[0] + helicalTrackFit.ndf()[1], trk.getChi2(), trk.getNDF()));
- if (LOGGER.getLevel().intValue() <= Level.INFO.intValue()) {
- for (int i = 0; i < 5; ++i) {
- LOGGER.info(String.format("param %d: %.10f -> %.10f helix-gbl= %f", i, helicalTrackFit.parameters()[i], trk.getTrackParameter(i), helicalTrackFit.parameters()[i] - trk.getTrackParameter(i)));
- }
- }
+ LOGGER.fine(String.format("helix chi2 %f ndf %d gbl chi2 %f ndf %d\n", helicalTrackFit.chisqtot(), helicalTrackFit.ndf()[0] + helicalTrackFit.ndf()[1], trk.getChi2(), trk.getNDF()));
return new Pair<Track, GBLKinkData>(trk, kinkData);
}
Modified: java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/GblResidualDriver.java
=============================================================================
--- java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/GblResidualDriver.java (original)
+++ java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/GblResidualDriver.java Thu Jan 7 16:17:52 2016
@@ -156,13 +156,23 @@
// select GBL tracks
if(TrackType.isGBL(track.getType())) {
-
+
TrackState stateIP = null;
TrackState stateLast = null;
for(TrackState state : track.getTrackStates()) {
if (state.getLocation() == TrackState.AtLastHit) stateLast = state;
if (state.getLocation() == TrackState.AtIP) stateIP = state;
}
+
+ System.out.println("Event " + event.getEventNumber()
+ + " gbl track parameters " +
+ stateIP.getD0() + " " +
+ stateIP.getZ0() + " " +
+ stateIP.getPhi() + " " +
+ stateIP.getOmega() + " " +
+ stateIP.getTanLambda()
+ );
+
// find seed track
Track seedTrack = null;
Modified: java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/GBLDriver.java
=============================================================================
--- java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/GBLDriver.java (original)
+++ java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/GBLDriver.java Thu Jan 7 16:17:52 2016
@@ -5,9 +5,9 @@
import java.util.List;
+import org.hps.gbl.MilleBinary;
import org.hps.recon.tracking.MaterialSupervisor;
import org.hps.recon.tracking.MultipleScattering;
-import org.hps.recon.tracking.gbl.MilleBinary;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.geometry.Detector;
Modified: java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/HpsGblFitter.java
=============================================================================
--- java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/HpsGblFitter.java (original)
+++ java/branches/gbl-standalone-branch/users/src/main/java/org/hps/users/phansson/gbl/HpsGblFitter.java Thu Jan 7 16:17:52 2016
@@ -13,17 +13,17 @@
import java.util.Comparator;
import java.util.List;
+import org.hps.gbl.GblPoint;
+import org.hps.gbl.GblTrajectory;
+import org.hps.gbl.MilleBinary;
import org.hps.recon.tracking.MaterialSupervisor;
import org.hps.recon.tracking.MultipleScattering;
import org.hps.recon.tracking.MultipleScattering.ScatterPoint;
import org.hps.recon.tracking.MultipleScattering.ScatterPoints;
-import org.hps.recon.tracking.gbl.GblPoint;
-import org.hps.recon.tracking.gbl.GblTrajectory;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.recon.tracking.TrackerHitUtils;
import org.hps.recon.tracking.gbl.GblUtils;
import org.hps.recon.tracking.gbl.HelicalTrackStripGbl;
-import org.hps.recon.tracking.gbl.MilleBinary;
-import org.hps.recon.tracking.TrackUtils;
-import org.hps.recon.tracking.TrackerHitUtils;
import org.lcsim.constants.Constants;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
