Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7b68444
Merge branch 'master' of https://github.com/JeffersonLab/hps-java
Jun 24, 2019
ec8e619
Merge branch 'master' of https://github.com/JeffersonLab/hps-java
Jun 29, 2019
aa8b811
Merge branch 'master' of github.com:JeffersonLab/hps-java
Nov 23, 2019
a4582da
Merge branch 'master' of github.com:cbravo135/hps-java
cbravo135 Nov 24, 2019
99de8a0
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Mar 23, 2020
744fc61
Merge branch 'master' of github.com:cbravo135/hps-java
cbravo135 Mar 23, 2020
80011d6
Merge branch 'master' of https://github.com/JeffersonLab/hps-java
cbravo135 Apr 2, 2020
457e6e1
Merge branch 'master' of github.com:cbravo135/hps-java
cbravo135 Apr 2, 2020
4459e17
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Nov 22, 2020
21fc7c2
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Nov 28, 2020
787711a
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Feb 3, 2021
e5f314c
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Feb 12, 2021
9919f1f
Merge branch 'master' of github.com:cbravo135/hps-java
cbravo135 Feb 12, 2021
518ff79
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Feb 13, 2021
fe23a92
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Jun 10, 2021
ec6412a
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Jun 16, 2021
ca4ff51
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 Feb 9, 2022
b507902
Merge branch 'master' of github.com:JeffersonLab/hps-java
cbravo135 May 20, 2022
3981b7d
Update SVTOpeningAlignment.java
Jul 1, 2022
05039a8
New 2019 detector
Jul 1, 2022
b3b5897
Update compact.xml
Jul 1, 2022
e0857bc
Update compact.xml
Jul 1, 2022
7ef48ae
Update compact.xml
Jul 1, 2022
21462c8
Update compact.xml
Jul 1, 2022
9d05f8e
Continued detector development
Jul 1, 2022
16db4d6
Update SVTOpeningAlignment.java
Jul 1, 2022
ec1a03a
Update SVTOpeningAlignment.java
Jul 1, 2022
e1338bd
Update SVTOpeningAlignment.java
Jul 1, 2022
7f13c08
Update SVTOpeningAlignment.java
Jul 1, 2022
17d47e1
new aligned detector iter17
normangraf Aug 24, 2022
fae8e6e
Merge branch 'master' of github.com:cbravo135/hps-java
cbravo135 Sep 10, 2022
78c283b
Merge pull request #923 from JeffersonLab/jna_composed_traj
pbutti Oct 25, 2022
4661cde
Version of the 2019 detector for field-off studies of straight tracks.
Oct 28, 2022
4a8a032
Merge branch 'iss921' of https://github.com/JeffersonLab/hps-java int…
Oct 28, 2022
2b1f7c2
Merge branch 'master' of github.com:JeffersonLab/hps-java into ana192…
cbravo135 Nov 11, 2022
a43cb3f
Merge branch 'iss921' of github.com:JeffersonLab/hps-java into ana192…
cbravo135 Nov 11, 2022
48f90be
Add HPS_Run2021Pass0_v1 det and clean up other dets
cbravo135 Nov 11, 2022
dbf3910
Add HPS_PhysicsRun2019-v2-FEE-Pass2_iter17.lcdd, forgotten in init
cbravo135 Nov 11, 2022
5f81553
Added detctor for 2019 - Pass 2
pbutti Nov 14, 2022
82f2183
Merge pull request #932 from JeffersonLab/iss921
pbutti Nov 14, 2022
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
10,070 changes: 10,070 additions & 0 deletions detector-data/detectors/HPS_Nominal_3pt7_iter0/HPS_Nominal_3pt7_iter0.lcdd

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
790 changes: 790 additions & 0 deletions detector-data/detectors/HPS_Nominal_3pt7_iter0/compact.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: HPS_Nominal_3pt7_iter0
34 changes: 17 additions & 17 deletions detector-data/detectors/HPS_Nominal_iter0/HPS_Nominal_iter0.lcdd

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
799 changes: 799 additions & 0 deletions detector-data/detectors/HPS_Nominal_iter1/compact.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: HPS_Nominal_iter1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
799 changes: 799 additions & 0 deletions detector-data/detectors/HPS_Nominal_iter2/compact.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: HPS_Nominal_iter2

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
1,082 changes: 1,082 additions & 0 deletions detector-data/detectors/HPS_PhysicsRun2019-v2-FEE-Pass2_iter17/compact.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: HPS_PhysicsRun2019-v2-FEE-Pass2_iter17
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: HPS_PhysicsRun2019-v2-FEE-Pass2_iter17_fieldOff

10,070 changes: 10,070 additions & 0 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2/HPS_PhysicsRun2019_Pass2.lcdd

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
1,082 changes: 1,082 additions & 0 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2/compact.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: HPS_PhysicsRun2019_Pass2
10,070 changes: 10,070 additions & 0 deletions detector-data/detectors/HPS_Run2021Pass0_v1/HPS_Run2021Pass0_v1.lcdd

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
788 changes: 788 additions & 0 deletions detector-data/detectors/HPS_Run2021Pass0_v1/compact.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: HPS_Run2021Pass0_v1
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import hep.aida.IPlotterStyle;

import java.io.IOException;
import static java.lang.Math.abs;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
Expand Down Expand Up @@ -108,6 +109,8 @@ public class SVTOpeningAlignment extends Driver {
String fullTrackCollectionName = "s234_c5_e167";
double targetPosition = -5.0; //mm

boolean _writeRunAndEventNumbers = true;

public SVTOpeningAlignment() {
}

Expand Down Expand Up @@ -299,24 +302,30 @@ protected void detectorChanged(Detector detector) {
@Override
public void process(EventHeader event) {
aida.tree().cd("/");
if (!event.hasCollection(HelicalTrackHit.class, helicalTrackHitCollectionName))
if (!event.hasCollection(HelicalTrackHit.class, helicalTrackHitCollectionName)) {
return;
}

if (!event.hasCollection(Track.class, l0to3CollectionName))
if (!event.hasCollection(Track.class, l0to3CollectionName)) {
return;
}

if (!event.hasCollection(Track.class, l4to6CollectionName))
if (!event.hasCollection(Track.class, l4to6CollectionName)) {
return;
}

if (matchFullTracks)
if (!event.hasCollection(Track.class, fullTrackCollectionName))
if (matchFullTracks) {
if (!event.hasCollection(Track.class, fullTrackCollectionName)) {
return;
}
}

List<Track> l0to3tracks = event.get(Track.class, l0to3CollectionName);
List<Track> l4to6tracks = event.get(Track.class, l4to6CollectionName);
List<Track> fulltracks = new ArrayList<Track>();
if (matchFullTracks)
if (matchFullTracks) {
fulltracks = event.get(Track.class, fullTrackCollectionName);
}

List<Track> l0to3tracksTop = splitTrackList(l0to3tracks, true);
List<Track> l0to3tracksBot = splitTrackList(l0to3tracks, false);
Expand Down Expand Up @@ -365,8 +374,9 @@ public void process(EventHeader event) {
for (Track trk03 : l0to3tracksTop) {
if (matchFullTracks) {
matchedTrack = checkFullTrack(fulltracks, trk03, trk46);
if (matchedTrack == null)
if (matchedTrack == null) {
continue;
}
}
TrackState ts03 = trk03.getTrackStates().get(0);
double x0L03 = TrackUtils.getX0(ts03);
Expand Down Expand Up @@ -404,7 +414,10 @@ public void process(EventHeader event) {
yAtHingeL03VsL46Top.fill(yAtHingeL46, yAtHingeL03);
delYAtHingeVsL46SlopeTop.fill(deltaYAtHinge, slL46);
delYAtHingeVsL03SlopeTop.fill(deltaYAtHinge, slL03);

if (_writeRunAndEventNumbers) {
System.out.println(event.getRunNumber() + " " + event.getEventNumber() + " t");
}
analyzeMatchedTrack("top", matchedTrack);
}
}
fitAndPutParameters(deld0Top, fd0Top);
Expand All @@ -418,8 +431,9 @@ public void process(EventHeader event) {
for (Track trk03 : l0to3tracksBot) {
if (matchFullTracks) {
matchedTrack = checkFullTrack(fulltracks, trk03, trk46);
if (matchedTrack == null)
if (matchedTrack == null) {
continue;
}
}
TrackState ts03 = trk03.getTrackStates().get(0);
double x0L03 = TrackUtils.getX0(ts03);
Expand Down Expand Up @@ -457,6 +471,10 @@ public void process(EventHeader event) {
yAtHingeL03VsL46Bot.fill(yAtHingeL46, yAtHingeL03);
delYAtHingeVsL46SlopeBot.fill(deltaYAtHinge, slL46);
delYAtHingeVsL03SlopeBot.fill(deltaYAtHinge, slL03);
if (_writeRunAndEventNumbers) {
System.out.println(event.getRunNumber() + " " + event.getEventNumber() + " b");
}
analyzeMatchedTrack("bottom", matchedTrack);
}
}

Expand All @@ -472,13 +490,14 @@ public void process(EventHeader event) {

@Override
public void endOfData() {
if (outputPlots != null)
if (outputPlots != null) {
try {
plotterTop.writeToFile(outputPlots + "-deltasTop.gif");
plotterBot.writeToFile(outputPlots + "-deltasBottom.gif");
} catch (IOException ex) {
Logger.getLogger(TrackingReconPlots.class.getName()).log(Level.SEVERE, null, ex);
}
}
}

private List<Track> splitTrackList(List<Track> trks, boolean doTop) {
Expand All @@ -488,15 +507,22 @@ private List<Track> splitTrackList(List<Track> trks, boolean doTop) {
for (Track trk : trks) {
isTop = false;
isBot = false;
for (TrackerHit hit : trk.getTrackerHits())
for (TrackerHit hit : trk.getTrackerHits()) {
if (hit.getPosition()[2] > 0)// remember, non-bend in tracking frame is z-direction
{
isTop = true;
else
} else {
isBot = true;
if (isTop == true && isBot != true && doTop == true) // if we want top tracks and all hits are in top
}
}
if (isTop == true && isBot != true && doTop == true) // if we want top tracks and all hits are in top
{
tracksHalf.add(trk);
}
if (isBot == true && isTop != true && doTop == false) // if we want bottom tracks and all hits are in bottom
{
tracksHalf.add(trk);
}
}
return tracksHalf;
}
Expand All @@ -507,10 +533,30 @@ private Track checkFullTrack(List<Track> fullTracks, Track t03, Track t46) {

for (Track fullTr : fullTracks) {
List<TrackerHit> trkHitsFull = fullTr.getTrackerHits();
if (trkHitsFull.containsAll(trkHitsL03) && trkHitsFull.containsAll(trkHitsL46))
if (trkHitsFull.containsAll(trkHitsL03) && trkHitsFull.containsAll(trkHitsL46)) {
return fullTr;
}
}

return null;
}

private void analyzeMatchedTrack(String torb, Track t) {
aida.tree().mkdirs("track quality");
aida.tree().cd("track quality");
String pdg = t.getCharge() < 0 ? " electron " : " positron ";
aida.histogram1D("chisq per ndf " + pdg + torb, 100, 0., 15.).fill(t.getChi2() / t.getNDF());
aida.histogram1D("number of hits " + pdg + torb, 20, -0.5, 19.5).fill(t.getTrackerHits().size());
aida.histogram1D("charge " + pdg + torb, 3, -1.5, 1.5).fill(t.getCharge());
TrackState ts = t.getTrackStates().get(0);
aida.histogram1D("tanLambda " + pdg + torb, 50, 0, 0.06).fill(abs(ts.getTanLambda()));
aida.histogram1D("z0 " + pdg + torb, 50, -1.0, 1.0).fill(ts.getZ0());
aida.histogram1D("d0 " + pdg + torb, 50, -3.0, 3.0).fill(ts.getD0());

aida.tree().cd("..");
}

public void setWriteRunAndEventNumbers(boolean b) {
_writeRunAndEventNumbers = b;
}
}
Loading