Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
691 commits
Select commit Hold shift + click to select a range
b8e5412
Merge pull request #1988 from osbornjd/bbcvertexcontainer
osbornjd May 1, 2023
5f277fe
clang-format
osbornjd May 1, 2023
c8a89d4
cppcheck
osbornjd May 1, 2023
1d905b9
Merge pull request #1989 from osbornjd/split_bbc_digitizationreco
osbornjd May 2, 2023
c0b869c
Separate truth vertex smearing from DST global vertex objects
osbornjd May 2, 2023
0b973a2
update other packages
osbornjd May 2, 2023
a375359
Clean up bbcout remnants
osbornjd May 2, 2023
f62f359
Have tracks point to global vertex object instead of SvtxVertex object
osbornjd May 2, 2023
4327c03
clang-format
osbornjd May 2, 2023
1023a11
update kfparticle to use globalvertex
osbornjd May 2, 2023
25b2dc6
Major updates to the track matching
david-stewart May 2, 2023
be50960
remove instance from sphenixnpc, compatible with new nopayloadclient
pinkenburg May 2, 2023
6de0166
remove instance from sphenixnpc
pinkenburg May 2, 2023
6015084
use CDBInterface instead of sphenixnpc
pinkenburg May 2, 2023
9a580b3
Jenkins logic update
david-stewart May 2, 2023
8f066ce
fix memory leak
pinkenburg May 3, 2023
d699dfb
fix remaining g4vertex
osbornjd May 3, 2023
5106174
Merge branch 'master' of github.com:sPHENIX-Collaboration/coresoftwar…
osbornjd May 3, 2023
36c4a6a
Preparing to push
bkimelman May 3, 2023
d633ec6
Merge remote-tracking branch 'upstream/master' into CMIdentification
bkimelman May 3, 2023
2b93ef1
Removed putting Fluctuation distortions on node tree. Further workflo…
bkimelman May 3, 2023
edf3052
Merge pull request #1991 from pinkenburg/prep-newcdbclient
pinkenburg May 3, 2023
8ae3b54
more build updates
osbornjd May 3, 2023
f5db9ec
Merge pull request #1902 from david-stewart/EvalTree
osbornjd May 3, 2023
ed55af3
Add pedestal subtraction to the software zero suppression
timothyrinn May 3, 2023
b2e8562
fix tangent vector
osbornjd May 3, 2023
621ad05
makemillefiles produces correct derivatives
osbornjd May 3, 2023
2951c2d
fix bbc th1
osbornjd May 4, 2023
0991fff
Merge pull request #1990 from osbornjd/global_vertex
osbornjd May 4, 2023
bd0e309
read from cdb if file is available
osbornjd May 4, 2023
d2bb721
trigger jenkins
osbornjd May 4, 2023
3849035
fix cdb lookup
osbornjd May 4, 2023
b40918a
commit after git down
osbornjd May 4, 2023
0fd0381
remove libg4vertex_io remnants
pinkenburg May 4, 2023
67df3c2
Merge pull request #1997 from pinkenburg/fix-makefile
pinkenburg May 4, 2023
86349c8
Merge pull request #1995 from osbornjd/bbc_th1
osbornjd May 4, 2023
c948013
new stepping that directly add energy to towerinfo
Shuonli May 4, 2023
69f8cd3
fix field map lookup
osbornjd May 5, 2023
e346df5
Merge pull request #1996 from osbornjd/fieldmap_cdb
osbornjd May 5, 2023
ae2523f
make track residual tuple module
osbornjd May 4, 2023
7cba7ae
Fix vertex lookup
osbornjd May 5, 2023
e747122
Merge pull request #2000 from osbornjd/trackResiduals
osbornjd May 5, 2023
75a6b2f
Merge pull request #1994 from osbornjd/local_residuals
osbornjd May 5, 2023
3b7dfa0
first version of MVTX unpacker, currently contains dummy fill since t…
KvapilJ May 5, 2023
7fde0af
Merge pull request #1993 from timothyrinn/patch-1
pinkenburg May 5, 2023
60e9d3a
Merge pull request #2001 from osbornjd/track_vertex_association
osbornjd May 5, 2023
3c83e6c
Added helper class for dead channel analysis
josephbertaux May 5, 2023
d102244
Debugged quicksort methods and implemented copy constructor for Jenkins
josephbertaux May 5, 2023
bd1e3d5
Merge branch 'sPHENIX-Collaboration:master' into master
VVerkest May 5, 2023
09af9eb
updated includes
KvapilJ May 5, 2023
44d99da
reverted previous change, alphabetically ordered
KvapilJ May 5, 2023
e4afffc
Implemented operator= for Jenkins
josephbertaux May 5, 2023
b55f4e3
Adding Functionality for Laser Stepping Over Angles in ROOT file
luisval May 5, 2023
f66c865
build tower geom node in detector subsystem for new stepping
Shuonli May 6, 2023
cca7384
Merge pull request #2002 from KvapilJ/master
pinkenburg May 6, 2023
b11a5ad
Merge pull request #2003 from josephbertaux/master
pinkenburg May 6, 2023
0c2cb42
Add methods to fix tpc sectors.
adfrawley May 6, 2023
291a1f0
Merge branch 'master' of https://github.com/sPHENIX-Collaboration/cor…
adfrawley May 6, 2023
41e0e2a
Final Update for Pull request to properly load the magnetic field map…
MYOMAO May 6, 2023
f23fece
add new stepping for old geom
Shuonli May 7, 2023
91718d8
include the correct lib(maybe...)
Shuonli May 7, 2023
0baead8
set default stepping to the old one
Shuonli May 7, 2023
d8e42a4
fix tpc localz
osbornjd May 8, 2023
900029e
Merge pull request #2006 from osbornjd/tpc_localz
osbornjd May 8, 2023
969517c
add alignment defs class
osbornjd May 8, 2023
a2b9012
Initializing angles variables in constructor to pass Jenkins quality …
luisval May 8, 2023
88203cd
Merge branch 'master' of https://github.com/MYOMAO/coresoftware into …
MYOMAO May 8, 2023
be4df10
Updated by adding InitRun function for KFParticle_sPHENIX.cc and add …
MYOMAO May 8, 2023
d1d5cf6
Updated by adding InitRun function for KFParticle_sPHENIX.cc and add …
MYOMAO May 8, 2023
01007fa
Diagnostic output change.
adfrawley May 9, 2023
c64ab74
Merge branch 'master' of https://github.com/sPHENIX-Collaboration/cor…
adfrawley May 9, 2023
cf4aa09
Rework alignment defs and implement common methods etc. in both modules
osbornjd May 9, 2023
9636fd7
Add different error inflation factors for the four different subsystems.
adfrawley May 9, 2023
16a0f90
include the delta t cut
Shuonli May 9, 2023
5f7ffbe
Merge pull request #2004 from luisval/master
pinkenburg May 9, 2023
48af4d4
Merge pull request #2007 from adfrawley/alignment_development
osbornjd May 9, 2023
41649cc
trigger jenkins
bkimelman May 9, 2023
b32f0ee
Check for track map instead of aborting if it doesn't exist
osbornjd May 9, 2023
510be90
Merge branch 'sPHENIX-Collaboration:master' into padplane_readout_phi
mohaas33 May 9, 2023
86a0d8a
forgot ; :(
Shuonli May 9, 2023
0fe3e94
made processing type, and zero suppression a setable quantity
timothyrinn May 9, 2023
268e791
Merge branch 'master' of https://github.com/MYOMAO/coresoftware into …
MYOMAO May 9, 2023
57b14c3
Updated with SetBz
MYOMAO May 9, 2023
f1c7e19
use pileupstring to extract base name for G4Hits filename
pinkenburg May 9, 2023
339110b
Merge pull request #1992 from bkimelman/CMIdentification
osbornjd May 9, 2023
ee49d4d
Merge branch 'master' of github.com:sPHENIX-Collaboration/coresoftwar…
osbornjd May 9, 2023
9b556e0
clang-format
osbornjd May 9, 2023
346cb1f
add pAu and momentum flag
pinkenburg May 9, 2023
6bb9df5
Merge branch 'sPHENIX-Collaboration:master' into master
VVerkest May 9, 2023
9d0271c
Merge pull request #2008 from timothyrinn/ANewBranchName
pinkenburg May 9, 2023
36acc78
Merge pull request #2011 from pinkenburg/add-pAu-createfilelist
pinkenburg May 9, 2023
ece6983
Merge pull request #2009 from osbornjd/vertexreco
osbornjd May 10, 2023
b33b534
trigger jenkins
osbornjd May 10, 2023
1de6eb7
fix clang build
osbornjd May 10, 2023
5a1f785
Merge pull request #2010 from osbornjd/common_alignment_tools
osbornjd May 10, 2023
368c499
Merge branch 'master' of https://github.com/MYOMAO/coresoftware into …
MYOMAO May 10, 2023
f1958a7
trigger jenkins
MYOMAO May 10, 2023
888be0d
move utils from sphenixnpc daughter of nopayloadclient to CDBUtils
pinkenburg May 10, 2023
2d027c2
Added a hardcoded, explicitly mapping of Felix ports/channels to ladd…
josephbertaux May 10, 2023
f088349
Merge pull request #1998 from Shuonli/newstepping
pinkenburg May 11, 2023
945dfd5
Merge pull request #2012 from josephbertaux/master
pinkenburg May 11, 2023
633af7b
set global tag in cdbutils
pinkenburg May 11, 2023
636007c
enable online build (just install TrkrDefs.h), clean up Makefile.am
pinkenburg May 11, 2023
0e2ba6a
Merge pull request #2014 from pinkenburg/trackbase-online
pinkenburg May 11, 2023
5506955
compile TrkrDefs.cc into shared libs for online
pinkenburg May 11, 2023
6e70ef2
Merge pull request #2015 from pinkenburg/trackbase-online-2
pinkenburg May 12, 2023
e59487e
enable online build
hupereir May 12, 2023
97026c5
Merge pull request #2016 from hupereir/micromegas-online
pinkenburg May 12, 2023
73ab994
fixed memory leak
hupereir May 12, 2023
6436049
Adding the TPC pedestal calibration module
rosstom2232 May 12, 2023
f99bbfa
Forgot to add names
rosstom2232 May 12, 2023
1c0ad19
Merge pull request #2017 from hupereir/fix-memory-leak-in-raw-data-de…
pinkenburg May 13, 2023
c1a87c3
Merge branch 'master' of https://github.com/MYOMAO/coresoftware into …
MYOMAO May 15, 2023
1f610d9
A check to validate exactly 1 B field value at (0,0,0) in the field map
MYOMAO May 15, 2023
90238e6
Merge pull request #2005 from MYOMAO/KFParticle
osbornjd May 15, 2023
31f69d9
unit bug
osbornjd May 16, 2023
5ac53a4
Merge pull request #2019 from osbornjd/units
osbornjd May 16, 2023
22b8eab
Updated DecayFinder and HFTrackEfficiency to handle G4Particle better
cdean-github May 16, 2023
382da09
Merge branch 'master' of github.com:sPHENIX-Collaboration/coresoftwar…
cdean-github May 16, 2023
fa65e0d
Updated method to identify diffuse laser flash with high occupancy. A…
bkimelman May 16, 2023
8b14349
Merge remote-tracking branch 'upstream/master' into CM_thresholdTuning
bkimelman May 16, 2023
73b2943
clean up interface
pinkenburg May 16, 2023
83acd9a
Deleting old module that was just a macro Merge branch 'master' of gi…
rosstom2232 May 16, 2023
f3edc3d
Creating TPCPedestalCalibration module
rosstom2232 May 16, 2023
c2973c8
Fixed a couple minor issues in the .cc and .h files
rosstom2232 May 16, 2023
27edb66
Revert "Adding the TPC pedestal calibration module"
rosstom2232 May 16, 2023
406bc5b
Revert "Creating TPCPedestalCalibration module"
rosstom2232 May 16, 2023
4082bd0
Creating TPCPedestalCalibration module
rosstom2232 May 16, 2023
8441ff9
Merge pull request #2021 from bkimelman/CM_thresholdTuning
pinkenburg May 16, 2023
b1e3ddd
fix vtx type assignment
osbornjd May 17, 2023
c1cdc2d
add vertices with id based on vertexmap size
osbornjd May 17, 2023
5e50def
Merge pull request #2022 from osbornjd/vertexing_bug
pinkenburg May 17, 2023
292a4b4
Added deletes for new objects
cdean-github May 17, 2023
06732cc
initial commit for the EMCAL new stepping action that does not save G…
Shuonli May 18, 2023
4a323d4
Merge branch 'master' of github.com:sPHENIX-Collaboration/coresoftwar…
cdean-github May 18, 2023
48edeb3
add alignment state derivatives
osbornjd May 18, 2023
f31b135
merge
osbornjd May 18, 2023
f0f18c3
Adding ability to set sector number for output file data
rosstom2232 May 18, 2023
a1f82d6
Added raw data dedicated evaluation module. This feels a simple tree …
hupereir May 18, 2023
f983e0b
removed evaluation histograms. They were redundant and less flexible …
hupereir May 18, 2023
9e1a7a0
new stepping action that directly put light yield into towerinfo
Shuonli May 18, 2023
71649c8
Merge pull request #2023 from osbornjd/track_residuals
osbornjd May 19, 2023
61dc205
Merge pull request #2025 from hupereir/micromegas_raw_data_evaluation
osbornjd May 19, 2023
08bec24
fix build warning
Shuonli May 19, 2023
5cd56b9
Merge branch 'master' of github.com:sPHENIX-Collaboration/coresoftwar…
osbornjd May 19, 2023
8069e63
Fixing array initialization issue
rosstom2232 May 19, 2023
96033ad
Merge branch 'sPHENIX-Collaboration:master' into master
rosstom2232 May 19, 2023
30fb565
fix seg fault
osbornjd May 19, 2023
ac42e78
Merge pull request #2028 from osbornjd/tpcresiduals_actsprop
osbornjd May 20, 2023
f3111fc
Merge pull request #2024 from rosstom2232/master
pinkenburg May 20, 2023
8315b7d
add input manager for run nodes (no eventwise dst)
pinkenburg May 20, 2023
64ccfed
clang-format, clang-tidy
pinkenburg May 20, 2023
35a682f
fix circular dependency
osbornjd May 21, 2023
f5b894f
build tower geom node
Shuonli May 21, 2023
8f68faa
remove unused varible
Shuonli May 21, 2023
63aa8a5
remove unused varible
Shuonli May 21, 2023
991a2ad
Merge pull request #2031 from pinkenburg/runnode-read
pinkenburg May 21, 2023
6c2c168
add spacal geometry dump (partial), replace goto, clang-tidy
pinkenburg May 21, 2023
5fa6916
clang-format
pinkenburg May 21, 2023
3be15eb
fix cppcheck warnings
pinkenburg May 21, 2023
40e04d4
Merge pull request #2020 from cdean-github/KFParticle
pinkenburg May 21, 2023
f1e7384
iwyu
osbornjd May 21, 2023
69cc49a
remove outdated east physics list
pinkenburg May 21, 2023
53585fa
clang-tidy
pinkenburg May 21, 2023
7ecc331
clang-format
pinkenburg May 21, 2023
d967eec
Merge pull request #2032 from pinkenburg/dump-spacal-geo
pinkenburg May 21, 2023
836c978
fix module
osbornjd May 21, 2023
88ca65f
Merge pull request #2034 from pinkenburg/remove-east
pinkenburg May 21, 2023
b0ab823
Merge branch 'master' into cdb-client-update
pinkenburg May 21, 2023
2ae979d
move to new client
pinkenburg May 21, 2023
8ce049b
rename sphenixnpc to SphenixClient to follow Linos implementation
pinkenburg May 21, 2023
dc990db
remove eASTPhysicsList
pinkenburg May 21, 2023
3425fb7
TPC raw data dump for online debug
blackcathj May 21, 2023
990ed6d
last ones
osbornjd May 22, 2023
bde59d5
Merge pull request #2035 from pinkenburg/remove-east-code
pinkenburg May 22, 2023
9546120
add default list of packets
blackcathj May 22, 2023
5363d6d
add MBD to TowerBuilder
Shuonli May 22, 2023
41ee3ab
Merge pull request #2033 from osbornjd/circular_dependency
osbornjd May 22, 2023
bcb3c50
Merge pull request #2036 from blackcathj/TpcRawDataTree
pinkenburg May 22, 2023
aab4c4d
Merge branch 'master' into cdb-client-update
pinkenburg May 22, 2023
5b54b80
Latest working version
mohaas33 May 22, 2023
8546072
Merge branch 'sPHENIX-Collaboration:master' into padplane_readout_phi
mohaas33 May 22, 2023
0e23065
Merge pull request #2037 from Shuonli/MBDTowerBuilder
pinkenburg May 22, 2023
28de8a8
Adding macro for the TPC hits part to be written
mohaas33 May 22, 2023
1e46c72
latest version
mohaas33 May 22, 2023
15d2678
Merge branch 'sPHENIX-Collaboration:master' into padplane_readout_phi
mohaas33 May 22, 2023
ce9afce
add verbosity
pinkenburg May 23, 2023
322942b
fix Fun4AllRunNodeInputManager
pinkenburg May 23, 2023
031d7f4
add more spacal geometry fields to DumpPHG4CylinderGeomContainer.cc
pinkenburg May 23, 2023
36f4b7c
Changed TPC distortion corrections to be stored on the runNode rather…
bkimelman May 23, 2023
50a0256
Merge pull request #2038 from pinkenburg/fix-runnode-reader
pinkenburg May 23, 2023
2854bd2
allow layer misalignment in acts kf
osbornjd May 23, 2023
39b4def
Merge branch 'sPHENIX-Collaboration:master' into master
VVerkest May 23, 2023
d86d5bc
Adding Writing TRKR_HITSET to DST
mohaas33 May 23, 2023
47f6ee8
Merge pull request #2039 from bkimelman/CM_distortion_runNode
pinkenburg May 24, 2023
816b422
Merge pull request #2040 from osbornjd/layer_misalignment
osbornjd May 24, 2023
acc12b6
updated for new Micromegas packets
hupereir May 24, 2023
523c9d4
- added packet_id to evaluation
hupereir May 24, 2023
3ca163d
Latest version
mohaas33 May 24, 2023
1d76b51
Merge pull request #2041 from hupereir/micromegas_mapping_update
pinkenburg May 24, 2023
fab8d0d
Remove macros directory
mohaas33 May 24, 2023
210674a
allow user to set the value of the event number
VVerkest May 24, 2023
fff7f61
Merge branch 'sPHENIX-Collaboration:master' into master
VVerkest May 24, 2023
2b1085d
Latest changes
mohaas33 May 24, 2023
fe7bb4e
Merge branch 'sPHENIX-Collaboration:master' into padplane_readout_phi
mohaas33 May 24, 2023
f9b24ae
Update TpcRawDataTree.cc
blackcathj May 24, 2023
d5509e4
Added draft of InttRawDataDecoder.h/cc following Hugo's (well written…
josephbertaux May 24, 2023
56c65c7
Still only a draft, but not it's a draft that compiles
josephbertaux May 24, 2023
db85c2a
Merge branch 'intt'
josephbertaux May 24, 2023
a5364b7
Setting gain weights to 1
mohaas33 May 24, 2023
e9565cf
Merge branch 'sPHENIX-Collaboration:master' into padplane_readout_phi
mohaas33 May 24, 2023
7efdb89
Implemented proper computations of hitkey and hitsetkey
josephbertaux May 24, 2023
d8daba5
fixed typo
josephbertaux May 24, 2023
25504c0
fixed typo
josephbertaux May 24, 2023
2968c4e
Merge pull request #2042 from VVerkest/master
pinkenburg May 24, 2023
ae7e2e4
Merge pull request #2043 from josephbertaux/master
pinkenburg May 25, 2023
f05c59c
Adding files TpcMap.cc/.h and TpcRawDataDecoder.cc/.h
mohaas33 May 25, 2023
b01953f
suppress verbosity
osbornjd May 25, 2023
a27205c
Merge pull request #2046 from osbornjd/layer_misalignment
osbornjd May 25, 2023
f29a31a
Set histos to nullptr
mohaas33 May 25, 2023
45f24dd
Merge pull request #2045 from mohaas33/padplane_readout_phi
pinkenburg May 26, 2023
06c022f
remove verbosity
osbornjd May 26, 2023
87a07e4
Merge pull request #2047 from osbornjd/layer_misalignment
osbornjd May 26, 2023
c9da460
all working
pinkenburg May 26, 2023
87be813
adjust for new cdb client
pinkenburg May 26, 2023
7b2b139
return string for getCalibration
pinkenburg May 26, 2023
ddf6080
clang-tidy, clang-format
pinkenburg May 26, 2023
7e22b6c
fix cppcheck warnings
pinkenburg May 26, 2023
91f63bb
fix cppcheck warning
pinkenburg May 27, 2023
fcd2d9a
fix cppcheck warning
pinkenburg May 27, 2023
d237989
suppress clang warning (needs fix in nopayloadclient)
pinkenburg May 27, 2023
eb63da0
iwyu to trigger jenkins
pinkenburg May 27, 2023
ec71dec
Merge pull request #2048 from pinkenburg/cdb-client-update
pinkenburg May 27, 2023
acc4af8
use pragma to suppress warning coming from nopayloadclient
pinkenburg May 27, 2023
b46208f
Merge pull request #2049 from pinkenburg/fix-clang
pinkenburg May 27, 2023
1e5cd13
use separate name for template payload type
pinkenburg May 27, 2023
a9674fe
restore old behavior, return empty string if no payload found
pinkenburg May 27, 2023
5a087f2
Merge pull request #2050 from pinkenburg/fix-cdb-calo
pinkenburg May 27, 2023
3d03b9b
Remove verbosity
osbornjd May 29, 2023
1156c77
Merge pull request #2051 from osbornjd/edrift_segfault
osbornjd May 29, 2023
c098626
sync with master
blackcathj May 30, 2023
bbc9327
sync with master
blackcathj May 30, 2023
c2998d2
sync with master
blackcathj May 30, 2023
d92424a
add type 21, Jet >= 20GeV, add embed in pAu
pinkenburg May 30, 2023
2bb62d7
Merge pull request #2053 from pinkenburg/add-jet20
pinkenburg May 30, 2023
4053fbf
Merge branch 'master' of github.com:sPHENIX-Collaboration/coresoftwar…
cdean-github May 30, 2023
15720f5
Changed speed of light in decay time calculation to reflect new mag. …
cdean-github May 30, 2023
f29a0f3
Merge pull request #2054 from cdean-github/KFParticle
pinkenburg May 30, 2023
ec540e9
Merge pull request #2026 from Shuonli/newstepping
pinkenburg May 31, 2023
7919bf2
Merge branch 'master' of github.com:sPHENIX-Collaboration/coresoftwar…
blackcathj May 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 5 additions & 7 deletions calibrations/calorimeter/calo_emc_pi0_tbt/CaloCalibEmc_Pi0.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
#include <calobase/RawClusterUtility.h>
#include <calobase/RawTower.h>
#include <calobase/RawTowerContainer.h>
#include <calobase/RawTowerDefs.h>
#include <calobase/RawTowerGeomContainer.h>
#include <calobase/RawTowerGeom.h>
#include <calobase/TowerInfoContainer.h>
#include <calobase/TowerInfo.h>

#include <calobase/TowerInfoContainerv1.h>
#include <calobase/TowerInfov1.h>


#include <g4vertex/GlobalVertex.h>
#include <g4vertex/GlobalVertexMap.h>
#include <globalvertex/GlobalVertex.h>
#include <globalvertex/GlobalVertexMap.h>

#include <fun4all/Fun4AllReturnCodes.h>
#include <fun4all/SubsysReco.h>
Expand Down
2 changes: 1 addition & 1 deletion calibrations/calorimeter/calo_emc_pi0_tbt/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ AM_LDFLAGS = \
-L$(OFFLINE_MAIN)/lib64 \
-lHepMC \
-lCLHEP \
-lg4vertex_io \
-lglobalvertex_io \
-lcalo_io \
-lSubsysReco

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,28 @@ AM_CPPFLAGS = \
AM_LDFLAGS = \
-L$(libdir) \
-L$(OFFLINE_MAIN)/lib \
-L$(OFFLINE_MAIN)/lib64 \
`root-config --libs`
-L$(OFFLINE_MAIN)/lib64

pkginclude_HEADERS = \
TpcRS.h
TPCPedestalCalibration.h

lib_LTLIBRARIES = \
libtpcresponse.la
libTPCPedestalCalibration.la

libtpcresponse_la_SOURCES = \
TpcRS.cc
libTPCPedestalCalibration_la_SOURCES = \
TPCPedestalCalibration.cc

libtpcresponse_la_LIBADD = \
-lphg4hit \
libTPCPedestalCalibration_la_LIBADD = \
-lphool \
-lSubsysReco \
-ltpcrs \
-lGeom \
-lMathMore
-lSubsysReco

BUILT_SOURCES = testexternals.cc

noinst_PROGRAMS = \
testexternals

testexternals_SOURCES = testexternals.cc
testexternals_LDADD = libtpcresponse.la
testexternals_LDADD = libTPCPedestalCalibration.la

testexternals.cc:
echo "//*** this is a generated file. Do not commit, do not edit" > $@
Expand Down
197 changes: 197 additions & 0 deletions calibrations/tpc/TPCPedestalCalibration/TPCPedestalCalibration.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
#include "TPCPedestalCalibration.h"

#include <fun4all/Fun4AllReturnCodes.h>
#include <phool/PHCompositeNode.h>
#include <phool/PHIODataNode.h> // for PHIODataNode
#include <phool/PHNodeIterator.h> // for PHNodeIterator
#include <phool/PHObject.h> // for PHObject
#include <phool/getClass.h>
#include <phool/phool.h>

#include <Event/Event.h>
#include <Event/EventTypes.h>
#include <Event/packet.h>

#include <TMath.h>
#include <TFile.h>
#include <TTree.h>

#include <memory>
#include <cassert>
#include <iostream>

/*************************************************************/
/* TPC Pedestal Calibration */
/* Thomas Marshall,Aditya Dash */
/* rosstom@ucla.edu,aditya55@physics.ucla.edu */
/*************************************************************/

TPCPedestalCalibration::TPCPedestalCalibration(const std::string &name)
:SubsysReco("TPCPedestalCalibration")
, m_fname(name)
{
// reserve memory for max ADC samples
m_adcSamples.resize(1024, 0);

for(int fee_no=0;fee_no<26;fee_no++)
{
for(int channel_no=0;channel_no<256;channel_no++)
{
m_aveADCFeeChannel[fee_no][channel_no]=0.0;
m_stdADCFeeChannel[fee_no][channel_no]=0.0;
m_countsADCFeeChannel[fee_no][channel_no]=0.0;
m_aliveArrayFeeChannel[fee_no][channel_no]=1;
}
}

}

int TPCPedestalCalibration::InitRun(PHCompositeNode *)
{
m_file = TFile::Open(m_fname.c_str(), "recreate");
assert(m_file->IsOpen());

m_pedestalTree = new TTree("pedestalTree", "Each entry is one TPC Channel");

m_pedestalTree->Branch("isAlive",&m_isAlive,"isAlive/I");
m_pedestalTree->Branch("pedMean",&m_pedMean,"pedMean/F");
m_pedestalTree->Branch("pedStd",&m_pedStd,"pedStd/F");
m_pedestalTree->Branch("sector",&m_sector,"sector/I");
m_pedestalTree->Branch("fee",&m_outFEE,"fee/I");
m_pedestalTree->Branch("channel",&m_chan,"channel/I");
m_pedestalTree->Branch("module",&m_module,"module/I");
m_pedestalTree->Branch("slot",&m_slot,"slot/I");

return Fun4AllReturnCodes::EVENT_OK;
}

//____________________________________________________________________________..
int TPCPedestalCalibration::process_event(PHCompositeNode *topNode)
{
Event *_event = findNode::getClass<Event>(topNode, "PRDF");
if (_event == nullptr)
{
std::cout << "TPCRawDataTree::Process_Event - Event not found" << std::endl;
return -1;
}
if (_event->getEvtType() >= 8) /// special events
{
return Fun4AllReturnCodes::DISCARDEVENT;
}

for (int packet : m_packets)
{
if (Verbosity())
{
std::cout << __PRETTY_FUNCTION__ << " : decoding packet " << packet << std::endl;
}

m_packet = packet;

std::unique_ptr<Packet> p (_event->getPacket(m_packet));
if (!p)
{
if (Verbosity())
{
std::cout << __PRETTY_FUNCTION__ << " : missing packet " << packet << std::endl;
}

continue;
}

m_nWaveormInFrame = p->iValue(0, "NR_WF");

for (int wf = 0; wf < m_nWaveormInFrame; wf++)
{
m_nSamples = p->iValue(wf, "SAMPLES");
m_fee = p->iValue(wf, "FEE");
m_Channel = p->iValue(wf, "CHANNEL");

if(m_nSamples==0)
{
m_aliveArrayFeeChannel[m_fee][m_Channel]=0;
continue;
}

assert(m_nSamples < (int) m_adcSamples.size()); // no need for movements in memory allocation
for (int s = 0; s < m_nSamples; s++)
{
m_adcSamples[s] = p->iValue(wf, s);
}

bool dead = false;
for(int adc_sam_no=0;adc_sam_no<m_nSamples;adc_sam_no++)
{
if (m_adcSamples[adc_sam_no] == 0 || TMath::IsNaN(float(m_adcSamples[adc_sam_no])))
{
m_aliveArrayFeeChannel[m_fee][m_Channel]=0;
}
}
if (dead) {continue;}

for(int adc_sam_no=0;adc_sam_no<m_nSamples;adc_sam_no++){
m_aveADCFeeChannel[m_fee][m_Channel]+=m_adcSamples[adc_sam_no];
m_stdADCFeeChannel[m_fee][m_Channel]+=pow(m_adcSamples[adc_sam_no],2);
m_countsADCFeeChannel[m_fee][m_Channel]+=1.0;
}
}
} // for (int packet : m_packets)

return Fun4AllReturnCodes::EVENT_OK;
}

int TPCPedestalCalibration::EndRun(const int runnumber)
{
std::cout << "TPCPedestalCalibration::EndRun(const int runnumber) Ending Run for Run " << runnumber << std::endl;

for(int fee_no=0;fee_no<26;fee_no++)
{
for(int channel_no=0;channel_no<256;channel_no++)
{
if(m_countsADCFeeChannel[fee_no][channel_no] != 0.0)
{
float temp1 = m_aveADCFeeChannel[fee_no][channel_no]/m_countsADCFeeChannel[fee_no][channel_no];
float temp2 = m_stdADCFeeChannel[fee_no][channel_no]/m_countsADCFeeChannel[fee_no][channel_no];
m_aveADCFeeChannel[fee_no][channel_no] = temp1;
m_stdADCFeeChannel[fee_no][channel_no] = temp2;
}
else
{
m_aveADCFeeChannel[fee_no][channel_no] = 0.0;
m_stdADCFeeChannel[fee_no][channel_no] = 0.0;
m_aliveArrayFeeChannel[fee_no][channel_no]=0;
}

if(m_aveADCFeeChannel[fee_no][channel_no] > 200 || m_aveADCFeeChannel[fee_no][channel_no] < 10)
{
m_aliveArrayFeeChannel[fee_no][channel_no]=0;
}

m_pedMean=m_aveADCFeeChannel[fee_no][channel_no];
m_pedStd=sqrt(m_stdADCFeeChannel[fee_no][channel_no] - pow(m_aveADCFeeChannel[fee_no][channel_no],2));
m_isAlive=m_aliveArrayFeeChannel[fee_no][channel_no];
m_chan=channel_no;
m_outFEE=fee_no;
m_module=mod_arr[fee_no];
m_slot=slot_arr[fee_no];
m_pedestalTree->Fill();
}
}

return Fun4AllReturnCodes::EVENT_OK;
}

//____________________________________________________________________________..
int TPCPedestalCalibration::End(PHCompositeNode *topNode)
{
std::cout << "TPCPedestalCalibration::End(PHCompositeNode *topNode) This is the End..." << std::endl;

m_file->Write();

std::cout << __PRETTY_FUNCTION__ << " : completed saving to " << m_file->GetName() << std::endl;
m_file->ls();

m_file->Close();

return Fun4AllReturnCodes::EVENT_OK;
}
74 changes: 74 additions & 0 deletions calibrations/tpc/TPCPedestalCalibration/TPCPedestalCalibration.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// Tell emacs that this is a C++ source
// -*- C++ -*-.
#ifndef TPCPedestalCalibration_H
#define TPCPedestalCalibration_H

#include <fun4all/SubsysReco.h>

#include <string>
#include <vector>

class PHCompositeNode;
class TFile;
class TTree;

class TPCPedestalCalibration : public SubsysReco
{
public:
explicit TPCPedestalCalibration(const std::string &name = "TPCPedestalCalibration.root");

~TPCPedestalCalibration() override {}

int InitRun(PHCompositeNode *topNode) override;

int process_event(PHCompositeNode *topNode) override;

int EndRun(const int runnumber) override;

int End(PHCompositeNode *topNode) override;

void AddPacket(int packet)
{
m_packets.push_back(packet);
}

void SetSector(int sectorNum)
{
m_sector = sectorNum;
}

protected:
//! which packet to decode
std::vector<int> m_packets{1001};

private:
std::string m_fname;
TFile * m_file = nullptr;
TTree * m_pedestalTree = nullptr;

int m_packet = 0;
int m_nWaveormInFrame = 0;
int m_nSamples = 0;
int m_fee = 0;
int m_Channel = 0;
std::vector<unsigned short> m_adcSamples;

float m_aveADCFeeChannel[26][256];
float m_stdADCFeeChannel[26][256];
float m_countsADCFeeChannel[26][256];
int m_aliveArrayFeeChannel[26][256];

int m_isAlive = 1;
float m_pedMean = 0;
float m_pedStd = 0;
int m_sector = 0;
int m_outFEE = 99;
int m_chan = 999;
int m_module = 9;
int m_slot = 99;

int mod_arr[26]={2,2,1,1,1,3,3,3,3,3,3,2,2,1,2,2,1,1,2,2,3,3,3,3,3,3};
int slot_arr[26] = {5,6,1,3,2,12,10,11,9,8,7,1,2,4,8,7,6,5,4,3,1,3,2,4,6,5};
};

#endif // TPCPedestalCalibration_H
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT(tpcresponse,[1.00])
AC_INIT(tpcpedestalcalibration,[1.00])
AC_CONFIG_SRCDIR([configure.ac])

AM_INIT_AUTOMAKE
Expand All @@ -9,7 +9,7 @@ LT_INIT([disable-static])
dnl no point in suppressing warnings people should
dnl at least see them, so here we go for g++: -Wall
if test $ac_cv_prog_gxx = yes; then
CXXFLAGS="$CXXFLAGS -Wall -Werror -Wextra"
CXXFLAGS="$CXXFLAGS -Wall -Werror"
fi

AC_CONFIG_FILES([Makefile])
Expand Down
Binary file not shown.
Loading