Skip to content
Snippets Groups Projects
Commit 67e0e899 authored by Sergei Zharko's avatar Sergei Zharko
Browse files

CbmMatchRecoToMC: removed assertion to the MVD MC point in the StsTrack matching procedure

parent bbaa61b4
No related branches found
No related tags found
1 merge request!1600CA: MVD qa is added to the macro
...@@ -773,8 +773,11 @@ void CbmMatchRecoToMC::MatchStsTracks(const TClonesArray* mvdHitMatches, const T ...@@ -773,8 +773,11 @@ void CbmMatchRecoToMC::MatchStsTracks(const TClonesArray* mvdHitMatches, const T
for (Int_t iLink = 0; iLink < nofLinks; iLink++) { for (Int_t iLink = 0; iLink < nofLinks; iLink++) {
const CbmLink& link = hitMatch->GetLink(iLink); const CbmLink& link = hitMatch->GetLink(iLink);
const FairMCPoint* point = static_cast<const FairMCPoint*>(mvdPoints->Get(link)); const FairMCPoint* point = static_cast<const FairMCPoint*>(mvdPoints->Get(link));
assert(point); if (point) {
trackMatch->AddLink(CbmLink(1., point->GetTrackID(), link.GetEntry(), link.GetFile())); // NOTE: 24.01.2024 SZh: the assertion was replaced with nullptr check, because there are links,
// which are not assigned to any MC point. Can it be a bug?
trackMatch->AddLink(CbmLink(1., point->GetTrackID(), link.GetEntry(), link.GetFile()));
}
} }
} }
......
...@@ -80,14 +80,14 @@ foreach(setup IN LISTS cbm_setup) ...@@ -80,14 +80,14 @@ foreach(setup IN LISTS cbm_setup)
# --- Test run_qa # --- Test run_qa
# --- Run QA tasks with Event-by-event reconstruction from time-based simulation # --- Run QA tasks with Event-by-event reconstruction from time-based simulation
# --- Real raw event builder # --- Real raw event builder
set(testname qa_${sname}_compare) set(testname qa_${sname}_ts_eb_ideal_compare)
add_test(${testname} ${MACRODIR}/qa_compare.sh \"configs/objects.yaml\" \"${sname}\" \"../run/data\" \"../run/data/\" \"data/QACheckerOutput.${sname}.root\" ) add_test(${testname} ${MACRODIR}/qa_compare.sh \"configs/objects.yaml\" \"${sname}\" \"../run/data\" \"../run/data/\" \"data/QACheckerOutput.${sname}.root\" )
set_tests_properties(${testname} PROPERTIES set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime} TIMEOUT ${timeOutTime}
FAIL_REGULAR_EXPRESSION "segmentation violation" FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "Macro finished successfully" PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED "fixt_qa_${setup}" FIXTURES_REQUIRED "fixt_qa_ts_eb_ideal_${setup}"
FIXTURES_SETUP fixt_qa_compare_${setup} FIXTURES_SETUP fixt_qa_ts_eb_ideal_compare_${setup}
) )
endforeach(setup IN LISTS cbm_setup) endforeach(setup IN LISTS cbm_setup)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
checker: checker:
files: files:
- name: "%v/%d_qa.qa.root" - name: "%v/%d_qa_ts_eb_ideal.qa.root"
label: qa label: qa
objects: objects:
- CbmCaInputQaSts/efficiencies/casts_reco_eff_vs_r_st0 - CbmCaInputQaSts/efficiencies/casts_reco_eff_vs_r_st0
......
...@@ -309,7 +309,7 @@ foreach(setup IN LISTS cbm_setup) ...@@ -309,7 +309,7 @@ foreach(setup IN LISTS cbm_setup)
FAIL_REGULAR_EXPRESSION "segmentation violation" FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "QA checks passed;Macro finished successfully" PASS_REGULAR_EXPRESSION "QA checks passed;Macro finished successfully"
FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_ideal_${setup}" FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_ideal_${setup}"
FIXTURES_SETUP fixt_qa_${setup} FIXTURES_SETUP fixt_qa_ts_eb_ideal_${setup}
RESOURCE_LOCK collParDb_${setup} RESOURCE_LOCK collParDb_${setup}
) )
...@@ -327,7 +327,7 @@ foreach(setup IN LISTS cbm_setup) ...@@ -327,7 +327,7 @@ foreach(setup IN LISTS cbm_setup)
FAIL_REGULAR_EXPRESSION "segmentation violation" FAIL_REGULAR_EXPRESSION "segmentation violation"
PASS_REGULAR_EXPRESSION "QA checks passed;Macro finished successfully" PASS_REGULAR_EXPRESSION "QA checks passed;Macro finished successfully"
FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}" FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_digi_ts_${setup};fixt_reco_ts_eb_real_${setup}"
FIXTURES_SETUP fixt_qa_${setup} FIXTURES_SETUP fixt_qa_ts_eb_real_${setup}
RESOURCE_LOCK collParDb_${setup} RESOURCE_LOCK collParDb_${setup}
) )
......
...@@ -307,8 +307,8 @@ void run_qa(TString dataTraColl, ...@@ -307,8 +307,8 @@ void run_qa(TString dataTraColl,
pCaOutputQa->SetProcessFullTs(!bEventBasedReco); pCaOutputQa->SetProcessFullTs(!bEventBasedReco);
pCaOutputQa->SetStsTrackingMode(); pCaOutputQa->SetStsTrackingMode();
pCaOutputQa->ReadParameters(caParFile.Data()); pCaOutputQa->ReadParameters(caParFile.Data());
if (configName.Length() != 0) { if (config.Length() != 0) {
pCaOutputQa->SetConfigName(configName); pCaOutputQa->SetConfigName(config);
} }
// TODO: Provide detector selection interface from the L1Parameters // TODO: Provide detector selection interface from the L1Parameters
pCaOutputQa->SetUseMvd(!(sEvBuildRaw.EqualTo("Real", TString::ECaseCompare::kIgnoreCase)) ? bUseMvd : false); pCaOutputQa->SetUseMvd(!(sEvBuildRaw.EqualTo("Real", TString::ECaseCompare::kIgnoreCase)) ? bUseMvd : false);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment