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.

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

feat: update online plots for several detectors #678

Merged
merged 216 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from 215 commits
Commits
Show all changes
216 commits
Select commit Hold shift + click to select a range
c146a18
testing
Jun 3, 2021
7f6394f
testing
Jun 3, 2021
cea53d2
test git
jml985 Jun 3, 2021
676b190
test git
jml985 Jun 3, 2021
9caf84c
Merge branch 'star-bnl:main' into main
jml985 Jun 3, 2021
62e0744
Merge remote-tracking branch 'origin/main' into main
jml985 Jun 3, 2021
fe2fbaa
updated again
jml985 Jun 3, 2021
0f5edad
update
jml985 Jun 3, 2021
9e742f9
Merge remote-tracking branch 'origin/main' into main
jml985 Jun 3, 2021
4a932ac
update
jml985 Jun 3, 2021
7bcf381
Merge branch 'main' of https://github.com/star-bnl-rts/star-sw into main
jml985 Jun 3, 2021
b8ad867
Tonko added TONKO_TRASH
tonko-lj Jun 4, 2021
db3ddd7
Modified yada
tonko-lj Jun 4, 2021
0e3b8e2
moew
tonko-lj Jun 4, 2021
8cda00f
updated yada
jml985 Jun 4, 2021
e6c3531
more
tonko-lj Jun 4, 2021
33a622a
More tests
tonko-lj Jun 4, 2021
fe32d2e
Merge branch 'star-bnl:main' into main
jml985 Jun 7, 2021
aedf33d
Merge branch 'star-bnl:main' into main
jml985 Jun 7, 2021
30f0666
Merge branch 'star-bnl:main' into main
jml985 Jun 9, 2021
cd2a02a
Merge branch 'star-bnl:main' into main
jml985 Jun 15, 2021
17c5272
Merge branch 'star-bnl:main' into main
jml985 Aug 24, 2021
e6de21a
Merge branch 'star-bnl:main' into main
jml985 Aug 30, 2021
b80b340
updates for root6
Aug 30, 2021
ff2a7c3
Merge branch 'star-bnl:main' into main
jml985 Aug 30, 2021
6e46135
fixed typo
Aug 30, 2021
0e360ce
blah
Aug 31, 2021
7d1b3ba
blah2
jml985 Aug 31, 2021
b91d8f1
yeah
jml985 Aug 31, 2021
5bc46e1
Merge branch 'star-bnl:main' into main
jml985 Oct 7, 2021
dbda7d3
update readers for STGC and FCS
jml985 Oct 8, 2021
39868ac
rollback TRG_FCS changes do to protype changes
jml985 Oct 11, 2021
338d3d0
and delete the files added to finish rollback
jml985 Oct 11, 2021
4d3d5ed
merging
jml985 Oct 11, 2021
a417da4
Merge branch 'star-bnl-main' into main
jml985 Oct 11, 2021
2a0e3f2
removed unneeded comments, and test files
jml985 Oct 11, 2021
5374f16
got rid of comment
jml985 Oct 11, 2021
f345cd0
Initial Implement of FST Online Monitor
sunxuhit Oct 11, 2021
c9fe285
merging
jml985 Oct 11, 2021
cf3cc7f
merging
jml985 Oct 11, 2021
5fee781
update 2021 trigger data format to version 0x47
jml985 Oct 13, 2021
778f48f
Need the 0x47 trigger version
jml985 Oct 13, 2021
8a6487a
Initial Implement of FST Online Monitor (#169)
sunxuhit Oct 13, 2021
95609bf
Adding StTriggerData2022 for new v47 trigger data structure
akioogawa Oct 13, 2021
df51783
Merge branch 'main' of https://github.com/star-bnl/star-sw into main
jml985 Oct 13, 2021
6687c42
test git
jml985 Jun 3, 2021
3b283c0
Tonko added TONKO_TRASH
tonko-lj Jun 4, 2021
5a64b33
Modified yada
tonko-lj Jun 4, 2021
a376791
moew
tonko-lj Jun 4, 2021
f70efce
updated yada
jml985 Jun 4, 2021
99ba59a
more
tonko-lj Jun 4, 2021
6826e66
More tests
tonko-lj Jun 4, 2021
e409783
update readers for STGC and FCS
jml985 Oct 8, 2021
55a18ae
rollback TRG_FCS changes do to protype changes
jml985 Oct 11, 2021
8e8eb7f
and delete the files added to finish rollback
jml985 Oct 11, 2021
32212d3
removed unneeded comments, and test files
jml985 Oct 11, 2021
a88c377
update 2021 trigger data format to version 0x47
jml985 Oct 13, 2021
0a65103
updating for 2022 trigger
jml985 Oct 13, 2021
8342d48
added server for fstBuilder
jml985 Oct 13, 2021
c9289d2
Use 64 bit detector presence flag to include STGC and FTS
jml985 Nov 11, 2021
6715f2a
Clean up launch process
jml985 Nov 12, 2021
3942c64
fstBuilder with two input ped files
sunxuhit Nov 12, 2021
f24f218
fixed bug for CMN plots
sunxuhit Nov 12, 2021
5aee02a
forward declaration daqReader
sunxuhit Nov 13, 2021
052e004
update etofBuilder
jml985 Nov 13, 2021
79d76b1
use a static base store
jml985 Nov 13, 2021
10c2e5a
fix display issue
sunxuhit Nov 13, 2021
a309931
Delete script after use
jml985 Nov 13, 2021
6a7bd20
Merge commit 'refs/pull/191/head' of https://github.com/star-bnl/star…
jml985 Nov 13, 2021
d705ff2
add
jml985 Nov 13, 2021
4a6a974
change hitCut to 3.0
sunxuhit Nov 13, 2021
480873a
fixed geoIdx bug
sunxuhit Nov 13, 2021
95fd5d2
Merge commit 'refs/pull/193/head' of https://github.com/star-bnl/star…
jml985 Nov 13, 2021
b16303e
Merge branch 'JevpProduction' of https://github.com/star-bnl/star-sw …
jml985 Nov 13, 2021
b4ced4a
git rid of eemcBuilder hack that was leading to seg faults. Improved…
jml985 Nov 14, 2021
144d33f
Merge branch 'JevpProduction' of https://github.com/star-bnl/star-sw …
jml985 Nov 14, 2021
e78d668
add zoomed plot
jml985 Nov 14, 2021
43e566a
Merge branch 'JevpProduction' of https://github.com/star-bnl/star-sw …
jml985 Nov 14, 2021
6213a16
sTGC Online plots for full detector with VMM
Nov 17, 2021
0719a6e
Merge commit 'refs/pull/199/head' of https://github.com/star-bnl/star…
jml985 Nov 17, 2021
924173c
stgc updats
jml985 Nov 17, 2021
dcc33f8
STGC: Add timing and charge plots, outline detectors.
Nov 17, 2021
4e4aea5
Merge commit 'refs/pull/201/head' of https://github.com/star-bnl/star…
jml985 Nov 18, 2021
3843c66
update FST monitor plots
sunxuhit Nov 24, 2021
4fced3b
added logging, increased time delay for writing plots
jml985 Nov 28, 2021
2dd2a93
added logging, increased time delay for writing plots
jml985 Nov 28, 2021
0f76a6e
Merge commit 'refs/pull/214/head' of https://github.com/star-bnl/star…
jml985 Nov 28, 2021
5631328
Update sTGC plots, show diagonal strips, fit trigger time delay
Dec 3, 2021
90d5ca5
Merge commit 'refs/pull/223/head' of https://github.com/star-bnl/star…
jml985 Dec 3, 2021
f4cf929
Add online TOT histograms for MTD
marrbnl Dec 7, 2021
0a549a3
Update code in StRoot/StLaserAnalysisMaker (#174)
fisyak Oct 18, 2021
8c3f780
Geometry update for 2022 (#173)
klendathu2k Oct 19, 2021
933f44e
Update CHANGELOG (#119)
plexoos Oct 19, 2021
8abe216
Add Anti-H4 Lambda decay to Anti-He4 + pion- (#176)
klendathu2k Oct 21, 2021
bd7aa3d
fixed array size (#178)
dmarkh Oct 21, 2021
ad0821e
D edx fxt2019 (#175)
fisyak Oct 26, 2021
6faed27
Averaged magnet current to set magnetic field strength (#170)
fisyak Oct 28, 2021
a0a2bf9
Xianglei Zhu, 09/11/2021: FXT3p85_2018 and 09/14/2021: Isobar paramet…
fisyak Nov 2, 2021
5b3ba5c
Introduce FXT chain option to enable anything FXT-specific (#161)
genevb Nov 2, 2021
46f4dc2
Add fix for fixed Target run with broken yellowIntensity information …
fisyak Nov 2, 2021
ba87ccb
Changing FCS Wcal and Hcal x positions in Geometry file based on run …
akioogawa Nov 4, 2021
155df02
Add good event flag to ETOF headers and StPicoEvent (#160)
PhilippWeidenkaff Nov 4, 2021
38f5281
Adding 3 access functions for revTick (#183)
akioogawa Nov 10, 2021
86bb98e
Move histogram creation of reference pulser outside of daQA flag (#182)
PhilippWeidenkaff Nov 10, 2021
5bbea07
Updates from Tonko on StRoot/RTS/src/DAQ_FCS and TRG_FCS (#179)
akioogawa Nov 10, 2021
acbf05d
Tuning up TpcRS for AuAu19GeV 2019 (#184)
fisyak Nov 12, 2021
58c65cc
Update CHANGELOG for SL21d_0 release (#192)
plexoos Nov 15, 2021
e75bd2b
Star tablelib (#189)
klendathu2k Nov 16, 2021
e215674
ci: Avoid conflict with latest tag when using cache to/from (#198)
plexoos Nov 17, 2021
5aadcf8
Fix cut limits in EPD macro (#188)
liuxiaoyuyuyu Nov 17, 2021
fb9cff3
Fcs mudst (#200)
jdbrice Nov 17, 2021
17dd3c9
updates to daq readers in prep for run 22 (#186)
jml985 Nov 17, 2021
8dd2f36
Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195)
plexoos Nov 17, 2021
ccc8945
StEvent StTriggerData2022 update associate with (#203)
akioogawa Nov 18, 2021
94bbe00
Trigger group removed 5DSM from BBC crate, thus changing structure. (…
akioogawa Nov 22, 2021
7264dc2
StRoot/Stv*: replace sys/types.h with stdint.h (#211)
veprbl Nov 24, 2021
5bb1e88
StEvent additions for sTGC (Ftt) detector (#209)
jdbrice Nov 29, 2021
f101538
Initial Run 22 chains, including FTT and FCS (#217)
genevb Nov 30, 2021
5d8f917
StFcsDB makes no file unless debug is on (#218)
akioogawa Dec 1, 2021
435621b
Minor fix: 2017 -> 2022 (#219)
genevb Dec 1, 2021
72ac368
Move back to MagFactor instead of starMagOnl for pre 2012 data (issue…
fisyak Dec 1, 2021
df21390
Fix min/max default value mixup (#221)
akioogawa Dec 3, 2021
b19ae50
StMuDstMaker, init mFcsCollection to zero (#222)
jdbrice Dec 3, 2021
fb1f4d6
StRoot/StTriggerUtilities: replace sys/types.h with stdint.h (#212)
veprbl Dec 3, 2021
346b6d1
starsim: make seed overflow into a fatal error (#215)
veprbl Dec 3, 2021
73bcc0e
HOTFIX: Missing FttCollection in StEventClusteringHints.cxx (#227)
jdbrice Dec 3, 2021
989cbba
StRoot/StSpinPool: replace sys/types.h with stdint.h (#224)
veprbl Dec 4, 2021
f01b3d6
Update gstar_part.g (#228)
zhux97 Dec 6, 2021
cb7b57a
Adding option to read from MuDst in StFcsRawHitMaker (#226)
akioogawa Dec 6, 2021
ef9e5d1
Merge commit 'refs/pull/230/head' of https://github.com/star-bnl/star…
jml985 Dec 7, 2021
33f89ae
update fstBuilder for beam
sunxuhit Dec 7, 2021
c7c79f5
Merge commit 'refs/pull/231/head' of https://github.com/star-bnl/star…
jml985 Dec 8, 2021
a8caf38
update fstBuilder for Lat Tuning
sunxuhit Dec 14, 2021
ec8bdd5
Merge commit 'refs/pull/231/head' of https://github.com/star-bnl/star…
jml985 Dec 14, 2021
a414e40
ftt builder's fitTriggerTime must be protected with mutex
jml985 Dec 15, 2021
b0ea092
update to fcsBuilder
jml985 Dec 15, 2021
ab0f7c5
trgBuilder
jml985 Dec 20, 2021
16788cd
updated again
jml985 Dec 20, 2021
68c5bdb
updates to trgBuilder
jml985 Dec 23, 2021
786d5e5
add trgBuilder plots, and fix a bug
jml985 Dec 23, 2021
ee3fd35
update for 3 time bin
sunxuhit Dec 24, 2021
9a4b25e
Merge commit 'refs/pull/231/head' of https://github.com/star-bnl/star…
jml985 Dec 24, 2021
2d20db3
set logy for ZDCSMD adc plots
kehw Jan 5, 2022
f1057c1
Update fttBuilder.h
jdbrice Jan 9, 2022
90c025c
Update fttBuilder.cxx
jdbrice Jan 9, 2022
f6ade44
Merge branch 'star-bnl:JevpProduction' into JevpProduction
jdbrice Jan 9, 2022
7d68323
Merge commit 'refs/pull/277/head' of https://github.com/star-bnl/star…
jml985 Jan 11, 2022
81aa947
Merge commit 'refs/pull/1/head' of https://github.com/jml985/star-sw …
jml985 Jan 11, 2022
c894960
update bbcBuilder
jml985 Jan 18, 2022
7ed52c6
Do not fill MTD histograms if MTD is not read out
marrbnl Jan 26, 2022
90757bd
added various logging
jml985 Jan 27, 2022
54516f7
Merge commit 'refs/pull/2/head' of https://github.com/jml985/star-sw …
jml985 Jan 27, 2022
1c8b7c8
updated logging
jml985 Feb 8, 2022
281429e
set default minimum of 4 orders of magitude less than max for logy on…
jml985 Feb 8, 2022
6bd46d4
Merge branch 'JevpProduction' of https://github.com/jml985/star-sw in…
jml985 Feb 8, 2022
071d1fb
fix tofBuilder
jml985 Feb 11, 2022
dfda2e6
tofBuilder update
jml985 Feb 17, 2022
b7dca20
Merge branch 'JevpProduction' of https://github.com/jml985/star-sw in…
jml985 Feb 17, 2022
6abab6c
split tpc builder to add laser builder
jml985 Feb 17, 2022
883d92c
update for TH1 arrays in unions for c++11
jml985 Jun 21, 2022
cef7e84
Create PWGTools area (#340)
nigmatkulov Mar 24, 2023
225ad74
final updates to online plots from 2022 run
jml985 Mar 29, 2023
9b7ca12
Summer 2023 updates
jml985 Mar 29, 2023
cb5f054
update level.source
jml985 Mar 29, 2023
697effc
adding DAQ_TPC23 directory
jml985 Mar 29, 2023
503546c
Merge branch 'main' into JevpProduction
plexoos Mar 29, 2023
95d9280
Merge branch 'main' into main
plexoos Mar 29, 2023
28352df
remove root files
plexoos Mar 29, 2023
041bc3a
fix itpc23.h
jml985 Mar 30, 2023
cec5d77
Merge remote-tracking branch 'origin/main' into main
jml985 Mar 30, 2023
4190e05
new directions in readme.txt
jml985 Mar 30, 2023
d63759d
Merge remote-tracking branch 'origin/JevpProduction' into JevpProduction
jml985 Mar 30, 2023
fea51f9
tonko updates
jml985 Apr 3, 2023
6dabffd
Merge branch 'star-bnl:main' into main
jml985 Apr 26, 2023
1220f8c
remove logging from itpcFCF and local daq updates
jml985 Apr 26, 2023
d6bb0e6
Merge remote-tracking branch 'upstream/main' into om
jml985 May 9, 2023
8e45c5a
fix new cluster finder dropping outer two RDOs of TPX bug
jml985 May 9, 2023
d34cad5
Merge branch 'um' into JevpProduction
jml985 May 10, 2023
12d039e
fix laser reader
jml985 May 10, 2023
a1fd896
stupid git
jml985 May 13, 2023
94dd447
updates
jml985 May 25, 2023
390c4a8
added blue/yellow beam by trigger plots
jml985 May 25, 2023
2999aca
updates to fst/laser
jml985 May 30, 2023
b4f5eae
Changed Vertex Z plotting range for Fix Target and Fix Target Monitor
Jun 4, 2023
0fa173c
Merge pull request #3 from shendiyu/JevpProduction
jml985 Jun 4, 2023
823a1f3
update to maxtac in vpd builder
jml985 Jun 11, 2023
601aab0
Merge branch 'star-bnl:main' into main
jml985 Jun 14, 2023
63b9e80
DAQ reader updates for DAQ5k
jml985 Jun 14, 2023
73aeeb3
update plots for time bin range and mult tb cut
Jun 15, 2023
178bf89
Merge pull request #4 from jdbrice/stgc-online-tb
jml985 Jun 15, 2023
54f497b
fix fstBuilder for 9 timebins, and commit earlier changes to fttBuilder
jml985 Jun 22, 2023
9511719
Merge branch 'star-bnl:main' into main
jml985 Jun 29, 2023
f5fd881
updates to vpd builder
jml985 Jun 29, 2023
5b459bc
Merge branch 'om' into o_jevp
jml985 Jun 29, 2023
3281970
updated with newest readers
jml985 Jun 29, 2023
f388def
TEST (bare with newbie) APV index fix; plot range defined
zyzhang-0 Jun 29, 2023
db06682
Set plotting range for 3 time bin
zyzhang-0 Jun 29, 2023
51f4216
Simplify the code to make it more readable
zyzhang-0 Jun 30, 2023
4f040e5
max Tb per section
zyzhang-0 Jun 30, 2023
bcb0b69
Update mtdBuilder to properly handle readout errors
marrbnl Aug 7, 2023
1b7f8cf
updates to allow RTS logging in Jevp while leaving it disabled in gen…
jml985 Mar 25, 2024
785df56
Commented out lines that have no effect. Original authors desired b…
jml985 Mar 25, 2024
71beae6
incorporate production changes
jml985 Mar 25, 2024
1baaaa2
Merge branch 'RtsLogCompile' into JevpProduction
jml985 Mar 25, 2024
158d415
Merge branch 'fttBuilderUpdate' into JevpProduction
jml985 Mar 25, 2024
c19047e
update directions
jml985 Mar 25, 2024
4b903ec
reader updates
jml985 Mar 25, 2024
1dffed9
Merge branch 'RTSUpdates_240325' into JevpProduction
jml985 Mar 25, 2024
271e73b
comment lines with no effect
jml985 Apr 1, 2024
ed5dec8
April 24 updates rdobyte hists,, updated hist ranges
fvidebaek Apr 2, 2024
3ae4eb4
Merge remote-tracking branch 'origin/main' into JevpProduction
jml985 Apr 2, 2024
796e2a0
change directions and levels
jml985 Apr 3, 2024
ba1ac26
Merge branch 'JevpProduction' into pull677
jml985 Apr 3, 2024
61b299f
Merge pull request #5 from zyzhang-0/JevpProduction
jml985 Apr 3, 2024
a20063a
Merge pull request #6 from marrbnl/JevpProduction
jml985 Apr 3, 2024
63c712b
Merge branch 'main' into JevpProduction
plexoos Apr 19, 2024
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
28 changes: 18 additions & 10 deletions OnlTools/Jevp/StJevpBuilders/fstBuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ void fstBuilder::event(daqReader *rdr)
}

PCP;
numTb = numTimeBin; //default: 9 timebins
numTb = numTb_default; //default: 9 timebins

//LOG("JEFF", "numbTB=%d", numTimeBin);

Expand Down Expand Up @@ -1401,6 +1401,12 @@ void fstBuilder::event(daqReader *rdr)
}
}
}
//set plotting range for time bin distributions
hEventSumContents.hMaxTimeBin_ZS->GetXaxis()->SetRangeUser(tb_plot_low, tb_plot_high);
hEventSumContents.hMaxTimeBin->GetXaxis()->SetRangeUser(tb_plot_low, tb_plot_high);
for(int index = 0; index < mTbVsAdcHist; index++) hTbVsAdcContents.tbVsAdcArray[index]->GetXaxis()->SetRangeUser(tb_plot_low, tb_plot_high);
for(int index = 0; index < mMaxTimeBinHist; index++) hMaxTimeBinContents.maxTimeBinArray[index]->GetXaxis()->SetRangeUser(tb_plot_low, tb_plot_high);
for(int glbElecApvIdx = 0 ; glbElecApvIdx < totAPV ; glbElecApvIdx++) hMaxTimeBinContents_APV.maxTimeBinArray_APV[glbElecApvIdx]->GetXaxis()->SetRangeUser(tb_plot_low, tb_plot_high);

PCP;

Expand Down Expand Up @@ -2060,10 +2066,11 @@ void fstBuilder::stoprun(daqReader *rdr)
}
}

double entriesTB_123=0, entriesTB_all=0, fraction = 1.0;
if(hMaxTimeBinContents.maxTimeBinArray[j]->GetEntries()>0) {
entriesTB_123 = hMaxTimeBinContents.maxTimeBinArray[j]->Integral(2, numTb-1);
entriesTB_all = hMaxTimeBinContents.maxTimeBinArray[j]->Integral(1, numTb);
double entriesTB_123=0, entriesTB_all=0, fraction = 0.;
entriesTB_all = hMaxTimeBinContents.maxTimeBinArray[j]->Integral(1, numTb);
//if(hMaxTimeBinContents.maxTimeBinArray[j]->Integral(1, numTb)>0) {
if(entriesTB_all>0.) {
entriesTB_123 = hMaxTimeBinContents.maxTimeBinArray[j]->Integral(numTb/2+1, numTb/2+1);
fraction = entriesTB_123/entriesTB_all;
if(fraction<maxTbFracOK) {
//LOG(U_FST,"maxTimeBinFraction::section RDO%d_ARM%d_GROUP%d with fraction %f!", rdoIdx, armIdx, portIdx, fraction);
Expand Down Expand Up @@ -2123,13 +2130,14 @@ void fstBuilder::stoprun(daqReader *rdr)
for(int armIdx=0; armIdx<ArmPerRdo; armIdx++){
for(int refApvIdx=0; refApvIdx<ApvPerArm; refApvIdx++){
int glbElecApvIdx = refApvIdx + armIdx*ApvPerArm + (rdoIdx-1)*ApvPerRdo; // 0-287
double entriesTB_123=0, entriesTB_all=0, fraction = 1.0;
if(hMaxTimeBinContents_APV.maxTimeBinArray_APV[glbElecApvIdx]->GetEntries()>0){
entriesTB_123 = hMaxTimeBinContents_APV.maxTimeBinArray_APV[glbElecApvIdx]->Integral(2, numTb-1);
entriesTB_all = hMaxTimeBinContents_APV.maxTimeBinArray_APV[glbElecApvIdx]->Integral(1, numTb);
double entriesTB_123=0, entriesTB_all=0, fraction = 0.;
entriesTB_all = hMaxTimeBinContents_APV.maxTimeBinArray_APV[glbElecApvIdx]->Integral(1, numTb);
//if(hMaxTimeBinContents_APV.maxTimeBinArray_APV[glbElecApvIdx]->GetEntries()>0){
if(entriesTB_all>0.){
entriesTB_123 = hMaxTimeBinContents_APV.maxTimeBinArray_APV[glbElecApvIdx]->Integral(numTb/2+1,numTb/2+1);
fraction = entriesTB_123/entriesTB_all;
}
hEventSumContents.hMaxTBfractionVsAPV_ZS->SetBinContent(glbElecApvIdx, fraction);
hEventSumContents.hMaxTBfractionVsAPV_ZS->SetBinContent(glbElecApvIdx+1, fraction);
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions OnlTools/Jevp/StJevpBuilders/fstBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ class fstBuilder : public JevpBuilder {
static const int ApvNumOffset = 12; // APV RO number same as IST | used for APV number convertion
static const int ApvRoPerPort = 12; // APV RO number same as IST
static const int ApvRoPerArm = 24; // APV RO number same as IST

static const int numTimeBin = 9; // to be decided
static const int goodChCut = 64; // to be decided
static const int minPedVal = 200; // to be decided
Expand Down Expand Up @@ -129,6 +128,10 @@ class fstBuilder : public JevpBuilder {
static const float rStop[RstripPerMod];
static const float rDelta;

//Time Bin plots plot range
const float tb_plot_low = 0.;
const float tb_plot_high = 3.;

//FST mapping
int fstGeomMapping[totCh]; //FST channel mapping (electronics ID to geometry ID transform)
int fstElecMapping[totCh]; //FST channel mapping (geometry ID & electronics ID transform)
Expand All @@ -137,7 +140,7 @@ class fstBuilder : public JevpBuilder {
float fstPedestal[numTimeBin][totCh];
float fstRmsNoise[numTimeBin][totCh];
float fstRanNoise[numTimeBin][totCh];

//*** Histogram Declarations...
union {
TH2 *adcArray[1]; //ADC value of each module's channels (ADC value vs. channel index)
Expand Down Expand Up @@ -960,7 +963,7 @@ class fstBuilder : public JevpBuilder {

int sumHistogramsFilled;
int numTb;

const int numTb_default = 3;
JLatex* errorMsg;

ClassDef(fstBuilder, 1);
Expand Down
17 changes: 13 additions & 4 deletions OnlTools/Jevp/StJevpBuilders/fttBuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -439,10 +439,17 @@ void fttBuilder::drawStrip( TH2 * h2, int row, int strip, VMMHardwareMap::Quadra

int ix0 = ax->FindBin( x0 + row * rLength );
int ix1 = ax->FindBin( x0 + (row + 1) * rLength - 1 );
if ( VMMHardwareMap::Quadrant::C == q || VMMHardwareMap::Quadrant::D == q ){
int ix0 = ax->FindBin( x0 + (row - 1) * rLength );
int ix1 = ax->FindBin( x0 + (row) * rLength - 1 );
}

/* This code does nothing! ----------------------
Most likely it was intended to adjust the indexes for this specific
region of the detector, but not known if needed; -jml 3/25/24

if ( VMMHardwareMap::Quadrant::C == q || VMMHardwareMap::Quadrant::D == q ){
int ix0 = ax->FindBin( x0 + (row - 1) * rLength );
int ix1 = ax->FindBin( x0 + (row) * rLength - 1 );
}
*/

const int iy0 = ay->FindBin( y0 + strip * sPitch );
const int iy1 = ay->FindBin( y0 + (strip) * sPitch );
floodFill( h2, ix0, iy0, ix1, iy1 );
Expand All @@ -459,10 +466,12 @@ void fttBuilder::drawStrip( TH2 * h2, int row, int strip, VMMHardwareMap::Quadra

int iy0 = ay->FindBin( y0 + row * rLength );
int iy1 = ay->FindBin( y0 + (row + 1) * rLength - 1 );
/* Does nothing, intened to adjust indexes?
if ( VMMHardwareMap::Quadrant::C == q || VMMHardwareMap::Quadrant::D == q ){
int iy0 = ay->FindBin( y0 + (row - 1) * rLength );
int iy1 = ay->FindBin( y0 + (row) * rLength - 1 );
}
*/
const int ix0 = ax->FindBin( x0 + strip * sPitch );
const int ix1 = ax->FindBin( x0 + (strip) * sPitch );
floodFill( h2, ix0, iy0, ix1, iy1 );
Expand Down
12 changes: 11 additions & 1 deletion OnlTools/Jevp/StJevpBuilders/mtdBuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,13 @@ void mtdBuilder::event(daqReader *rdr) {
int err1 = (int)(contents.MTD_Error1->GetEntries());
int err2 = (int)(contents.MTD_Error2->GetEntries());
int err3 = (int)(contents.MTD_Error3->GetEntries());

bool is_ignore = true;
for(int bin=1; bin<=contents.MTD_Error3->GetNbinsX(); bin++)
{
if(contents.MTD_Error3->GetBinContent(bin)>2)
is_ignore = false;
}

//error1 label
if(err1== 0) {
sprintf(t, "No electronics errors in %d events",nev);
Expand Down Expand Up @@ -703,6 +709,10 @@ void mtdBuilder::event(daqReader *rdr) {
sprintf(t, "No read out errors in %d events",nev);
MTD_Error3_label->SetTextColor(3);
}
else if(is_ignore) {
sprintf(t, "%d read out errors in %d events. Ignore!",err3, nev);
MTD_Error3_label->SetTextColor(4);
}
else {
sprintf(t, "%d read out errors in %d events!",err3, nev);
MTD_Error3_label->SetTextColor(2);
Expand Down
Loading