Commits on Source (94)
-
Stephen A. Wood authored
Now for 30 Hz, need to override in parameter file
20c83acf -
Stephen A. Wood authored1399312c
-
Stephen A. Wood authored
Add parameters to hold helicity scaler results: g%s_hscaler_plus[%d] g%s_hscaler_minus[%d] g%s_hscaler_sum[%d] g%s_hscaler_asy[%d] g%s_hscaler_asyerr[%d] g%s_hscaler_time (Time with defined helicity) g%s_hscaler_time_asy g%s_hscaler_triggers (All triggers including where helicity not decoded) g%s_hscaler_triggers_plus g%s_hscaler_triggers_minus (plus+minus is slightly less than triggers) g%s_hscaler_trigger_asy %s is name assigned to THcHelicityScaler object %d is scaler channel #. 0-31
fc053e72 -
Chao Peng authored2a317791
-
Chao Peng authored702fdc12
-
Chao Peng authored11547c86
-
Chao Peng authored81ae0960
-
Whitney Armstrong authored
This is not an ideal way of doing things but it is only temporary.
d2fd834e -
Whitney Armstrong authored49c8b3b0
-
Stephen A. Wood authored
1. If THcHelicity is told about the THcHelicityScaler object with the SetHelicityScaler method, it will use helicity scaler events to jump start generating the seed 2. When beam off, helicity decoding can get lost if the helicity_freq parameter is not very close to the actual helicity reversal frequency (which seems to drift). THcHelicity now calculates a recommended value of helicity_freq.
59652700 -
Mark Jones authored
Dave Mack introduced two new variables to the calculation of beam current to described correction for the nonlinearity above 60uA in BCM1 and BCM2 seen in the Fall 18, Spring 19 and Summer 19running. See for example summer 2019 hallcweb.jlab.org/doc-private/ShowDocument?docid=1037 Fall 18/Spring 19 hallcweb.jlab.org/doc-private/ShowDocument?docid=1042 For a BCM scaler read the difference, Dcounts, from the previous scaler and get the time difference, Dtime. Original calculation is: I = (Dcounts/Dtime-fBCMOffset)/BCM_Gain Now add an non-linearity correction I = I + fBCM_SatQuadratic*Max(I-fBCM_SatOffset,0.0)^2 Add parameters fBCM_SatOffset and fBCM_SatQuadratic that can be optional read-in. If parameters are not read-in the parameters are set to zero, so there is no correction. Add the non-linearity correction to all BCM current calculations.
e5b40a34 -
Sylvester Joosten authoredffeae862
-
Sylvester Joosten authored
-
Mark Jones authored
Add code to deal with raw amp = 0 Add code to read in default ped to use when raw amp = 0
0dd89507 -
Mark Jones authored
1) Add Reftime 2) change code to fix raw amp =0 problem 3) add PedDefault needed for raw amp=0 problem
1b90ca85 -
Mark Jones authored
Check the Fptime is good
e54f6e3c -
Mark Jones authored
add Reftime
16a5a525 -
Mark Jones authored183df33c
-
Mark Jones authored41b472e9
-
Mark Jones authored1d2232e0
-
Mark Jones authored
1) Modified THcHodoscope to calculated fOffsetTime which is the average fo the difference between the ADC pulse time and the TDC time for all good hits with both PMTs ends hit. This allows a correction for bad raw ADC reference times in the other detectors. 2) Added calculation of fADCStartTime which is calculated the same as the fStartTime but uses the ADC TOF corrected pulse time.
8a34fd7e -
Mark Jones authored
In calculating the difference in time between the ADc pulse time and the Hodoscope starttime, the code adds the hodoscope OffsetTime. The OffSetTime corrects for the difference in the ADC and TDC reference times.
00314a7d -
Mark Jones authored
1) Add parameter fPedDefault which can be used as the pedestal. When the raw pulse amplitude = 0, this means that there was a pulse in the ADC time window where the pedestal is determined. This makes the pedestal wrong. so use the fPedDefault which is the average pedestal. 2) Use hodoscope OffsetTime in calculation of the difference between the Hodoscope StartTime and the ADC pulse time to compensate for difference between ADC reference time and the TDC reference time.
30be04cc -
Mark Jones authored
fptime=-1000 means that there the number of good scintillator hits found was zero for the event.
230751ab -
Mark Jones authored
Added statement if (StartTime == -1000) StartTime = 0.0; When StartTime == -1000 no good scintillator hits were found for the event.
93d26143 -
Mark Jones authored
If raw Pulse Amp = 0 , set Pulse Amp = 200. This makes the time walk correction = 0.
a8ce1f8a -
Mark Jones authored
Previously if none of the TDC hits was not within the time cut window the TDC value was set to 0. Now if there are TDC hits it selections the first one in the cut window. If no hit is found in the cut window then it selects the hit that is closest in time to the lower window limit.
8e059719 -
Mark Jones authored
Minor mistake in THcHodoscope::EstimateFocalPlaneTime fixed.
5c477e66 -
Mark Jones authored
Add methods to THcRawHit,THcRawTdcHit, THcRawAdcHit,THcRawDCHit,THcRawHodoHit,THcRawShowerHit to be able to Set and Get the time difference between good reference time pulse and the previous pulse if more than one pulse in channel for that event. Modified THcHitList to Set the reference time difference between good reference time pulse and the previous pulse. If no previouse pulse then difference ==0. Modified THcScintillatorPLane to have new tree variables for each plane : PosTdcRefDiffTime,PosAdcRefDiffTime NegTdcRefDiffTime,NegAdcRefDiffTime so that one can see the time difference between good reference time pulse and the previous pulse.
1f1830a1 -
Mark Jones authored
When calculating beta using the track info the code included hits from a paddle with single PMT hit. Now the default behavior is to not to include these single PMT hits in the track beta calculation. The parameter p( or h)TrackBetaIncludeSinglePmtHits = 1 will have the code ncluded hits from a paddle with single PMT hit when calculating track beta.
8b4cf3ea -
Mark Jones authored
Fixed mistake in filling the new reference difference time between the good reference time and the previous pulse time. If no previous pulse, now difference time = 0. Before difference time = reference time. Filled with previous time instead of the difference time in one instance.
36fd542e -
Mark Jones authored
Added tree variables to the Hall A "tr" branch. "tr.GoodPlane4", "Flag for track hitting hodo plane 4", "tr.GoodPlane3", "Flag for track hitting hodo plane 3", "tr.fptime", "Track hodo focal plane time", "tr.npmt", "Track number of hodo PMTs hit",
3db381f1 -
Stephen A. Wood authoreddb0126dd
-
Whitney Armstrong authored
modified: containers/docker/Dockerfile
-
Whitney Armstrong authored
-
Whitney Armstrong authored
-
Whitney Armstrong authored
modified: .gitlab-ci.yml
-
Whitney Armstrong authored
-
Whitney Armstrong authored
modified: .gitlab-ci.yml modified: containers/docker/Dockerfile
-
Whitney Armstrong authored
-
Whitney Armstrong authored
modified: CMakeLists.txt
e10bde40 -
Shuo Jia authored
# Conflicts: # src/THcCherenkov.cxx # src/THcHodoscope.cxx # src/THcRawAdcHit.cxx # src/THcRawHit.h
06e2ab4a -
Whitney Armstrong authored962b4b7f
-
Whitney Armstrong authored
Ci See merge request !2
-
Whitney Armstrong authoreda2cedcce
-
Whitney Armstrong authoreda57605a8
-
Whitney Armstrong authored
Ci See merge request !3
-
Whitney Armstrong authored
modified: CMakeLists.txt new file: cmake/modules/PoddCMakeEnv.cmake modified: containers/docker/Makefile
7f726d16 -
Whitney Armstrong authored
halla/c cmake problems See merge request !4
-
Whitney Armstrong authored
modified: CMakeLists.txt
f1eeacd5 -
Whitney Armstrong authored
more hall ac cmake See merge request !5
-
Whitney Armstrong authored5b05ebc8
-
Whitney Armstrong authored
cmake See merge request !6
-
Whitney Armstrong authored
modified: containers/docker/Dockerfile
b48d008c -
Whitney Armstrong authored
fixing version of analyzer See merge request !7
-
Whitney Armstrong authored6ba19cc2
-
Whitney Armstrong authored
modified: .gitlab-ci.yml See merge request !8
-
Whitney Armstrong authored08c3512a
-
Whitney Armstrong authored
libfmt update See merge request !9
-
Whitney Armstrong authoredb948b56b
-
Whitney Armstrong authored
Dockerfile. See merge request !10
-
Whitney Armstrong authoredf87ceb08
-
Whitney Armstrong authored
Dockerfile again See merge request !11
-
Whitney Armstrong authored
- Finally! - Making all CI jobs manual for now
e1bba5d4 -
Whitney Armstrong authored
Fixed CI See merge request !12
-
Whitney Armstrong authored
Merge branch 'update-april2020' of eicweb.phy.anl.gov:jlab/hallc/analyzer_software/hcana into update-april2020
0126ae74 -
Whitney Armstrong authored7820c897
-
Whitney Armstrong authored
Update april2020 See merge request !1
-
Whitney Armstrong authored7f746165
-
Whitney Armstrong authored
Removing unfixed conflict See merge request !13
-
Whitney Armstrong authored146b0e68
-
Whitney Armstrong authored
new file: bin/compile
10739f3b -
Whitney Armstrong authoredcaa948fc
-
Whitney Armstrong authored44ea2721
-
Whitney Armstrong authoreda655b9e9
-
Whitney Armstrong authoredb1ae97f1
-
Whitney Armstrong authored290fcc3c
-
Whitney Armstrong authored9ed214fb
-
Whitney Armstrong authored
Fixing build errors when merged. See merge request !14
-
Whitney Armstrong authored11621bf6
-
Whitney Armstrong authored
CI build images only on tags See merge request !15
-
Carlos Yero authored
Use quadratic version of beam current calculation. For information on the Helicity Scaler class see https://hallcweb.jlab.org/doc-private/ShowDocument?docid=1105
7b337a1a -
Carlos Yero authoredd0b07c90
-
Carlos Yero authoredcfe6a703
-
Stephen A. Wood authored5c16ca43
-
Stephen A. Wood authored3c8c7040
-
Stephen A. Wood authoredc420edd5
-
Sylvester Joosten authored28bc8386
-
Sylvester Joosten authoredab31a770
-
Sylvester Joosten authored
Merge in upstream changes and update CI See merge request !16
-
Sylvester Joosten authoredfd6b9df9
-
Sylvester Joosten authored
See merge request !17
-
Sylvester Joosten authored700e403c
-
Sylvester Joosten authored
Bump version number See merge request !18
Showing
- .clang-format 1 addition, 16 deletions.clang-format
- .containers/Dockerfile.in 23 additions, 0 deletions.containers/Dockerfile.in
- .containers/Makefile 64 additions, 0 deletions.containers/Makefile
- .containers/config.env 17 additions, 0 deletions.containers/config.env
- .containers/hcana.def.in 14 additions, 0 deletions.containers/hcana.def.in
- .containers/singularity/Singularity.broadwell 0 additions, 0 deletions.containers/singularity/Singularity.broadwell
- .containers/version.sh 3 additions, 0 deletions.containers/version.sh
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab-ci.yml 98 additions, 58 deletions.gitlab-ci.yml
- .gitlabci/build.sh 0 additions, 0 deletions.gitlabci/build.sh
- .gitlabci/configure.sh 28 additions, 0 deletions.gitlabci/configure.sh
- .gitlabci/setup.sh 0 additions, 34 deletions.gitlabci/setup.sh
- .gitlabci/sregistry-gitlab.png 0 additions, 0 deletions.gitlabci/sregistry-gitlab.png
- .gitlabci/sregistry-gitlab.xcf 0 additions, 0 deletions.gitlabci/sregistry-gitlab.xcf
- CMakeLists.txt 7 additions, 3 deletionsCMakeLists.txt
- VERSION 1 addition, 0 deletionsVERSION
- cmake/modules/PoddCMakeEnv.cmake 278 additions, 0 deletionscmake/modules/PoddCMakeEnv.cmake
- containers/docker/Dockerfile 0 additions, 49 deletionscontainers/docker/Dockerfile
- containers/docker/Dockerfile.broadwell 0 additions, 58 deletionscontainers/docker/Dockerfile.broadwell
- containers/docker/Makefile 0 additions, 208 deletionscontainers/docker/Makefile
.containers/Dockerfile.in
0 → 100644
.containers/Makefile
0 → 100644
.containers/hcana.def.in
0 → 100644
File moved
.gitlabci/build.sh
100644 → 100755
File mode changed from 100644 to 100755
.gitlabci/configure.sh
0 → 100755
.gitlabci/setup.sh
deleted
100644 → 0
.gitlabci/sregistry-gitlab.png
deleted
100644 → 0
37.4 KiB
.gitlabci/sregistry-gitlab.xcf
deleted
100644 → 0
File deleted
VERSION
0 → 100644
cmake/modules/PoddCMakeEnv.cmake
0 → 100644
containers/docker/Dockerfile
deleted
100644 → 0
containers/docker/Makefile
deleted
100644 → 0