Skip to content
Snippets Groups Projects
Commit fab9afc1 authored by Viktor's avatar Viktor Committed by Florian Uhlig
Browse files

add end of line and rerun clang format

parent d834d43c
No related branches found
No related tags found
1 merge request!331Fix some bugs in AnalysisTree / converter / QA
Pipeline #9752 passed
...@@ -64,4 +64,4 @@ float CbmRecEventHeaderConverter::GetPsdEnergy() ...@@ -64,4 +64,4 @@ float CbmRecEventHeaderConverter::GetPsdEnergy()
psd_energy += hit->GetEdep(); psd_energy += hit->GetEdep();
} }
return psd_energy; return psd_energy;
} }
\ No newline at end of file
...@@ -33,8 +33,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu ...@@ -33,8 +33,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
// ----- Load the geometry setup ------------------------------------- // ----- Load the geometry setup -------------------------------------
std::cout << std::endl; std::cout << std::endl;
const TString setupFile = const TString setupFile = srcDir + "/geometry/setup/setup_" + setupName + ".C";
srcDir + "/geometry/setup/setup_" + setupName + ".C";
const TString setupFunct = "setup_" + setupName + "()"; const TString setupFunct = "setup_" + setupName + "()";
std::cout << "-I- " << myName << ": Loading macro " << setupFile << std::endl; std::cout << "-I- " << myName << ": Loading macro " << setupFile << std::endl;
...@@ -52,8 +51,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu ...@@ -52,8 +51,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
auto* parFileList = new TList(); auto* parFileList = new TList();
std::cout << "-I- " << myName << ": Using raw file " << rawFile << std::endl; std::cout << "-I- " << myName << ": Using raw file " << rawFile << std::endl;
std::cout << "-I- " << myName << ": Using parameter file " << parFile std::cout << "-I- " << myName << ": Using parameter file " << parFile << std::endl;
<< std::endl;
std::cout << "-I- " << myName << ": Using reco file " << recFile << std::endl; std::cout << "-I- " << myName << ": Using reco file " << recFile << std::endl;
if (unigenFile.Length() > 0) std::cout << "-I- " << myName << ": Using unigen file " << unigenFile << std::endl; if (unigenFile.Length() > 0) std::cout << "-I- " << myName << ": Using unigen file " << unigenFile << std::endl;
...@@ -84,14 +82,12 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu ...@@ -84,14 +82,12 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
auto* l1 = new CbmL1("CbmL1", 1, 3); auto* l1 = new CbmL1("CbmL1", 1, 3);
if (setup->IsActive(ECbmModuleId::kMvd)) { if (setup->IsActive(ECbmModuleId::kMvd)) {
setup->GetGeoTag(ECbmModuleId::kMvd, geoTag); setup->GetGeoTag(ECbmModuleId::kMvd, geoTag);
const TString mvdMatBudgetFileName = const TString mvdMatBudgetFileName = srcDir + "/parameters/mvd/mvd_matbudget_" + geoTag + ".root";
srcDir + "/parameters/mvd/mvd_matbudget_" + geoTag + ".root";
l1->SetMvdMaterialBudgetFileName(mvdMatBudgetFileName.Data()); l1->SetMvdMaterialBudgetFileName(mvdMatBudgetFileName.Data());
} }
if (setup->IsActive(ECbmModuleId::kSts)) { if (setup->IsActive(ECbmModuleId::kSts)) {
setup->GetGeoTag(ECbmModuleId::kSts, geoTag); setup->GetGeoTag(ECbmModuleId::kSts, geoTag);
const TString stsMatBudgetFileName = const TString stsMatBudgetFileName = srcDir + "/parameters/sts/sts_matbudget_" + geoTag + ".root";
srcDir + "/parameters/sts/sts_matbudget_" + geoTag + ".root";
l1->SetStsMaterialBudgetFileName(stsMatBudgetFileName.Data()); l1->SetStsMaterialBudgetFileName(stsMatBudgetFileName.Data());
} }
run->AddTask(l1); run->AddTask(l1);
...@@ -99,8 +95,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu ...@@ -99,8 +95,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
// --- TRD pid tasks // --- TRD pid tasks
if (setup->IsActive(ECbmModuleId::kTrd)) { if (setup->IsActive(ECbmModuleId::kTrd)) {
CbmTrdSetTracksPidLike* trdLI = CbmTrdSetTracksPidLike* trdLI = new CbmTrdSetTracksPidLike("TRDLikelihood", "TRDLikelihood");
new CbmTrdSetTracksPidLike("TRDLikelihood", "TRDLikelihood");
trdLI->SetUseMCInfo(kTRUE); trdLI->SetUseMCInfo(kTRUE);
trdLI->SetUseMomDependence(kTRUE); trdLI->SetUseMomDependence(kTRUE);
run->AddTask(trdLI); run->AddTask(trdLI);
...@@ -120,8 +115,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu ...@@ -120,8 +115,7 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
man->AddTask(new CbmRecEventHeaderConverter("RecEventHeader")); man->AddTask(new CbmRecEventHeaderConverter("RecEventHeader"));
man->AddTask(new CbmSimTracksConverter("SimParticles")); man->AddTask(new CbmSimTracksConverter("SimParticles"));
CbmStsTracksConverter* taskCbmStsTracksConverter = CbmStsTracksConverter* taskCbmStsTracksConverter = new CbmStsTracksConverter("VtxTracks", "SimParticles");
new CbmStsTracksConverter("VtxTracks", "SimParticles");
taskCbmStsTracksConverter->SetIsWriteKFInfo(); taskCbmStsTracksConverter->SetIsWriteKFInfo();
taskCbmStsTracksConverter->SetIsReproduceCbmKFPF(); taskCbmStsTracksConverter->SetIsReproduceCbmKFPF();
man->AddTask(taskCbmStsTracksConverter); man->AddTask(taskCbmStsTracksConverter);
......
...@@ -36,4 +36,4 @@ AnalysisTree::Cuts* GetCbmMcTracksCuts(const std::string& branch, std::string na ...@@ -36,4 +36,4 @@ AnalysisTree::Cuts* GetCbmMcTracksCuts(const std::string& branch, std::string na
{ {
auto* sim_tracks_cut = new AnalysisTree::Cuts(std::move(name), {AnalysisTree::EqualsCut(branch + ".mother_id", -1)}); auto* sim_tracks_cut = new AnalysisTree::Cuts(std::move(name), {AnalysisTree::EqualsCut(branch + ".mother_id", -1)});
return sim_tracks_cut; return sim_tracks_cut;
} }
\ No newline at end of file
...@@ -273,4 +273,4 @@ int main(int argc, char** argv) ...@@ -273,4 +273,4 @@ int main(int argc, char** argv)
const std::string filelist = argv[1]; const std::string filelist = argv[1];
run_analysistree_qa(filelist); run_analysistree_qa(filelist);
return 0; return 0;
} }
\ No newline at end of file
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