Skip to content

Switch from rapidjson to tao syntax #1150

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

Merged
aaust merged 6 commits into from
Jul 24, 2026
Merged

Switch from rapidjson to tao syntax #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ddeacb
restore default compilation for plugin needed for single track
aaust Jul 8, 2026
a7511fc
Use tao instead of rapidjson, requires rcdb v2.4.0
aaust Jul 15, 2026
6b1cffc
Merge branch 'master' into aaust_rcdb_tao
aaust Jul 22, 2026
651ca93
corrected oversight in PR #1151
aaust Jul 22, 2026
88c67fa
update plot directory
aaust Jul 23, 2026
8df5768
changed canvas size
aaust Jul 23, 2026
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: 1 addition & 1 deletion src/libraries/TRIGGER/DL1MCTrigger_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ int DL1MCTrigger_factory::Read_RCDB(const std::shared_ptr<const JEvent>& event,


auto json = rtvsCnd->ToJsonDocument(); // The CODA rtvs is serialized as JSon dictionary.
string fileName(json["%(config)"].GetString()); // We need item with name '%(config)'
string fileName(json.at("%(config)").get_string()); // We need item with name '%(config)'

auto file = connection.GetFile(runnumber, fileName);

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/TRIGGER/DL1MCTrigger_factory_CPP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ void DL1MCTrigger_factory_CPP::Read_RCDB(const shared_ptr<const JEvent>& event,
if(!rtvsCnd) throw JException("Read_RCDB: rtvs is not set");

auto json = rtvsCnd->ToJsonDocument();
string fileName = json["%(config)"].GetString();
string fileName(json.at("%(config)").get_string());
auto file = connection.GetFile(runnumber, fileName);
if(!file) throw JException("Read_RCDB: missed json file");

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/TRIGGER/DL1MCTrigger_factory_DATA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ auto runnumber = event->GetRunNumber();


auto json = rtvsCnd->ToJsonDocument(); // The CODA rtvs is serialized as JSon dictionary.
string fileName(json["%(config)"].GetString()); // We need item with name '%(config)'
string fileName(json.at("%(config)").get_string()); // We need item with name '%(config)'

auto file = connection.GetFile(runnumber, fileName);

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/Analysis/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Import('*')
# Default targets (always built)
subdirs = ['ReactionFilter', 'b1pi_hists', 'ReactionEfficiency']
subdirs.extend(['DAQTree', 'DAQTreeBCAL'])
subdirs.extend(['monitoring_hists'])
subdirs.extend(['monitoring_hists','trackeff_hists'])
subdirs.extend(['p2pi_hists','p3pi_hists','ppi0gamma_hists'])
subdirs.extend(['fcal_charged','TPOL_tree','mcthrown_tree'])
subdirs.extend(['imaging','dirc_hists','TRD_hists','compton'])
Expand All @@ -16,7 +16,7 @@ SConscript(dirs=subdirs, exports='env osname', duplicate=0)
# Optional targets
optdirs = ['pedestals','bcal_calib','bcal_calib_cosmic_cdc', 'CPPMVAtree']

optdirs.extend(['trackeff_hists', 'mcthrown_hists', 'cdc_hists', 'fcal_hists'])
optdirs.extend(['mcthrown_hists', 'cdc_hists', 'fcal_hists'])
optdirs.extend(['p4pi_hists','p2k_hists','p2gamma_hists','p2pi0_hists'])
optdirs.extend(['B3pi_eff_missgamma','B3pi_eff_misspip','B3pi_eff_misspim','B3pi_eff_missprot'])
subdirs.extend(['pid_dirc','truth_dirc', 'lut_dirc', 'dirc_reactions', 'dirc_tree'])
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/monitoring/FCAL2_invmass/fit_pi0.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// hnamepath: /FCAL2_invmass/h_2gamma_FCAL_FCAL
// hnamepath: /FCAL2_invmass/h_2gamma_BCAL_BCAL
{
TDirectory *dir = (TDirectory*)gDirectory->FindObjectAny("bcal_inv_mass");
TDirectory *dir = (TDirectory*)gDirectory->FindObjectAny("FCAL2_invmass");
if(dir) dir->cd();
else return;

TCanvas *c1=NULL;
if(gPad == NULL){
c1=new TCanvas("c1","Two photon mass distributions",1920,960);
c1=new TCanvas("c1","Two photon mass distributions",900,600);
c1->cd(0);
c1->Draw();
c1->Update();
Expand Down Expand Up @@ -72,7 +72,7 @@
pt2->AddText(Form("#sigma/M = %.3f %%",sigma/mean*100));
pt2->Draw();
}
TH1F *h3=(TH1F*)_file0->FindObjectAny("h_2gamma_BCAL_BCAL");
TH1F *h3=(TH1F*)gDirectory->FindObjectAny("h_2gamma_BCAL_BCAL");
if (h3){
c1->cd(3);
f1->SetParameter(1,0.135);
Expand Down