Skip to content

Add steering file to use with raw evio files for 2019 #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbravo135 merged 5 commits into from
Apr 29, 2021
Merged

Add steering file to use with raw evio files for 2019 #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6188699
Add steering file to use with raw evio files for 2019
cbravo135 Apr 14, 2021
342ec68
Use min distance matcher
cbravo135 Apr 21, 2021
40f3bee
recon/src/main/java/org/hps/recon/particle/ReconParticleDriver.java
alspellm Apr 22, 2021
0d1bc96
change matcherTrackCollectionName steering-file setting for ReconPart…
alspellm Apr 22, 2021
23af46c
Kill a memeory leak
cbravo135 Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed detector-data/detectors/HPS-PhysicsRun2019-v1-4pt5/.HPS-PhysicsRun2019-v1-4pt5.lcdd.swp
View file
Open in desktop
Binary file not shown.
15 changes: 6 additions & 9 deletions recon/src/main/java/org/hps/recon/particle/ReconParticleDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void setApplyClusterCorrections(boolean val) {
/**
* LCIO collection name for tracks.
*/
protected String trackCollectionName = "GBLTracks";
protected String matcherTrackCollectionName = "GBLTracks";
/**
* Track Cluster Algorithm set to Kalman or GBL Tracks
*/
Expand Down Expand Up @@ -353,10 +353,10 @@ public void setTargetConV0VerticesColName(String targetConV0VerticesColName) {
/**
* Sets the LCIO collection name for particle track data.
*
* @param trackCollectionName - The LCIO collection name.
* @param matcherTrackCollectionName - The LCIO collection name.
*/
public void setTrackCollectionName(String trackCollectionName) {
this.trackCollectionName = trackCollectionName;
public void setMatcherTrackCollectionName(String matcherTrackCollectionName) {
this.matcherTrackCollectionName = matcherTrackCollectionName;
}

/**
Expand Down Expand Up @@ -445,7 +445,7 @@ protected void detectorChanged(Detector detector) {
matcher = TrackClusterMatcherFactory.create(trackClusterMatcherAlgo);
matcher.initializeParameterization(clusterParamFileName);
matcher.setBFieldMap(detector.getFieldMap());
matcher.setTrackCollectionName(trackCollectionName);
matcher.setTrackCollectionName(matcherTrackCollectionName);
matcher.enablePlots(enableTrackClusterMatchPlots);

// Set the magnetic field parameters to the appropriate values.
Expand Down Expand Up @@ -675,7 +675,7 @@ protected void process(EventHeader event) {
}

// VERBOSE :: Note that a new event is being read.
printDebug("\n" + trackCollectionName+"Processing Event..." + event.getEventNumber());
printDebug("\n" + matcherTrackCollectionName+"Processing Event..." + event.getEventNumber());

// Get the list of Ecal clusters from an event.
List<Cluster> clusters = event.get(Cluster.class, ecalClustersCollectionName);
Expand Down Expand Up @@ -809,9 +809,6 @@ protected void startOfData() {
if (ecalClustersCollectionName == null) {
ecalClustersCollectionName = "EcalClusters";
}
if (trackCollectionName == null) {
trackCollectionName = "GBLTracks";
}
if (finalStateParticlesColName == null) {
finalStateParticlesColName = "FinalStateParticles";
}
Expand Down
3 changes: 2 additions & 1 deletion recon/src/main/java/org/hps/recon/utils/TrackClusterMatcherMinDistance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class TrackClusterMatcherMinDistance extends AbstractTrackClusterMatcher{
protected HashMap<Cluster, Track> clusterToTrack;
protected RelationalTable hitToRotated = null;
protected RelationalTable hitToStrips = null;
protected RelationalTable trackToData = new BaseRelationalTable(RelationalTable.Mode.ONE_TO_ONE, RelationalTable.Weighting.UNWEIGHTED);
protected RelationalTable trackToData;
protected String trackClusterCollectionName = "GBLTracks";
protected String rootFile = String.format("%s_TrackClusterMatching.root",this.trackCollectionName);
//Keep false. May be used in future 03.19.21
Expand Down Expand Up @@ -364,6 +364,7 @@ private HashMap<Track,Cluster> trackClusterMatcher(List<List<Track>> trackCollec
* This matcher works for both GBL and KF Tracks.
* Returns Map of Tracks matched do unique Clusters
*/
trackToData = new BaseRelationalTable(RelationalTable.Mode.ONE_TO_ONE, RelationalTable.Weighting.UNWEIGHTED);

//define cuts
this.maxMatchDt = cuts.getMaxMatchDt();
Expand Down
Loading