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

Alpha ana #124

Merged
merged 37 commits into from
Apr 26, 2022
Merged

Alpha ana #124

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
db03914
Adding 01.alphaTrack validation routine
jgalan Jan 31, 2022
dd4e374
Pipeline/trexdm Removing forking feature from pipeline
jgalan Jan 31, 2022
18bd869
Fixing pipeline
jgalan Jan 31, 2022
e9b5649
examples/01.alphaTrack adapting to new ZeroSuppresion scheme
jgalan Jan 31, 2022
4f1239d
Updating 01.alphaTrack Validate.C
jgalan Jan 31, 2022
e6e34c0
examples/01.alphaTrack. Minor README update
jgalan Jan 31, 2022
dc1ba5b
examples/01.alphaTrack increasing validation range
jgalan Jan 31, 2022
b10865c
pipeline/trexdm fixing chain connectivity
jgalan Jan 31, 2022
bbe7181
pipeline/trexdm fixing pipeline
jgalan Jan 31, 2022
03f8328
Trying do address trex pipeline
juanangp Feb 2, 2022
96d7bc5
Updating alphaTrack example with current code changes
juanangp Feb 2, 2022
accaae9
Adding static function TRestHits::GetBoundaries as a generic method t…
juanangp Mar 16, 2022
85e0232
Adding new static function to perform kMeansClustering of volume hits
juanangp Mar 16, 2022
8e42db6
Adding scaling option to TRestAnalysisPlot that can be used to plot t…
juanangp Mar 16, 2022
019fba6
Adding AlphaCAMM project as a submodule to the repository
juanangp Mar 16, 2022
a4cb6a3
Merge branch 'master' into alphaAna
juanangp Mar 16, 2022
ffe3759
Trying to fix pipeline error
juanangp Mar 17, 2022
29ca945
Making FindGarfieldOlf more generic including Heed inc dirs
juanangp Mar 17, 2022
bcfab03
Fixing typo
juanangp Mar 17, 2022
8217039
Removing duplicated HitsToTrackProcess, trying to fix pipeline...
juanangp Mar 17, 2022
6b969ad
Trying to fix pandaX pipeline after removal of TRestRawZeroSuppresion…
juanangp Mar 17, 2022
83a3f71
Trying to fix pandax pipeline with new code changes
juanangp Mar 17, 2022
86042ad
Fixing trex pipeline
juanangp Mar 17, 2022
ac040aa
Removing TRestRawZeroSuppresionProcess from rml examples
juanangp Mar 17, 2022
0abfa40
Fixing bug in FindGarfieldOld
juanangp Mar 22, 2022
afee1ce
Merge branch 'master' into alphaAna
juanangp Mar 30, 2022
69fb878
Trying to fix pipeline after merging with master
juanangp Mar 30, 2022
15e69c2
Merge branch 'master' into alphaAna
juanangp Apr 5, 2022
3c031f9
Merge branch 'master' of github.com:rest-for-physics/framework into a…
juanangp Apr 8, 2022
46d6a36
Merge branch 'master' into alphaAna
jgalan Apr 20, 2022
ff37137
Fixing compilation error after merge with master
juanangp Apr 20, 2022
ccd048a
Increasing tracklib submodule to 1.3
jgalan Apr 25, 2022
e138c59
Increasing rawlib submodule to 1.6
juanangp Apr 25, 2022
5e0610f
Increasing connectorslib submodule to 1.2
juanangp Apr 25, 2022
8a33774
Increasing detectorlib submodule to 1.7
juanangp Apr 25, 2022
792df26
Updated TRestVersion.h to v2.3.12
juanangp Apr 25, 2022
0cf8f3c
Merge branch 'master' of github.com:rest-for-physics/framework into a…
juanangp Apr 25, 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
9 changes: 6 additions & 3 deletions cmake/FindGarfieldOld.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@
set(Garfield_DIR $ENV{GARFIELD_HOME})

find_path(Garfield_INCLUDE_DIRS Sensor.hh
HINTS ${Garfield_DIR}/include/ ${Garfield_DIR}/include/Garfield ${Garfield_INC_DIR}
${Garfield_DIR}/Include)
HINTS ${Garfield_DIR}/Include/ ${Garfield_DIR}/Include/Garfield
${Garfield_DIR}/include/ ${Garfield_DIR}/include/Garfield)

find_path(Garfield_INCLUDE_Heed_DIRS HeedChamber.hh
HINTS ${Garfield_DIR}/Heed/)

#message(STATUS Garfield_INCLUDE_DIRS ${Garfield_INCLUDE_DIRS})

find_library(Garfield_LIBRARIES NAMES libGarfield.so Garfield
HINTS ${Garfield_DIR}/lib ${Garfield_LIB_DIR}
$ENV{GARFIELD_HOME}/lib)
$ENV{GARFIELD_DIR}/lib)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://cmake.org/cmake/help/latest/command/find_library.html
If I understand this correctly, this change should be equivalent to removing $ENV{GARFIELD_HOME}/lib) from the macro. Why is this needed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this line is not needed and it was actually removed, I don't understand how it end up in this PR.

As fas as I remember some commits were cherry-pick from this PR to master. Perhaps something when wrong in between.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch is behind master, perhaps it will be fixed once master is merged in this branch. Highly recommended.

Screenshot 2022-04-20 at 21 35 51

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess thats why "outdated" appears next to the file name

#message(STATUS Garfield_LIBRARIES ${Garfield_LIBRARIES})

#if (${Garfield_LIBRARY_DIR})
Expand Down
18 changes: 9 additions & 9 deletions examples/01.alphaTrack/processing.rml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@
</addProcess>

<addProcess type="TRestRawToDetectorSignalProcess" name="zS" value="${RAW_PROCESSING}"
triggerStarts="0us"
gain="1"
threshold="0.01"
zeroSuppression="true"
baseLineRange="(5,55)"
integralRange="(10,500)"
pointThreshold="2"
pointsOverThreshold="5"
signalThreshold="3" />
triggerStarts="0us"
gain="1"
threshold="0.01"
zeroSuppression="true"
baseLineRange="(5,55)"
integralRange="(10,500)"
pointThreshold="2"
nPointsOverThreshold="5"
signalThreshold="3" />

<!-- Requires a bit of debugging
<addProcess type="TRestDetectorSignalChannelActivityProcess" name="chActivity" value="${RAW_PROCESSING}" verboseLevel="info" observable="all" >
Expand Down