Skip to content
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

Use GBL v3 within hps-java #958

Merged
merged 32 commits into from
Apr 20, 2023
Merged

Use GBL v3 within hps-java #958

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7713fd0
add delete method to GblPoint, looks like running out of mem
tomeichlersmith Mar 13, 2023
16745b9
WIP update to align with gbl-v3 java-integration branch
tomeichlersmith Mar 15, 2023
06adf0f
add example1 translation to GblJNA test
tomeichlersmith Mar 16, 2023
0b426b3
have example1 write a mille file, still passing
tomeichlersmith Mar 21, 2023
c7fc55c
also create trajectory with external seed, still passing
tomeichlersmith Mar 21, 2023
b7e5bfc
remove old GBL-JNA example, new one with tests
tomeichlersmith Mar 21, 2023
9879a68
whole pile of debug printouts
tomeichlersmith Mar 23, 2023
794e2f8
add test of getGlobalLabelsAndDerivatives
tomeichlersmith Mar 23, 2023
2cc342b
update getter to allow C-side to allocate the array
tomeichlersmith Mar 23, 2023
c13337d
:tada: running :tada: way too many printouts though
tomeichlersmith Mar 23, 2023
7de5731
comment out debug printouts for a full run
tomeichlersmith Mar 23, 2023
0793813
fix tab indenting for new accessor
tomeichlersmith Mar 27, 2023
989605b
add cleanup methods and cleanup memory leaks
tomeichlersmith Mar 27, 2023
3b4f493
cleanup traj+points when leaving loop body early
tomeichlersmith Mar 27, 2023
58f7e4e
merge library interfaces since they all interface with on library
tomeichlersmith Mar 27, 2023
1fb14da
use GblInterface in MilleBinaryJna
tomeichlersmith Mar 30, 2023
5c6d405
add some links to the newer GBL class
tomeichlersmith Mar 30, 2023
42f601d
reinsert example class program
tomeichlersmith Apr 3, 2023
9d27c66
reinstate example and run a short one during testing
tomeichlersmith Apr 3, 2023
ff0ce01
add class docs for Jna classes
tomeichlersmith Apr 3, 2023
e40c55d
more doc comments and boolean->int translation
tomeichlersmith Apr 3, 2023
b167545
propagate boolean update to callers (traj ali driver and example)
tomeichlersmith Apr 3, 2023
4414924
add a CLI to the GBL example
tomeichlersmith Apr 3, 2023
b72fc8b
propagate int->boolean conversion to test
tomeichlersmith Apr 3, 2023
ef78979
actually commit updates to CLI that were here
tomeichlersmith Apr 3, 2023
70d07e8
fixup example interaction in tests
tomeichlersmith Apr 3, 2023
d302ad4
add link to updated GBL release
tomeichlersmith Apr 4, 2023
c5ff370
separate instructions for getting GBL C++ library into own lines
tomeichlersmith Apr 5, 2023
7078f04
remove leftover debug comments
tomeichlersmith Apr 5, 2023
f8e8812
rm more leftover debug printouts
tomeichlersmith Apr 5, 2023
b09e6d3
Merge branch 'master' into gbl-v3-jna
tomeichlersmith Apr 10, 2023
4f599a3
add comment about how to link JNA to GBL
tomeichlersmith Apr 10, 2023
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
2 changes: 2 additions & 0 deletions tracking/src/main/java/org/hps/recon/tracking/gbl/FittedGblTrajectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public FittedGblTrajectory(GblTrajectory traj, double chi2, int ndf, double lost


public FittedGblTrajectory(GblTrajectoryJna traj_jna, double chi2, int ndf, double lost) {
//System.out.println("DEBUG::Tom::java::FittedGblTrajectory(GblTrajectoryJna)");
tomeichlersmith marked this conversation as resolved.
Show resolved Hide resolved
_traj_jna = traj_jna;
_chi2 = chi2;
_ndf = ndf;
Expand Down Expand Up @@ -201,6 +202,7 @@ public GblTrajectory get_traj() {
}

public GblTrajectoryJna get_traj_jna(){
//System.out.println("DEBUG::Tom::java::FittedTrajectory.get_traj_jna");
tomeichlersmith marked this conversation as resolved.
Show resolved Hide resolved
return _traj_jna;
}

Expand Down
352 changes: 0 additions & 352 deletions tracking/src/main/java/org/hps/recon/tracking/gbl/GBLexampleJna1.java
View file
Open in desktop
tomeichlersmith marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

Loading