Commit 9ebae0e3 authored by Dominik Smith's avatar Dominik Smith
Browse files

Added more tasks to run_qa.C and unified the naming scheme of the output folders.

parent d0cecb59
......@@ -235,8 +235,8 @@ foreach(setup IN LISTS cbm_setup)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED "fixt_tra_${setup}_coll;fixt_digi_ts_${setup};fixt_reco_ts_${setup}_eb_real"
FIXTURES_SETUP fixt_${setup}_qa
FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}"
FIXTURES_SETUP fixt_qa_${setup}
RESOURCE_LOCK collParDb_${setup}
)
......
......@@ -166,8 +166,26 @@ void run_qa(TString dataTra = "data/sis100_muon_jpsi_test", TString dataRaw = "d
run->AddTask(new CbmMuchHitFinderQa());
}
// ----- TRD QA ---------------------------------
if (CbmSetup::Instance()->IsActive(ECbmModuleId::kTrd)) {
run->AddTask(new CbmTrdMCQa());
//run->AddTask(new CbmTrdHitRateQa()); //opens lots of windows
//run->AddTask(new CbmTrdDigitizerPRFQa()); //works put currently doesn't do anything
//run->AddTask(new CbmTrdHitRateFastQa()); //opens lots of windows
run->AddTask(new CbmTrdHitProducerQa()); //Histograms currently don't appear in output file
}
// ------------------------------------------------------------------------
// ----- STS QA ---------------------------------
if (CbmSetup::Instance()->IsActive(ECbmModuleId::kSts)) { run->AddTask(new CbmStsFindTracksQa()); }
if (CbmSetup::Instance()->IsActive(ECbmModuleId::kSts)) {
//run->AddTask(new CbmStsDigitizeQa()); //opens lots of windows
run->AddTask(new CbmStsFindTracksQa());
}
// ------------------------------------------------------------------------
// ----- Event builder QA ---------------------------------
CbmBuildEventsQa* evBuildQA = new CbmBuildEventsQa();
run->AddTask(evBuildQA);
// ------------------------------------------------------------------------
// ----- Parameter database --------------------------------------------
......
......@@ -146,7 +146,7 @@ private:
Double_t fQuota = 0.7; // True/all hits for track to be considered reconstructed
TFolder fOutFolder = {"CbmStsFindTracksQa", "CbmStsFindTracksQa"}; /// output folder with histos and canvases
TFolder fOutFolder = {"StsFindTracksQA", "StsFindTracksQA"}; /// output folder with histos and canvases
/** Histograms **/
......
......@@ -279,6 +279,9 @@ void CbmTrdHitProducerQa::PrepareHistograms()
void CbmTrdHitProducerQa::WriteHistograms()
{
gDirectory->mkdir("TrdHitProducerQA");
gDirectory->cd("TrdHitProducerQA");
if (fHitPoolsX) fHitPoolsX->Write();
if (fHitPoolsY) fHitPoolsY->Write();
......@@ -295,6 +298,8 @@ void CbmTrdHitProducerQa::WriteHistograms()
if (S3L4edEall) S3L4edEall->Write();
if (S3L4pidE15) S3L4pidE15->Write();
if (S3L4pidEall) S3L4pidEall->Write();
gDirectory->cd("..");
}
// --------------------------------------------------------------------------
......
......@@ -174,10 +174,10 @@ void CbmTrdMCQa::Finish()
fHM->Scale(Form("h_trd_PointsMapRate_Station%i", i), 10000000. * scale / nofEvents);
}
gDirectory->mkdir("QA/TrdMCQa");
gDirectory->cd("QA/TrdMCQa");
gDirectory->mkdir("TrdMcQA");
gDirectory->cd("TrdMcQA");
fHM->WriteToFile();
gDirectory->cd("../..");
gDirectory->cd("..");
// CbmSimulationReport* report = new CbmTrdMCQaReport(fSetup, fDigitizer);
// report -> Create(fHM, fOutputDir);
// delete report;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment