From 57a858d842508061cf9b918daaeb0f3504104e1c Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Wed, 12 Mar 2025 14:51:14 +0100 Subject: [PATCH 1/6] =?UTF-8?q?Remove=20=C3=BC=20by=20ue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- algo/ca/core/pars/CaDefs.h | 2 +- .../dielectron/papaframework/scripts/Config_dilepton_testing.C | 2 +- analysis/PWGDIL/dielectron/papaframework/scripts/ana.sh | 2 +- .../analysis/common/analysis_tree_converter/batch/batch_run.sh | 2 +- macro/analysis/common/analysis_tree_converter/batch/run.sh | 2 +- macro/analysis/flow/MergeTTree_part1.sh | 2 +- macro/analysis/flow/MergeTTree_part2.sh | 2 +- macro/analysis/flow/batch_flow.sh | 2 +- macro/analysis/flow/fullsimAna_batch_part1.sh | 2 +- macro/analysis/flow/fullsimAna_batch_part2.sh | 2 +- macro/analysis/flow/fullsimAna_batch_part3.sh | 2 +- macro/analysis/papa/Config_dilepton_testing.C | 2 +- macro/analysis/papa/analysis.sh | 2 +- macro/analysis/papa/submit_analysis.sh | 2 +- macro/fles/readTsa1.C | 2 +- macro/fles/readTsaFexOffline.C | 2 +- macro/fles/readTsaQA_buch.C | 2 +- macro/fles/readTsaTime.C | 2 +- macro/fles/readTsaTimeOffline.C | 2 +- macro/fles/readTsa_PulseMonitor.C | 2 +- macro/fles/readTsamk.C | 2 +- macro/mvd/matbudget_ana.C | 2 +- macro/mvd/matbudget_mc.C | 2 +- macro/trd/beamtime/hv/makehotpics.sh | 2 +- reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/algo/ca/core/pars/CaDefs.h b/algo/ca/core/pars/CaDefs.h index 8b4a2280d5..4c1f83e6b9 100644 --- a/algo/ca/core/pars/CaDefs.h +++ b/algo/ca/core/pars/CaDefs.h @@ -36,7 +36,7 @@ namespace cbm::algo::ca::constants constexpr int MaxNFieldApproxCoefficients{(MaxFieldApproxPolynomialOrder + 1) * (MaxFieldApproxPolynomialOrder + 2) / 2}; - /// Amount of bits to code a station or triplet. This values determine the maximum number of stations and tripülets + /// Amount of bits to code a station or triplet. This values determine the maximum number of stations and triplets constexpr unsigned int StationBits = 6u; ///< Amount of bits to code one station constexpr unsigned int TripletBits = 32u - StationBits; ///< Amount of bits to code one triplet diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C b/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C index 00b1823920..7b9224bb61 100644 --- a/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C +++ b/analysis/PWGDIL/dielectron/papaframework/scripts/Config_dilepton_testing.C @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +/* Copyright (C) 2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Julian Book, Etienne Bechtel [committer] */ diff --git a/analysis/PWGDIL/dielectron/papaframework/scripts/ana.sh b/analysis/PWGDIL/dielectron/papaframework/scripts/ana.sh index 3db858786e..a93c0a4805 100755 --- a/analysis/PWGDIL/dielectron/papaframework/scripts/ana.sh +++ b/analysis/PWGDIL/dielectron/papaframework/scripts/ana.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2021 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2021 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Etienne Bechtel diff --git a/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh b/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh index e8308059b5..ed76923fe6 100755 --- a/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh +++ b/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen +# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tübingen # SPDX-License-Identifier: GPL-3.0-only # First commited by Viktor Klochkov diff --git a/macro/analysis/common/analysis_tree_converter/batch/run.sh b/macro/analysis/common/analysis_tree_converter/batch/run.sh index 4ac5cde7fd..ff495cb018 100755 --- a/macro/analysis/common/analysis_tree_converter/batch/run.sh +++ b/macro/analysis/common/analysis_tree_converter/batch/run.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tübingen, Tübingen +# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tübingen # SPDX-License-Identifier: GPL-3.0-only # First commited by Viktor Klochkov diff --git a/macro/analysis/flow/MergeTTree_part1.sh b/macro/analysis/flow/MergeTTree_part1.sh index 6ff16886d8..32c54086d8 100755 --- a/macro/analysis/flow/MergeTTree_part1.sh +++ b/macro/analysis/flow/MergeTTree_part1.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Selim Seddiki diff --git a/macro/analysis/flow/MergeTTree_part2.sh b/macro/analysis/flow/MergeTTree_part2.sh index e5c1bd5ed3..da104c9cd6 100755 --- a/macro/analysis/flow/MergeTTree_part2.sh +++ b/macro/analysis/flow/MergeTTree_part2.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Selim Seddiki diff --git a/macro/analysis/flow/batch_flow.sh b/macro/analysis/flow/batch_flow.sh index 5e675ba8ea..5cb7851e66 100644 --- a/macro/analysis/flow/batch_flow.sh +++ b/macro/analysis/flow/batch_flow.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Selim Seddiki diff --git a/macro/analysis/flow/fullsimAna_batch_part1.sh b/macro/analysis/flow/fullsimAna_batch_part1.sh index 99eee302da..126edbbd47 100755 --- a/macro/analysis/flow/fullsimAna_batch_part1.sh +++ b/macro/analysis/flow/fullsimAna_batch_part1.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Selim Seddiki diff --git a/macro/analysis/flow/fullsimAna_batch_part2.sh b/macro/analysis/flow/fullsimAna_batch_part2.sh index 6973b1f57d..56de5a63f6 100755 --- a/macro/analysis/flow/fullsimAna_batch_part2.sh +++ b/macro/analysis/flow/fullsimAna_batch_part2.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Selim Seddiki diff --git a/macro/analysis/flow/fullsimAna_batch_part3.sh b/macro/analysis/flow/fullsimAna_batch_part3.sh index 3a2723f2c6..87bc2e58cd 100755 --- a/macro/analysis/flow/fullsimAna_batch_part3.sh +++ b/macro/analysis/flow/fullsimAna_batch_part3.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2014 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2014 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Selim Seddiki diff --git a/macro/analysis/papa/Config_dilepton_testing.C b/macro/analysis/papa/Config_dilepton_testing.C index cdc8e5aabc..9d4619828d 100644 --- a/macro/analysis/papa/Config_dilepton_testing.C +++ b/macro/analysis/papa/Config_dilepton_testing.C @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +/* Copyright (C) 2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Julian Book, Etienne Bechtel [committer] */ diff --git a/macro/analysis/papa/analysis.sh b/macro/analysis/papa/analysis.sh index 78b775d042..19be47f181 100755 --- a/macro/analysis/papa/analysis.sh +++ b/macro/analysis/papa/analysis.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Etienne Bechtel diff --git a/macro/analysis/papa/submit_analysis.sh b/macro/analysis/papa/submit_analysis.sh index d6f1e3ff8a..0e3318249b 100755 --- a/macro/analysis/papa/submit_analysis.sh +++ b/macro/analysis/papa/submit_analysis.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2019 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +# Copyright (C) 2019 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt # SPDX-License-Identifier: GPL-3.0-only # First commited by Etienne Bechtel diff --git a/macro/fles/readTsa1.C b/macro/fles/readTsa1.C index 7c83450d7c..c71a15aeae 100644 --- a/macro/fles/readTsa1.C +++ b/macro/fles/readTsa1.C @@ -67,7 +67,7 @@ void readTsa1(TString inFile = //source->AddUnpacker(nxyter_unpacker, 0x10);//fhodo or cherenkov or pb glass??? source->AddUnpacker(nxyter_unpacker, 0xE1); //HODO 1 + 2 source->AddUnpacker(spadic_unpacker, 0x40); // test beam 2014 - //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab münster + //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab muenster // --- Event header // FairEventHeader* event = new CbmTbEvent(); // event->SetRunId(260); diff --git a/macro/fles/readTsaFexOffline.C b/macro/fles/readTsaFexOffline.C index 0be955707d..eeaf1aa6f2 100644 --- a/macro/fles/readTsaFexOffline.C +++ b/macro/fles/readTsaFexOffline.C @@ -57,7 +57,7 @@ void readTsaFexOffline(TString inFile = //source->AddUnpacker(nxyter_unpacker, 0x10);//fhodo or cherenkov or pb glass??? source->AddUnpacker(nxyter_unpacker, 0xE1); //HODO 1 + 2 source->AddUnpacker(spadic_unpacker, 0x40); // test beam 2014 - //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab münster + //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab muenster // --- Event header // FairEventHeader* event = new CbmTbEvent(); diff --git a/macro/fles/readTsaQA_buch.C b/macro/fles/readTsaQA_buch.C index 5679fb0b75..efd3e6b021 100644 --- a/macro/fles/readTsaQA_buch.C +++ b/macro/fles/readTsaQA_buch.C @@ -46,7 +46,7 @@ void readTsaQA_buch(TString inFile = "/opt/cbm/testdata/237_spa11_2016.tsa") CbmFlibFileSourceNew* source = new CbmFlibFileSourceNew(); //source->SetHostName("cbmflib01"); source->SetFileName(inFile); - source->AddUnpacker(spadic_unpacker, 0x40); // Lab münster + source->AddUnpacker(spadic_unpacker, 0x40); // Lab muenster // --- Event header // FairEventHeader* event = new CbmTbEvent(); // event->SetRunId(260); diff --git a/macro/fles/readTsaTime.C b/macro/fles/readTsaTime.C index d3b68c9871..e975c98aa6 100644 --- a/macro/fles/readTsaTime.C +++ b/macro/fles/readTsaTime.C @@ -67,7 +67,7 @@ void readTsaTime(TString inFile = //source->AddUnpacker(nxyter_unpacker, 0x10);//fhodo or cherenkov or pb glass??? source->AddUnpacker(nxyter_unpacker, 0xE1); //HODO 1 + 2 source->AddUnpacker(spadic_unpacker, 0x40); // test beam 2014 - //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab münster + //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab muenster // --- Event header // FairEventHeader* event = new CbmTbEvent(); // event->SetRunId(260); diff --git a/macro/fles/readTsaTimeOffline.C b/macro/fles/readTsaTimeOffline.C index d60b00dce5..f374200376 100644 --- a/macro/fles/readTsaTimeOffline.C +++ b/macro/fles/readTsaTimeOffline.C @@ -57,7 +57,7 @@ void readTsaTimeOffline(TString inFile = //source->AddUnpacker(nxyter_unpacker, 0x10);//fhodo or cherenkov or pb glass??? source->AddUnpacker(nxyter_unpacker, 0xE1); //HODO 1 + 2 source->AddUnpacker(spadic_unpacker, 0x40); // test beam 2014 - //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab münster + //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab muenster // --- Event header // FairEventHeader* event = new CbmTbEvent(); // event->SetRunId(260); diff --git a/macro/fles/readTsa_PulseMonitor.C b/macro/fles/readTsa_PulseMonitor.C index eb61473d5c..8b9b30e800 100644 --- a/macro/fles/readTsa_PulseMonitor.C +++ b/macro/fles/readTsa_PulseMonitor.C @@ -61,7 +61,7 @@ void readTsa_PulseMonitor(TString inFile = //source->AddFile(inFile1); //source->AddUnpacker(nxyter_unpacker, 0x10);//fhodo or cherenkov or pb glass??? //source->AddUnpacker(spadic_unpacker, 0x40);// test beam 2014 - source->AddUnpacker(spadic_unpacker, 0xE0); // Lab münster + source->AddUnpacker(spadic_unpacker, 0xE0); // Lab muenster // --- Event header // FairEventHeader* event = new CbmTbEvent(); // event->SetRunId(260); diff --git a/macro/fles/readTsamk.C b/macro/fles/readTsamk.C index e00986448f..00a99248dc 100644 --- a/macro/fles/readTsamk.C +++ b/macro/fles/readTsamk.C @@ -79,7 +79,7 @@ void readTsamk(TString inFile 0x10); //fhodo or cherenkov or pb glass??? //source->AddUnpacker(nxyter_unpacker, 0xE1);//HODO 1 + 2 source->AddUnpacker(spadic_unpacker, 0xE0); // test beam 2014 was 0x40 - //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab münster + //source->AddUnpacker(spadic_unpacker, 0xE0); // Lab muenster // --- Event header // FairEventHeader* event = new CbmTbEvent(); // event->SetRunId(260); diff --git a/macro/mvd/matbudget_ana.C b/macro/mvd/matbudget_ana.C index 7ac6249fbc..c50c8658c9 100644 --- a/macro/mvd/matbudget_ana.C +++ b/macro/mvd/matbudget_ana.C @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +/* Copyright (C) 2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Philipp Klaus [committer] */ diff --git a/macro/mvd/matbudget_mc.C b/macro/mvd/matbudget_mc.C index fdaefbf22b..892e8440d0 100644 --- a/macro/mvd/matbudget_mc.C +++ b/macro/mvd/matbudget_mc.C @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2020 Institut für Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt +/* Copyright (C) 2015-2020 Institut fuer Kernphysik, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: T. Balog, Philipp Klaus [committer] */ diff --git a/macro/trd/beamtime/hv/makehotpics.sh b/macro/trd/beamtime/hv/makehotpics.sh index a29ad1bac5..3e9aab438b 100755 --- a/macro/trd/beamtime/hv/makehotpics.sh +++ b/macro/trd/beamtime/hv/makehotpics.sh @@ -11,7 +11,7 @@ OUTFILE=allpics.tex ls -1 *.png > allnames.config NROFFILES=$(awk 'END{print NR}' allnames.config) -# Wir sind ein rücksichtsloses Skript. +# Wir sind ein ruecksichtsloses Skript. rm -f $OUTFILE # HIER NOCH EIN PAAR LATEX-HEADER SCHREIBEN diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx index 997e113bf2..68d07c3ef7 100644 --- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx +++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx @@ -212,7 +212,7 @@ void CbmMvdSensorDigiToHitTask::Exec() dth_clusterArray.clear(); dth_clusterArray.emplace_back(curr_coord); - //Calculating Median für the first Element + //Calculating Median for the first Element lab[0] = 0; lab[1] = 0; lab[2] = 0; -- GitLab From 2cea2559306a67cf80df405ce3a1f7afda070bda Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Wed, 12 Mar 2025 15:00:21 +0100 Subject: [PATCH 2/6] =?UTF-8?q?Remove=20=C3=BC=20by=20ue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/common/analysis_tree_converter/batch/batch_run.sh | 2 +- macro/analysis/common/analysis_tree_converter/batch/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh b/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh index ed76923fe6..da0eef1a0d 100755 --- a/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh +++ b/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tübingen +# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen # SPDX-License-Identifier: GPL-3.0-only # First commited by Viktor Klochkov diff --git a/macro/analysis/common/analysis_tree_converter/batch/run.sh b/macro/analysis/common/analysis_tree_converter/batch/run.sh index ff495cb018..c7655f9c29 100755 --- a/macro/analysis/common/analysis_tree_converter/batch/run.sh +++ b/macro/analysis/common/analysis_tree_converter/batch/run.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tübingen +# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen # SPDX-License-Identifier: GPL-3.0-only # First commited by Viktor Klochkov -- GitLab From 940f099ec1e80c3e6bf97ec3c4e3d8df07b9bd0c Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Wed, 12 Mar 2025 15:02:27 +0100 Subject: [PATCH 3/6] =?UTF-8?q?Exchange=20=C3=A4=20by=20ae?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- algo/ca/core/data/CaGridArea.h | 2 +- algo/ca/core/data/CaGridEntry.h | 2 +- algo/ca/core/tracking/CaFramework.cxx | 2 +- algo/ca/core/tracking/CaTrackExtender.cxx | 2 +- algo/ca/core/tracking/CaTripletConstructor.cxx | 2 +- algo/ca/core/utils/CaDefines.h | 2 +- algo/ca/core/utils/CaSimd.h | 2 +- algo/kf/core/utils/KfSimdPseudo.h | 2 +- algo/kf/core/utils/KfSimdVc.h | 2 +- analysis/common/analysis_tree_converter/CbmConverterTask.h | 2 +- .../common/analysis_tree_converter/CbmFsdModulesConverter.cxx | 2 +- analysis/common/analysis_tree_converter/CbmMatchEvents.cxx | 2 +- analysis/common/analysis_tree_converter/CbmMatchEvents.h | 2 +- .../common/analysis_tree_converter/CbmPsdModulesConverter.cxx | 2 +- .../common/analysis_tree_converter/CbmStsTracksConverter.h | 2 +- .../common/analysis_tree_converter/batch/batch_run.sh | 2 +- macro/analysis/common/analysis_tree_converter/batch/run.sh | 2 +- macro/fles/readTsaTime.C | 2 +- macro/trd/beamtime/hv/analyzeHV.C | 2 +- macro/trd/beamtime/hv/autoplot.sh | 2 +- macro/trd/beamtime/hv/makehotpics.sh | 4 ++-- macro/trd/beamtime/hv/monHV.C | 2 +- macro/trd/beamtime/hv/monHVlong.C | 2 +- reco/L1/CbmL1Constants.h | 2 +- reco/L1/CbmL1Counters.h | 2 +- reco/L1/CbmL1Hit.h | 2 +- reco/L1/L1Algo/utils/L1CADebug.h | 2 +- reco/L1/utils/Draw_L1_histo.C | 2 +- reco/detectors/mvd/CbmMvdDigiToHit.cxx | 2 +- reco/detectors/mvd/CbmMvdDigiToHitTB.cxx | 2 +- .../detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx | 2 +- reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h | 2 +- reco/detectors/sts/CbmStsAlgoAnaCluster.h | 2 +- reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx | 2 +- reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h | 2 +- sim/detectors/sts/qa/CbmStsDigitizeQa.cxx | 2 +- sim/detectors/sts/qa/CbmStsDigitizeQa.h | 2 +- sim/detectors/sts/qa/CbmStsDigitizeQaReport.cxx | 2 +- sim/detectors/sts/qa/CbmStsDigitizeQaReport.h | 2 +- 39 files changed, 40 insertions(+), 40 deletions(-) diff --git a/algo/ca/core/data/CaGridArea.h b/algo/ca/core/data/CaGridArea.h index 6b268192e1..c2f2b69f7e 100644 --- a/algo/ca/core/data/CaGridArea.h +++ b/algo/ca/core/data/CaGridArea.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2012-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Maksym Zyzak, Igor Kulakov [committer] */ diff --git a/algo/ca/core/data/CaGridEntry.h b/algo/ca/core/data/CaGridEntry.h index 5d4207b7a5..5083e014ce 100644 --- a/algo/ca/core/data/CaGridEntry.h +++ b/algo/ca/core/data/CaGridEntry.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Valentina Akishina, Igor Kulakov [committer], Maksym Zyzak */ diff --git a/algo/ca/core/tracking/CaFramework.cxx b/algo/ca/core/tracking/CaFramework.cxx index 7d06bc85d4..7d6fa9b1f8 100644 --- a/algo/ca/core/tracking/CaFramework.cxx +++ b/algo/ca/core/tracking/CaFramework.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer], Maksym Zyzak, Valentina Akishina, Ivan Kisel, Sergey Gorbunov, Sergei Zharko, Dominik Smith */ diff --git a/algo/ca/core/tracking/CaTrackExtender.cxx b/algo/ca/core/tracking/CaTrackExtender.cxx index e05c6d3296..3016a3eefe 100644 --- a/algo/ca/core/tracking/CaTrackExtender.cxx +++ b/algo/ca/core/tracking/CaTrackExtender.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer], Maksym Zyzak, Valentina Akishina */ diff --git a/algo/ca/core/tracking/CaTripletConstructor.cxx b/algo/ca/core/tracking/CaTripletConstructor.cxx index 1bb1298808..c8c3e6560a 100644 --- a/algo/ca/core/tracking/CaTripletConstructor.cxx +++ b/algo/ca/core/tracking/CaTripletConstructor.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer], Maksym Zyzak, Valentina Akishina */ diff --git a/algo/ca/core/utils/CaDefines.h b/algo/ca/core/utils/CaDefines.h index 791a8ef786..2e4ef4e1fb 100644 --- a/algo/ca/core/utils/CaDefines.h +++ b/algo/ca/core/utils/CaDefines.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2021 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Maksym Zyzak, Igor Kulakov [committer], Sergey Gorbunov */ diff --git a/algo/ca/core/utils/CaSimd.h b/algo/ca/core/utils/CaSimd.h index 60a77a3231..3ff514a46e 100644 --- a/algo/ca/core/utils/CaSimd.h +++ b/algo/ca/core/utils/CaSimd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2014 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2014 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Sergey Gorbunov [committer]*/ diff --git a/algo/kf/core/utils/KfSimdPseudo.h b/algo/kf/core/utils/KfSimdPseudo.h index 9edf285e77..6ffe9dc23d 100644 --- a/algo/kf/core/utils/KfSimdPseudo.h +++ b/algo/kf/core/utils/KfSimdPseudo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2024 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2024 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer] */ diff --git a/algo/kf/core/utils/KfSimdVc.h b/algo/kf/core/utils/KfSimdVc.h index 65a664c933..f8145a3d82 100644 --- a/algo/kf/core/utils/KfSimdVc.h +++ b/algo/kf/core/utils/KfSimdVc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2024 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2024 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer], Maksym Zyzak, Sergei Zharko */ diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.h b/analysis/common/analysis_tree_converter/CbmConverterTask.h index 694d7e3c03..21aba852c6 100644 --- a/analysis/common/analysis_tree_converter/CbmConverterTask.h +++ b/analysis/common/analysis_tree_converter/CbmConverterTask.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen SPDX-License-Identifier: GPL-3.0-only Authors: Viktor Klochkov [committer] */ diff --git a/analysis/common/analysis_tree_converter/CbmFsdModulesConverter.cxx b/analysis/common/analysis_tree_converter/CbmFsdModulesConverter.cxx index c9cf20a759..3749c3d062 100644 --- a/analysis/common/analysis_tree_converter/CbmFsdModulesConverter.cxx +++ b/analysis/common/analysis_tree_converter/CbmFsdModulesConverter.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen SPDX-License-Identifier: GPL-3.0-only Authors: Viktor Klochkov [committer] */ diff --git a/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx b/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx index f690e3ca4a..8e9ab49189 100644 --- a/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx +++ b/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen SPDX-License-Identifier: GPL-3.0-only Authors: Viktor Klochkov [committer] */ diff --git a/analysis/common/analysis_tree_converter/CbmMatchEvents.h b/analysis/common/analysis_tree_converter/CbmMatchEvents.h index 91445eeb63..10643619f9 100644 --- a/analysis/common/analysis_tree_converter/CbmMatchEvents.h +++ b/analysis/common/analysis_tree_converter/CbmMatchEvents.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen SPDX-License-Identifier: GPL-3.0-only Authors: Viktor Klochkov [committer] */ diff --git a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx index de8fd147f0..79d0974f86 100644 --- a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx +++ b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen SPDX-License-Identifier: GPL-3.0-only Authors: Viktor Klochkov [committer] */ diff --git a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h index 3726ab95dd..d6de1ccebf 100644 --- a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h +++ b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +/* Copyright (C) 2020-2021 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen SPDX-License-Identifier: GPL-3.0-only Authors: Viktor Klochkov [committer] */ diff --git a/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh b/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh index da0eef1a0d..b6836b6f0c 100755 --- a/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh +++ b/macro/analysis/common/analysis_tree_converter/batch/batch_run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen # SPDX-License-Identifier: GPL-3.0-only # First commited by Viktor Klochkov diff --git a/macro/analysis/common/analysis_tree_converter/batch/run.sh b/macro/analysis/common/analysis_tree_converter/batch/run.sh index c7655f9c29..5c44cb6c44 100755 --- a/macro/analysis/common/analysis_tree_converter/batch/run.sh +++ b/macro/analysis/common/analysis_tree_converter/batch/run.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universität Tuebingen, Tuebingen +# Copyright (C) 2020 Physikalisches Institut, Eberhard Karls Universitaet Tuebingen, Tuebingen # SPDX-License-Identifier: GPL-3.0-only # First commited by Viktor Klochkov diff --git a/macro/fles/readTsaTime.C b/macro/fles/readTsaTime.C index e975c98aa6..d49e0e8c03 100644 --- a/macro/fles/readTsaTime.C +++ b/macro/fles/readTsaTime.C @@ -1,6 +1,6 @@ /* Copyright (C) 2014-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster SPDX-License-Identifier: GPL-3.0-only - Authors: Florian Uhlig, Philipp Kähler [committer] */ + Authors: Florian Uhlig, Philipp Kaehler [committer] */ /** @file readTsa.C ** @author Florian Uhlig <f.uhlig@gsi.de> diff --git a/macro/trd/beamtime/hv/analyzeHV.C b/macro/trd/beamtime/hv/analyzeHV.C index 2ab65e7407..199ac86efa 100644 --- a/macro/trd/beamtime/hv/analyzeHV.C +++ b/macro/trd/beamtime/hv/analyzeHV.C @@ -1,6 +1,6 @@ /* Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster SPDX-License-Identifier: GPL-3.0-only - Authors: Philipp Kähler [committer] */ + Authors: Philipp Kaehler [committer] */ #include "TCanvas.h" #include "TDatime.h" diff --git a/macro/trd/beamtime/hv/autoplot.sh b/macro/trd/beamtime/hv/autoplot.sh index bea9c0b7f1..6ade17a66c 100755 --- a/macro/trd/beamtime/hv/autoplot.sh +++ b/macro/trd/beamtime/hv/autoplot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster # SPDX-License-Identifier: GPL-3.0-only -# First commited by Philipp Kähler +# First commited by Philipp Kaehler FILE=1 diff --git a/macro/trd/beamtime/hv/makehotpics.sh b/macro/trd/beamtime/hv/makehotpics.sh index 3e9aab438b..af0146bb35 100755 --- a/macro/trd/beamtime/hv/makehotpics.sh +++ b/macro/trd/beamtime/hv/makehotpics.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster # SPDX-License-Identifier: GPL-3.0-only -# First commited by Philipp Kähler +# First commited by Philipp Kaehler # Bitte, wohin geht die Lieferung? @@ -47,7 +47,7 @@ do echo "\clearpage" >> $OUTFILE fi - # Sehen Sie in unserer nächsten Folge: + # Sehen Sie in unserer naechsten Folge: let FILE=$FILE+1 done diff --git a/macro/trd/beamtime/hv/monHV.C b/macro/trd/beamtime/hv/monHV.C index 208b03fefb..d43acf3a31 100644 --- a/macro/trd/beamtime/hv/monHV.C +++ b/macro/trd/beamtime/hv/monHV.C @@ -1,6 +1,6 @@ /* Copyright (C) 2015-2016 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster SPDX-License-Identifier: GPL-3.0-only - Authors: Philipp Kähler [committer] */ + Authors: Philipp Kaehler [committer] */ #include "TCanvas.h" #include "TDatime.h" diff --git a/macro/trd/beamtime/hv/monHVlong.C b/macro/trd/beamtime/hv/monHVlong.C index ef2f790c77..e32d205a7b 100644 --- a/macro/trd/beamtime/hv/monHVlong.C +++ b/macro/trd/beamtime/hv/monHVlong.C @@ -1,6 +1,6 @@ /* Copyright (C) 2015 Institut fuer Kernphysik, Westfaelische Wilhelms-Universitaet Muenster, Muenster SPDX-License-Identifier: GPL-3.0-only - Authors: Philipp Kähler [committer] */ + Authors: Philipp Kaehler [committer] */ #include "TCanvas.h" #include "TDatime.h" diff --git a/reco/L1/CbmL1Constants.h b/reco/L1/CbmL1Constants.h index da461cc131..4279ea44ce 100644 --- a/reco/L1/CbmL1Constants.h +++ b/reco/L1/CbmL1Constants.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2012 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer] */ diff --git a/reco/L1/CbmL1Counters.h b/reco/L1/CbmL1Counters.h index d97869938f..e5e9f19842 100644 --- a/reco/L1/CbmL1Counters.h +++ b/reco/L1/CbmL1Counters.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2017 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer], Maksym Zyzak */ diff --git a/reco/L1/CbmL1Hit.h b/reco/L1/CbmL1Hit.h index d963af1eee..488dfca6fb 100644 --- a/reco/L1/CbmL1Hit.h +++ b/reco/L1/CbmL1Hit.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2023 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2023 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer], Valentina Akishina, Maksym Zyzak, Sergei Zharko */ diff --git a/reco/L1/L1Algo/utils/L1CADebug.h b/reco/L1/L1Algo/utils/L1CADebug.h index 5769a43cd6..bcb877aa7a 100644 --- a/reco/L1/L1Algo/utils/L1CADebug.h +++ b/reco/L1/L1Algo/utils/L1CADebug.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer] */ diff --git a/reco/L1/utils/Draw_L1_histo.C b/reco/L1/utils/Draw_L1_histo.C index 9cc6e2a8e7..d1adbce46b 100644 --- a/reco/L1/utils/Draw_L1_histo.C +++ b/reco/L1/utils/Draw_L1_histo.C @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2013 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2010-2013 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Igor Kulakov [committer] */ diff --git a/reco/detectors/mvd/CbmMvdDigiToHit.cxx b/reco/detectors/mvd/CbmMvdDigiToHit.cxx index b0a66b341f..65251f0425 100644 --- a/reco/detectors/mvd/CbmMvdDigiToHit.cxx +++ b/reco/detectors/mvd/CbmMvdDigiToHit.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Andreas Redelbach [committer] */ diff --git a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx index f737ec515a..00cc6602b6 100644 --- a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx +++ b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Andreas Redelbach [committer] */ diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx index 68d07c3ef7..194fafc58c 100644 --- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx +++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2019-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Andreas Redelbach [committer] */ diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h index 1c8ce2fda1..3765af76e2 100644 --- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h +++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2019 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Andreas Redelbach [committer] */ diff --git a/reco/detectors/sts/CbmStsAlgoAnaCluster.h b/reco/detectors/sts/CbmStsAlgoAnaCluster.h index e13acf22d1..c9efe4334a 100644 --- a/reco/detectors/sts/CbmStsAlgoAnaCluster.h +++ b/reco/detectors/sts/CbmStsAlgoAnaCluster.h @@ -31,7 +31,7 @@ class CbmStsPhysics; ** ** The mathematics is described in: ** H. Malygina, Hit Reconstruction for the Silicon Tracking System - ** of the CBM experiment, PhD thesis, Goethe-Universität Frankfurt, 2018 + ** of the CBM experiment, PhD thesis, Goethe-Universitaet Frankfurt, 2018 **/ class CbmStsAlgoAnaCluster : public TObject { diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx index 4eb226dd39..a7b1ff78d1 100644 --- a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx +++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.cxx @@ -1,6 +1,6 @@ /* Copyright (C) 2007-2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Florian Uhlig [committer], Philipp Kähler */ + Authors: Florian Uhlig [committer], Philipp Kaehler */ // ------------------------------------------------------------------------- // ----- CbmTrdSetTracksPidWkn source file ----- diff --git a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h index bc356105c6..bda2ff0f9d 100644 --- a/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h +++ b/reco/detectors/trd/pid/CbmTrdSetTracksPidWkn.h @@ -1,6 +1,6 @@ /* Copyright (C) 2007-2018 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Florian Uhlig [committer], Philipp Kähler */ + Authors: Florian Uhlig [committer], Philipp Kaehler */ // ------------------------------------------------------------------------- // ----- CbmTrdSetTracksPidWkn header file ----- diff --git a/sim/detectors/sts/qa/CbmStsDigitizeQa.cxx b/sim/detectors/sts/qa/CbmStsDigitizeQa.cxx index ae56e3a965..9d34135362 100644 --- a/sim/detectors/sts/qa/CbmStsDigitizeQa.cxx +++ b/sim/detectors/sts/qa/CbmStsDigitizeQa.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Hanna Malygina [committer], Volker Friese */ diff --git a/sim/detectors/sts/qa/CbmStsDigitizeQa.h b/sim/detectors/sts/qa/CbmStsDigitizeQa.h index 63a28790f5..0a75f81f34 100644 --- a/sim/detectors/sts/qa/CbmStsDigitizeQa.h +++ b/sim/detectors/sts/qa/CbmStsDigitizeQa.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Hanna Malygina [committer], Volker Friese, Florian Uhlig */ diff --git a/sim/detectors/sts/qa/CbmStsDigitizeQaReport.cxx b/sim/detectors/sts/qa/CbmStsDigitizeQaReport.cxx index 91eb3dfdf5..9037370b4b 100644 --- a/sim/detectors/sts/qa/CbmStsDigitizeQaReport.cxx +++ b/sim/detectors/sts/qa/CbmStsDigitizeQaReport.cxx @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Hanna Malygina [committer], Volker Friese */ diff --git a/sim/detectors/sts/qa/CbmStsDigitizeQaReport.h b/sim/detectors/sts/qa/CbmStsDigitizeQaReport.h index 6fcefb6f2a..cb6d6a9ec9 100644 --- a/sim/detectors/sts/qa/CbmStsDigitizeQaReport.h +++ b/sim/detectors/sts/qa/CbmStsDigitizeQaReport.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universität Frankfurt, Frankfurt +/* Copyright (C) 2016-2020 Frankfurt Institute for Advanced Studies, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only Authors: Hanna Malygina [committer], Volker Friese */ -- GitLab From ef0dbc25a8dc3e13b68029713176d2fdf3119547 Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Wed, 12 Mar 2025 15:05:07 +0100 Subject: [PATCH 4/6] =?UTF-8?q?Exchange=20=C3=B6=20by=20oe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/detectors/sts/CbmStsContFact.h | 2 +- reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx | 2 +- reco/detectors/tof/LKFMinuit.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/detectors/sts/CbmStsContFact.h b/core/detectors/sts/CbmStsContFact.h index 222914dc42..af5ca55011 100644 --- a/core/detectors/sts/CbmStsContFact.h +++ b/core/detectors/sts/CbmStsContFact.h @@ -48,7 +48,7 @@ public: ** ** The name of the method is somewhat misleading, since what is ** created is not a FairContainer, but a FairParSet. Only God - ** and Ilse König can tell the difference, though. Doxygen surely cannot. + ** and Ilse Koenig can tell the difference, though. Doxygen surely cannot. **/ FairParSet* createContainer(FairContainer*); diff --git a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx index 92d621b6f3..6563376a65 100644 --- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx +++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx @@ -1,6 +1,6 @@ /* Copyright (C) 2006-2021 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only - Authors: Semen Lebedev, Andrey Lebedev, Florian Uhlig, Claudia Höhne [committer] */ + Authors: Semen Lebedev, Andrey Lebedev, Florian Uhlig, Claudia Hoehne [committer] */ /** * $Id: CbmRichRingFinderIdeal.cxx,v 1.5 2006/02/01 13:16:58 hoehne Exp $ diff --git a/reco/detectors/tof/LKFMinuit.h b/reco/detectors/tof/LKFMinuit.h index 7930a3839b..51a7bd49e0 100644 --- a/reco/detectors/tof/LKFMinuit.h +++ b/reco/detectors/tof/LKFMinuit.h @@ -23,7 +23,7 @@ class TFitter; class LKFMinuit { - public: // öffentlich + public: // oeffentlich inline static LKFMinuit* Instance() { return fInstance; } LKFMinuit(); // der Default-Konstruktor -- GitLab From 8b6daa94455340491c877d7f9e486f3d6c3f29a7 Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Wed, 12 Mar 2025 16:24:41 +0100 Subject: [PATCH 5/6] Remove non ASCII characters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The most non ASCII characters were used in comments but some were also used for screen output. The most common non ASCII character was µ which was exchanged by mu or micro. --- MQ/mcbm/CbmDeviceBmonMonitor.h | 6 ++--- MQ/mcbm/CbmDeviceUnpack.h | 6 ++--- algo/detectors/bmon/UnpackMS.cxx | 2 +- algo/detectors/much/UnpackMS.cxx | 2 +- algo/detectors/sts/UnpackMS.cxx | 2 +- algo/detectors/tof/UnpackMS.cxx | 2 +- algo/detectors/trd/UnpackMS.cxx | 14 +++++----- algo/detectors/trd/UnpackMS.h | 20 +++++++------- algo/evselector/DigiEventSelector.h | 4 +-- algo/evselector/DigiEventSelectorConfig.h | 2 +- .../PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx | 2 +- core/data/sts/CbmStsTrack.h | 2 +- core/data/tof/CbmTofDetectorId.cxx | 2 +- .../CbmMvdSensorDataSheet.cxx | 6 ++--- .../detectors/trd/CbmMcbm2020TrdTshiftPar.cxx | 4 +-- core/detectors/trd/CbmTrdRadiator.h | 6 ++--- .../unpacker/CbmMcbm2018UnpackerAlgoRich.cxx | 2 +- .../unpacker/CbmMcbm2018UnpackerAlgoTrdR.h | 4 +-- .../eventbuilder/CbmTofStarData2019.cxx | 2 +- macro/L1/run_reco_LITglobal.C | 2 +- macro/analysis/conversion2/run_analysis.C | 4 +-- macro/much/run_ana.C | 2 +- macro/rich/mcbm/MAPMTtoDiRICH.info | 2 +- macro/rich/run/run_reco.C | 2 +- macro/run/run_reco.C | 2 +- .../tof/beamtime/feb15/current/FileListDef.h | 4 +-- .../tof/beamtime/nov15/current/FileListDef.h | 4 +-- reco/base/CbmRecoUnpackAlgo.tmpl | 24 ++++++++--------- .../detectors/bmon/unpack/CbmBmonUnpackAlgo.h | 4 +-- .../detectors/much/unpack/CbmMuchUnpackAlgo.h | 6 ++--- reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h | 2 +- .../rich/CbmRichTrainAnnElectrons.cxx | 2 +- .../rich/alignment/CbmRichCorrection.cxx | 4 +-- .../alignment/CbmRichCorrectionVector.cxx | 4 +-- .../rich/alignment/CbmRichPMTMapping.cxx | 8 +++--- reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx | 4 +-- .../detectors/rich/unpack/CbmRichUnpackAlgo.h | 2 +- .../rich/unpack/CbmRichUnpackAlgo2022.h | 2 +- .../rich/unpack/CbmRichUnpackAlgoBase.h | 2 +- reco/detectors/sts/unpack/CbmStsUnpackAlgo.h | 6 ++--- .../sts/unpack/CbmStsUnpackAlgoLegacy.h | 2 +- reco/detectors/tof/unpack/CbmTofUnpackAlgo.h | 2 +- .../trd/unpack/CbmTrdUnpackAlgoBaseR.h | 4 +-- .../unpack/CbmTrdUnpackAlgoLegacy2020R.cxx | 4 +-- .../trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h | 4 +-- .../trd/unpack/CbmTrdUnpackAlgoR.cxx | 18 ++++++------- reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.h | 26 +++++++++---------- .../trd/unpack/CbmTrdUnpackFaspAlgo.cxx | 2 +- .../trd/unpack/CbmTrdUnpackFaspAlgo.h | 2 +- reco/steer/CbmRecoUnpack.h | 6 ++--- .../tasks/CbmMvdSensorDigitizerTask.cxx | 4 +-- sim/detectors/sts/CbmStsDigitize.cxx | 2 +- sim/detectors/trd/CbmTrdDigitizer.cxx | 10 +++---- sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx | 2 +- sim/detectors/trd/qa/CbmTrdHitRateQa.cxx | 2 +- sim/transport/base/CbmStackFilter.h | 2 +- sim/transport/base/CbmTarget.cxx | 2 +- 57 files changed, 138 insertions(+), 138 deletions(-) diff --git a/MQ/mcbm/CbmDeviceBmonMonitor.h b/MQ/mcbm/CbmDeviceBmonMonitor.h index 2f285562d4..d9ea1bd0d9 100644 --- a/MQ/mcbm/CbmDeviceBmonMonitor.h +++ b/MQ/mcbm/CbmDeviceBmonMonitor.h @@ -223,10 +223,10 @@ private: std::clock_t cpuendtime = std::clock(); auto wallendtime = std::chrono::high_resolution_clock::now(); - // Cpu time in [µs] + // Cpu time in [mus] auto cputime = 1e6 * (cpuendtime - cpustarttime) / CLOCKS_PER_SEC; algo->AddCpuTime(cputime); - // Real time in [µs] + // Real time in [mus] auto walltime = std::chrono::duration<double, std::micro>(wallendtime - wallstarttime).count(); algo->AddWallTime(walltime); @@ -234,7 +234,7 @@ private: // Check some numbers from this timeslice size_t nDigis = digivec.size(); LOG(debug) << "Component " << icomp << " connected to config " << config->GetName() << " n-Digis " << nDigis - << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") µs" + << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") micro s" << "this timeslice."; if (fDoPerfProf) { diff --git a/MQ/mcbm/CbmDeviceUnpack.h b/MQ/mcbm/CbmDeviceUnpack.h index 1c4eee48ff..acfdfdb719 100644 --- a/MQ/mcbm/CbmDeviceUnpack.h +++ b/MQ/mcbm/CbmDeviceUnpack.h @@ -271,10 +271,10 @@ private: std::clock_t cpuendtime = std::clock(); auto wallendtime = std::chrono::high_resolution_clock::now(); - // Cpu time in [µs] + // Cpu time in [mus] auto cputime = 1e6 * (cpuendtime - cpustarttime) / CLOCKS_PER_SEC; algo->AddCpuTime(cputime); - // Real time in [µs] + // Real time in [mus] auto walltime = std::chrono::duration<double, std::micro>(wallendtime - wallstarttime).count(); algo->AddWallTime(walltime); @@ -282,7 +282,7 @@ private: // Check some numbers from this timeslice size_t nDigis = digivec.size(); LOG(debug) << "Component " << icomp << " connected to config " << config->GetName() << " n-Digis " << nDigis - << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") µs" + << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") micro s" << "this timeslice."; if (fDoPerfProf) { diff --git a/algo/detectors/bmon/UnpackMS.cxx b/algo/detectors/bmon/UnpackMS.cxx index 22d56e90d1..275ea3cb0d 100644 --- a/algo/detectors/bmon/UnpackMS.cxx +++ b/algo/detectors/bmon/UnpackMS.cxx @@ -32,7 +32,7 @@ namespace cbm::algo::bmon L_(debug) << "EQ ID 0x" << std::hex << msDescr.eq_id << std::dec; - // --- Number of messages in microslice + // --- Number of messages in microslice auto msSize = msDescr.size; if (msSize % sizeof(critof001::Message) != 0) { std::get<1>(result).fNumErrInvalidMsSize++; diff --git a/algo/detectors/much/UnpackMS.cxx b/algo/detectors/much/UnpackMS.cxx index d917fa4cda..01ded68f85 100644 --- a/algo/detectors/much/UnpackMS.cxx +++ b/algo/detectors/much/UnpackMS.cxx @@ -42,7 +42,7 @@ namespace cbm::algo::much time.currentEpochTime = 0; // Needed to make each MS independent of the previous! Will be updated in message 1 if MS OK - // --- Number of messages in microslice + // --- Number of messages in microslice auto msSize = msDescr.size; if (msSize % sizeof(stsxyter::Message) != 0) { std::get<1>(result).fNumErrInvalidMsSize++; diff --git a/algo/detectors/sts/UnpackMS.cxx b/algo/detectors/sts/UnpackMS.cxx index 077e3c7ab9..9c8af375ed 100644 --- a/algo/detectors/sts/UnpackMS.cxx +++ b/algo/detectors/sts/UnpackMS.cxx @@ -40,7 +40,7 @@ namespace cbm::algo::sts auto const msTime = msDescr.idx; // Unix time of MS in ns time.currentCycle = std::ldiv(msTime, fkCycleLength).quot; - // --- Number of messages in microslice + // --- Number of messages in microslice auto msSize = msDescr.size; if (msSize % sizeof(stsxyter::Message) != 0) { L_(error) << "Invalid microslice size: " << msSize; diff --git a/algo/detectors/tof/UnpackMS.cxx b/algo/detectors/tof/UnpackMS.cxx index 0c11fe6163..ae0a4d37ca 100644 --- a/algo/detectors/tof/UnpackMS.cxx +++ b/algo/detectors/tof/UnpackMS.cxx @@ -31,7 +31,7 @@ namespace cbm::algo::tof // --- and the epoch is a multiple of ns. time.currentTsTime = static_cast<uint64_t>(tTimeslice / critof001::kuEpochInNs) % critof001::kulEpochCycleEp; - // --- Number of messages in microslice + // --- Number of messages in microslice auto msSize = msDescr.size; if (msSize % sizeof(critof001::Message) != 0) { std::get<1>(result).fNumErrInvalidMsSize++; diff --git a/algo/detectors/trd/UnpackMS.cxx b/algo/detectors/trd/UnpackMS.cxx index 41310caaa2..d598336a23 100644 --- a/algo/detectors/trd/UnpackMS.cxx +++ b/algo/detectors/trd/UnpackMS.cxx @@ -423,7 +423,7 @@ namespace cbm::algo::trd Result_t result = {}; - // Digest the flags from the µSlice + // Digest the flags from the micro-Slice digestMsFlags(msDescr.flags, std::get<1>(result)); size_t fMsStartTimeRel = (msDescr.idx - tTimeslice); @@ -462,25 +462,25 @@ namespace cbm::algo::trd MsContext ctx = {}; - // Get the µSlice starttime relative to the timeslice starttime (constant is clock length of Spadic in ns) + // Get the micro-Slice starttime relative to the timeslice starttime (constant is clock length of Spadic in ns) ctx.fMsStartTimeRelCC = (msDescr.idx - tTimeslice) / fAsicClockCycle; // We only want to count on TS_MSB per Stream per TS_MSB package (each eLink sends its own TS_MSB frame) // so we store the current TS_MSB and compare it to the incoming. std::int8_t currTsMsb = 0; - // Reset the TS_MSB counter for the new µSlice we unpack + // Reset the TS_MSB counter for the new micro-Slice we unpack ctx.fNrTsMsbVec.resize(fStreamsPerWord); - // Get the µslice size in bytes to calculate the number of completed words + // Get the micro-slice size in bytes to calculate the number of completed words auto mssize = msDescr.size; - // Get the hardware ids from which the current µSlice is coming + // Get the hardware ids from which the current micro-Slice is coming std::uint8_t crobId = 0; auto criId = msDescr.eq_id; - // Digest the flags from the µSlice + // Digest the flags from the micro-Slice digestMsFlags(msDescr.flags, std::get<1>(result)); // Get the number of complete words in the input MS buffer. @@ -491,7 +491,7 @@ namespace cbm::algo::trd std::get<0>(result).reserve(nwords); - // Loop over all 64bit-Spadic-Words in the current µslice + // Loop over all 64bit-Spadic-Words in the current micro-slice for (std::uint32_t istream = 0; istream < fStreamsPerWord; istream++) { currTsMsb = -1; for (std::uint32_t iword = 0; iword < nwords; ++iword) { diff --git a/algo/detectors/trd/UnpackMS.h b/algo/detectors/trd/UnpackMS.h index 35f0d874a5..e7832b93ca 100644 --- a/algo/detectors/trd/UnpackMS.h +++ b/algo/detectors/trd/UnpackMS.h @@ -67,11 +67,11 @@ namespace cbm::algo::trd size_t fNumWildEom = 0; ///< Number of eom frames outside of a SOM frame range size_t fNumUnknownWords = 0; ///< Number of unknown words size_t fNumMissingEom = 0; ///< Number of missing EOM frames to finish a SOM frame - size_t fNumWildNul = 0; ///< Number of wild null words, should only appear at the end of a µSlice - size_t fNumCrcValidFlags = 0; ///< counter for inf/error flags from the µSlices - size_t fNumOverflowFlimFlags = 0; ///< counter for inf/error flags from the µSlices - size_t fNumOverflowUserFlags = 0; ///< counter for inf/error flags from the µSlices - size_t fNumDataErrorFlags = 0; ///< counter for inf/error flags from the µSlices + size_t fNumWildNul = 0; ///< Number of wild null words, should only appear at the end of a micro-Slice + size_t fNumCrcValidFlags = 0; ///< counter for inf/error flags from the micro-Slices + size_t fNumOverflowFlimFlags = 0; ///< counter for inf/error flags from the micro-Slices + size_t fNumOverflowUserFlags = 0; ///< counter for inf/error flags from the micro-Slices + size_t fNumDataErrorFlags = 0; ///< counter for inf/error flags from the micro-Slices bool HasErrors() { @@ -134,7 +134,7 @@ namespace cbm::algo::trd private: // Types struct MsContext { - /** @brief Start time of the current µSlice relative to the Timeslice start time in Spadic CC. */ + /** @brief Start time of the current micro-Slice relative to the Timeslice start time in Spadic CC. */ size_t fMsStartTimeRelCC = 0; /** @brief Time of the last succesful digest hit message */ @@ -162,8 +162,8 @@ namespace cbm::algo::trd Spadic::MsInfoType digestBufInfoFlags(const std::uint32_t frame) const; /** - ** @brief Digest the flags of the currently unpacked µSlice. - ** @param flags flags stored in the µSlice descriptor + ** @brief Digest the flags of the currently unpacked micro-Slice. + ** @param flags flags stored in the micro-Slice descriptor ** @param storage of monitoring data **/ void digestMsFlags(const std::uint16_t flags, UnpackMonitorData& monitor) const; @@ -208,8 +208,8 @@ namespace cbm::algo::trd /** ** @brief Create a CbmTrdRawMessageSpadic from the hit message input. ** @param word - ** @param criId id of the cri that send the µSlice - ** @param criobId id of the crob that send the µSlice (currently not used set to 0 062021 PR) + ** @param criId id of the cri that send the micro-Slice + ** @param criobId id of the crob that send the micro-Slice (currently not used set to 0 062021 PR) ** @param istream ** @return CbmTrdRawMessageSpadic ** @todo Check if we can get rid of the future obsolete microslice stuff. diff --git a/algo/evselector/DigiEventSelector.h b/algo/evselector/DigiEventSelector.h index a8ba4d7a95..f12fd4ccd2 100644 --- a/algo/evselector/DigiEventSelector.h +++ b/algo/evselector/DigiEventSelector.h @@ -17,7 +17,7 @@ namespace cbm::algo::evbuild { /** @struct DigiEventSelectorParams - ** @author Dominik Smith <d.smith@ gsi.de> + ** @author Dominik Smith <d.smith@gsi.de> ** @author Shreya Roy <s.roy@gsi.de> ** @author Volker Friese <v.friese@gsi.de> ** @since 26.01.2023 @@ -29,7 +29,7 @@ namespace cbm::algo::evbuild /** @class DigiEventSelector - ** @author Dominik Smith <d.smith@ gsi.de> + ** @author Dominik Smith <d.smith@gsi.de> ** @author Shreya Roy <s.roy@gsi.de> ** @author Volker Friese <v.friese@gsi.de> ** @since 26.01.2023 diff --git a/algo/evselector/DigiEventSelectorConfig.h b/algo/evselector/DigiEventSelectorConfig.h index fa97bdcc13..c26fc3b73d 100644 --- a/algo/evselector/DigiEventSelectorConfig.h +++ b/algo/evselector/DigiEventSelectorConfig.h @@ -22,7 +22,7 @@ namespace cbm::algo::evbuild /** @class DigiEventSelectorConfig ** @brief Configuration of the DigiEventSelector class - ** @author Dominik Smith <d.smith@ gsi.de> + ** @author Dominik Smith <d.smith@gsi.de> ** @author Shreya Roy <s.roy@gsi.de> ** @author Volker Friese <v.friese@gsi.de> ** @since 26.01.2023 diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx index d83ff362d8..51970260f6 100644 --- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx +++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx @@ -1012,7 +1012,7 @@ void CbmAnaDimuonAnalysis::Exec(Option_t* /*opt*/) fEvent++; } // ------------------------------------------------------------------------- -// used default ANN (16 neurons) weights generated for 8 GeV/c Au beam (UrQMD) and omega->µµ (PLUTO) +// used default ANN (16 neurons) weights generated for 8 GeV/c Au beam (UrQMD) and omega->MuonMuon (PLUTO) // sis100_muon_lmvm setup // Double_t CbmAnaDimuonAnalysis::CalculateAnnValue(CbmAnaMuonCandidate* mu) diff --git a/core/data/sts/CbmStsTrack.h b/core/data/sts/CbmStsTrack.h index 76f34d40d1..b8943b392d 100644 --- a/core/data/sts/CbmStsTrack.h +++ b/core/data/sts/CbmStsTrack.h @@ -135,7 +135,7 @@ private: /** Impact parameter of track at target z, in units of its error **/ Double32_t fB; - /** median dE/dx [e/300µm] **/ + /** median dE/dx [e/300mum] **/ float fELoss {-1.f}; /** Hide this method of the base class because it is confusing. It is valid only for STS hits diff --git a/core/data/tof/CbmTofDetectorId.cxx b/core/data/tof/CbmTofDetectorId.cxx index 5d43f0b691..9d03bc9ef4 100644 --- a/core/data/tof/CbmTofDetectorId.cxx +++ b/core/data/tof/CbmTofDetectorId.cxx @@ -12,7 +12,7 @@ /** * C++ version 0.4 char* style "itoa": - * Written by Lukás Chmela + * Written by Lukxs Chmela * Released under GPLv3. */ //char* CbmTofDetectorId::itoa(int value, char* result, int base) { diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx index c5c872bf44..78a3a011db 100644 --- a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx +++ b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx @@ -68,10 +68,10 @@ std::string CbmMvdSensorDataSheet::ToString() const ss << " Technical Data:" << endl; ss << "--------------------------" << endl; ss << "Name of the sensor: " << fMimosaName << endl; - ss << "Pixel pitch (x/y) [µm]: " << fPixelPitchY * 1e4 << "/" << fPixelPitchY * 1e-4 << endl; + ss << "Pixel pitch (x/y) [micro m]: " << fPixelPitchY * 1e4 << "/" << fPixelPitchY * 1e-4 << endl; ss << "N Pixels (rows/cols): " << fNPixelsX << "/" << fNPixelsY << endl; - ss << "Thickness of active volume[µm]: " << fEpiTh * 1e4 << endl; - ss << "Integration time [µs]: " << fIntegrationTime * 1e6 << endl; + ss << "Thickness of active volume[ micro m]: " << fEpiTh * 1e4 << endl; + ss << "Integration time [micro s]: " << fIntegrationTime * 1e6 << endl; ss << "ADC resolution: " << fAdcBits << "bit ADC (1 = discriminator)" << endl; ss << "Default noise [e ENC]: " << fNoise << endl; ss << "Matrix size (x/y) [cm]: " << fPixelPitchX * fNPixelsX << " / " << fPixelPitchY * fNPixelsY << endl; diff --git a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx index f0778d6247..24dda6e75d 100644 --- a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx +++ b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx @@ -147,14 +147,14 @@ bool CbmMcbm2020TrdTshiftPar::GetTimeshifts(std::shared_ptr<TH2> timeshiftHisto) fTimeshifts.Set(nentries); // Then write the eventId correlated to the tsIdx to the array - // For mCbm2020 a timeslice contains 10 µslices, the tsidx jumps accordingly by 10, e.g. tsidx0 = 7 -> tsidx = 17 + // For mCbm2020 a timeslice contains 10 micro-slices, the tsidx jumps accordingly by 10, e.g. tsidx0 = 7 -> tsidx = 17 eventId = tsidx / 10; fTimeshifts[ientry] = eventId; ientry++; // Followed by the channelwise shift values for (size_t ichannel = 0; ichannel < fgNchannels; ichannel++) { tshift = fvecCurrentTimeshifts[ichannel]; - // The above represents the timeshift in multiples of a µSlice length (for mCbm 2020 1280 ns) since here we have time to do the calculation of the actual timeshift, we do it here and not in the unpacker algo. + // The above represents the timeshift in multiples of a micro-Slice length (for mCbm 2020 1280 ns) since here we have time to do the calculation of the actual timeshift, we do it here and not in the unpacker algo. tshift *= fgMicroSliceLength; fTimeshifts.AddAt(tshift, ientry); ientry++; diff --git a/core/detectors/trd/CbmTrdRadiator.h b/core/detectors/trd/CbmTrdRadiator.h index 0d802d57f4..f158045b9e 100644 --- a/core/detectors/trd/CbmTrdRadiator.h +++ b/core/detectors/trd/CbmTrdRadiator.h @@ -48,8 +48,8 @@ public: CbmTrdRadiator(Bool_t SimpleTR, TString prototype, TString window = "Kapton"); /* // implemented prototypes are: "tdr18" 153x2mm PE foam foil layer (146 layers in box, 7 layers in carbon grid) - "B++" POKALON 24µm, 0.7mm gap, 350 foils - "K++" POKALON 24µm, 0.7mm gap, 350 foils micro-structured + "B++" POKALON 24mum, 0.7mm gap, 350 foils + "K++" POKALON 24mum, 0.7mm gap, 350 foils micro-structured "G30" 30xfiber layer @@ -57,7 +57,7 @@ public: where ci are planar components. e.g. Al;C;Air;C;Al is the TRD-2D sandwich There are two shortcuts for the Munster detector namely: "Mylar" - simple mylar window - "Kapton" - Al(50nm)kapton(25µm ) + "Kapton" - Al(50nm)kapton(25mum ) */ /** Destructor **/ diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx index 1d8fbfa6fe..772822d029 100644 --- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx +++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx @@ -662,7 +662,7 @@ void CbmMcbm2018UnpackerAlgoRich::ErrorMsg(uint16_t errbits, CbmMcbm2018RichErro if (type == CbmMcbm2018RichErrorType::tdcHeader) { // Errors description in TRB manual section 11.3.2. TDC HEADER - // Bit 0: min. 1 rinǵ buffer overwritten + // Bit 0: min. 1 ring buffer overwritten int nofHeaderErrorBits = 1; int histBinOffsetHeaderError = 0; for (int i = 0; i < nofHeaderErrorBits; i++) { diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h index b794cf25f6..605d0808f8 100644 --- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h +++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.h @@ -238,10 +238,10 @@ private: ///< Map to retrieve module channelId from asicAddress and asicChannel std::map<size_t, std::vector<Int_t>> fmapTimeshifts = {}; - ///< Map containing the timeshift parameters for the correction of the µSlice timeshifts. The keys are the tsIdx, if no key is found, the shifts of the previous tsIdx are still valid + ///< Map containing the timeshift parameters for the correction of the micro-Slice timeshifts. The keys are the tsIdx, if no key is found, the shifts of the previous tsIdx are still valid std::vector<Int_t>* fvecTimeshiftsPar = nullptr; - ///< Vector containing the timeshift parameters for the correction of the µSlice timeshifts for a given tsIdx. + ///< Vector containing the timeshift parameters for the correction of the micro-Slice timeshifts for a given tsIdx. bool fIsFirstChannelsElinkEven; ///< define if the first 16 channels (00..15) are found on the even (set true) or odd (false) eLinkId, default for mCbm2020 is false thus, initialized as false diff --git a/fles/star2019/eventbuilder/CbmTofStarData2019.cxx b/fles/star2019/eventbuilder/CbmTofStarData2019.cxx index 8648c4e6cf..554eeb1ca4 100644 --- a/fles/star2019/eventbuilder/CbmTofStarData2019.cxx +++ b/fles/star2019/eventbuilder/CbmTofStarData2019.cxx @@ -166,7 +166,7 @@ void* CbmTofStarSubevent2019::BuildOutput(Int_t& iOutputSizeBytes) + (static_cast<ULong64_t>(fTrigger.GetStarTrigCmd())); fpulBuff[3] = fulEventStatusFlags; - // does not work due to "error: cannot convert ‘gdpbv100::Message’ to ‘long unsigned int’ in assignment" + // does not work due to "error: cannot convert 'gdpbv100::Message' to 'long unsigned int' in assignment" // std::copy( fvMsgBuffer.begin(), fvMsgBuffer.begin() + uMsgsToRead, pulBuff + 4 ); // Unoptimized replacement: item by item copy diff --git a/macro/L1/run_reco_LITglobal.C b/macro/L1/run_reco_LITglobal.C index 75ec5e8e3e..884cca0981 100644 --- a/macro/L1/run_reco_LITglobal.C +++ b/macro/L1/run_reco_LITglobal.C @@ -461,7 +461,7 @@ void run_reco_LITglobal(TString input = "", Int_t nTimeSlices = -1, Int_t firstT else { - // ----- Event building from STS tracks ----------------------------- + // ----- Event building from STS tracks ----------------------------- run->AddTask(new CbmBuildEventsFromTracksReal()); // ---------------------------------------------------------------------- diff --git a/macro/analysis/conversion2/run_analysis.C b/macro/analysis/conversion2/run_analysis.C index eab8068897..8a4b25bfea 100644 --- a/macro/analysis/conversion2/run_analysis.C +++ b/macro/analysis/conversion2/run_analysis.C @@ -133,11 +133,11 @@ void run_analysis(Int_t nEvents = 2, TString setupName = "sis100_electron", cons } run->AddTask(l1); - // —---------------------------------------------------------------------- + // ----------------------------------------------------------------------- ///// add you task here CbmKresConversionMain* conversionKres = new CbmKresConversionMain(); run->AddTask(conversionKres); - // —---------------------------------------------------------------------- + // ----------------------------------------------------------------------- // ----- Parameter database -------------------------------------------- diff --git a/macro/much/run_ana.C b/macro/much/run_ana.C index 90f470a6a8..1a7da37e57 100644 --- a/macro/much/run_ana.C +++ b/macro/much/run_ana.C @@ -46,7 +46,7 @@ void run_ana(Int_t nEvents = 1000, TString dataSet = "muons", TString setup = "s // CbmSetup::Instance()->SetModule(ESystemId, const char*, Bool_t) or // CbmSetup::Instance()->SetActive(ESystemId, Bool_t) // See the class documentation of CbmSetup. - // ———————————————————————————————————— + // ------------------------------------------------------------------------ // ------------------------------------------------------------------------ diff --git a/macro/rich/mcbm/MAPMTtoDiRICH.info b/macro/rich/mcbm/MAPMTtoDiRICH.info index 3b5aea4016..46451e0d72 100644 --- a/macro/rich/mcbm/MAPMTtoDiRICH.info +++ b/macro/rich/mcbm/MAPMTtoDiRICH.info @@ -42,7 +42,7 @@ DiRICH channel to MAPMT pixel for a normal MAPMT |15|13|11|09|07|05|03|01| '--'--'--'--'--'--'--'--' -DiRICH channel to MAPMT pixel for a 180° rotated MAPMT +DiRICH channel to MAPMT pixel for a 180 degree rotated MAPMT - 0 is a DiRICH with address 0x7**0 - 1 is a DiRICH with address 0x7**1 (PMTs near PowerModule) diff --git a/macro/rich/run/run_reco.C b/macro/rich/run/run_reco.C index 7eb1e7e2cb..db5751d50e 100644 --- a/macro/rich/run/run_reco.C +++ b/macro/rich/run/run_reco.C @@ -377,7 +377,7 @@ void run_reco(TString traFile = "", TString parFile = "", TString digiFile = "", run->AddTask(richReco); std::cout << "-I- " << myName << ": Added task " << richReco->GetName() << std::endl; } - // ----- Event building from STS tracks ----------------------------- + // ----- Event building from STS tracks ----------------------------- run->AddTask(new CbmBuildEventsFromTracksReal()); // ---------------------------------------------------------------------- //FIXME: if placing rich reco here: diff --git a/macro/run/run_reco.C b/macro/run/run_reco.C index 08076b8585..9c11ddf911 100644 --- a/macro/run/run_reco.C +++ b/macro/run/run_reco.C @@ -519,7 +519,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice = else { - // ----- Event building from STS tracks ----------------------------- + // ----- Event building from STS tracks ----------------------------- run->AddTask(new CbmBuildEventsFromTracksReal()); // ---------------------------------------------------------------------- diff --git a/macro/tof/beamtime/feb15/current/FileListDef.h b/macro/tof/beamtime/feb15/current/FileListDef.h index 650d7097a4..b4e7be2084 100644 --- a/macro/tof/beamtime/feb15/current/FileListDef.h +++ b/macro/tof/beamtime/feb15/current/FileListDef.h @@ -89,8 +89,8 @@ Int_t iBdIdxTrdPos[kiNbTrd] = {10, 10, 10, 10, 10}; Int_t iChIdxTrdPos[kiNbTrd] = {0, 1, 2, 3, 4}; const Int_t kiSpillDistSec = 30; // Approximate value, now just default -const Double_t kdSpillDiamThr = 1e-4; // µA -const Double_t kdNoSpillDiamThr = 1e-5; // µA +const Double_t kdSpillDiamThr = 1e-4; // microA +const Double_t kdNoSpillDiamThr = 1e-5; // microA void PrintHelp() { diff --git a/macro/tof/beamtime/nov15/current/FileListDef.h b/macro/tof/beamtime/nov15/current/FileListDef.h index 1d06f7e760..9f5d0d56a4 100644 --- a/macro/tof/beamtime/nov15/current/FileListDef.h +++ b/macro/tof/beamtime/nov15/current/FileListDef.h @@ -69,8 +69,8 @@ Int_t iChIdxTrdPos[kiNbTrd] = { 0 , 1 , 2 , 3 , */ const Int_t kiSpillDistSec = 30; // Approximate value, now just default -const Double_t kdSpillDiamThr = 1e-4; // µA -const Double_t kdNoSpillDiamThr = 1e-5; // µA +const Double_t kdSpillDiamThr = 1e-4; // microA +const Double_t kdNoSpillDiamThr = 1e-5; // microA void PrintHelp() { diff --git a/reco/base/CbmRecoUnpackAlgo.tmpl b/reco/base/CbmRecoUnpackAlgo.tmpl index f87f534bd0..db72ca36c1 100644 --- a/reco/base/CbmRecoUnpackAlgo.tmpl +++ b/reco/base/CbmRecoUnpackAlgo.tmpl @@ -123,10 +123,10 @@ protected: /** @brief counter of created raw messages */ size_t fNrEpochMsgs = 0; - /** @brief Sum counter for used cpu time by this algo [µs].*/ + /** @brief Sum counter for used cpu time by this algo [mus].*/ double fSumCpuTime = 0; - /** @brief Sum counter for used wall time by this algo [µs].*/ + /** @brief Sum counter for used wall time by this algo [mus].*/ double fSumWallTime = 0; /** @brief Sum counter for size of the input data of this algo.*/ @@ -135,13 +135,13 @@ protected: /** @brief Sum counter for size of the output data of this algo.*/ double fSumOutDataSize = 0; - /** @brief counter for inf/error flags from the µSlices */ + /** @brief counter for inf/error flags from the micro-Slices */ size_t fNrCrcValidFlags = 0; - /** @brief counter for inf/error flags from the µSlices */ + /** @brief counter for inf/error flags from the micro-Slices */ size_t fNrOverflowFlimFlags = 0; - /** @brief counter for inf/error flags from the µSlices */ + /** @brief counter for inf/error flags from the micro-Slices */ size_t fNrOverflowUserFlags = 0; - /** @brief counter for inf/error flags from the µSlices */ + /** @brief counter for inf/error flags from the micro-Slices */ size_t fNrDataErrorFlags = 0; /** @brief Time of the last succesful digest hit message */ @@ -249,7 +249,7 @@ protected: * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ virtual bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice) = 0; @@ -286,14 +286,14 @@ public: LOG(info) << fName << "::Finish.-------------------------\n Unpack process : \n " << fNrProcessedTs << " Timeslices with \n " << fNrCreatedRawMsgs << " Raw Messages,\n " << fNrCreatedDigis << " Digis \n ...processed in walltime(cputime) " << std::setprecision(4) << fSumWallTime << "(" - << std::setprecision(4) << fSumCpuTime << ") µs \n " + << std::setprecision(4) << fSumCpuTime << ") micro s \n " << "-->" << std::setprecision(4) << fNrCreatedDigis / fSumWallTime << "(" << std::setprecision(4) - << fNrCreatedDigis / fSumCpuTime << ") Digis/µs <--> " << std::setprecision(4) + << fNrCreatedDigis / fSumCpuTime << ") Digis/micro s <--> " << std::setprecision(4) << fSumWallTime / fNrCreatedDigis << "(" << std::setprecision(4) << fSumCpuTime / fNrCreatedDigis - << ") µs/Digi.\n " + << ") micro s/Digi.\n " << "Processed amount of input data " << std::setprecision(4) << fSumInDataSize << " MB digested to " << fSumOutDataSize << " MB output data <--> " << std::setprecision(4) << fSumInDataSize / fSumWallTime - << " MB/µs digested. \n"; + << " MB/ micro s digested. \n"; LOG(debug) << fNrEpochMsgs << " Epoch Messages,\n " << fNrCreatedInfoMsgs << " Info Messages.\n " @@ -374,7 +374,7 @@ public: // Setters /** - * @brief Set the Do Ignore Overlapp µslices flag + * @brief Set the Do Ignore Overlapp micro-slices flag * * @param value */ diff --git a/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h b/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h index 27767c0371..f82c9e0908 100644 --- a/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h +++ b/reco/detectors/bmon/unpack/CbmBmonUnpackAlgo.h @@ -156,7 +156,7 @@ class CbmBmonUnpackAlgo : public CbmRecoUnpackAlgo<CbmBmonDigi, CbmErrorMessage> // Setters /** - * @brief Set the Do Ignore Overlapp µslices flag + * @brief Set the Do Ignore Overlapp micro-slices flag * * @param value */ @@ -282,7 +282,7 @@ class CbmBmonUnpackAlgo : public CbmRecoUnpackAlgo<CbmBmonDigi, CbmErrorMessage> * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ virtual bool unpack(const fles::Timeslice* /*ts*/, std::uint16_t /*icomp*/, UInt_t /*imslice*/) { return true; } diff --git a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h index 6039009d1c..d58e42468f 100644 --- a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h +++ b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.h @@ -162,7 +162,7 @@ class CbmMuchUnpackAlgo : public CbmRecoUnpackAlgo<CbmMuchDigi, CbmMuchDigi, Cbm /** @brief Initialize and transfer the informations to the parameters storage vectors */ /** - * @brief Main loop over the sts xyter messages in the µSlices + * @brief Main loop over the sts xyter messages in the micro-Slices * * @param msContent * @param uSize @@ -220,7 +220,7 @@ class CbmMuchUnpackAlgo : public CbmRecoUnpackAlgo<CbmMuchDigi, CbmMuchDigi, Cbm * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); @@ -329,7 +329,7 @@ class CbmMuchUnpackAlgo : public CbmRecoUnpackAlgo<CbmMuchDigi, CbmMuchDigi, Cbm /** @brief Potential (online) monitor for the unpacking process */ std::shared_ptr<CbmMuchUnpackMonitor> fMonitor = nullptr; - /** @brief Current µSlice time */ + /** @brief Current micro-Slice time */ uint64_t fMsStartTime = 0; std::set<uint32_t> fInactiveChannels = {}; diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h index 17596d6483..315d5155e7 100644 --- a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h +++ b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.h @@ -123,7 +123,7 @@ class CbmPsdUnpackAlgo : public CbmRecoUnpackAlgo<CbmPsdDigi, CbmPsdDsp> { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); diff --git a/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx b/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx index 75351e5b94..034e24c303 100644 --- a/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx +++ b/reco/detectors/rich/CbmRichTrainAnnElectrons.cxx @@ -134,7 +134,7 @@ CbmRichTrainAnnElectrons::CbmRichTrainAnnElectrons() -2., 2., 50, 0., 6.3); fHists.push_back(fhPhiVsRadAng[i]); // ANN outputs - fhAnnOutput[i] = new TH1D(string("fhAnnOutput" + ss).c_str(), "ANN output;ANN output;Counte©r", 100, -1.2, 1.2); + fhAnnOutput[i] = new TH1D(string("fhAnnOutput" + ss).c_str(), "ANN output;ANN output;Counter", 100, -1.2, 1.2); fHists.push_back(fhAnnOutput[i]); fhCumProb[i] = new TH1D(string("fhCumProb" + ss).c_str(), "ANN output;ANN output;Cumulative probability", 100, -1.2, 1.2); diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.cxx b/reco/detectors/rich/alignment/CbmRichCorrection.cxx index 3a9e4b3349..6193ea4da4 100644 --- a/reco/detectors/rich/alignment/CbmRichCorrection.cxx +++ b/reco/detectors/rich/alignment/CbmRichCorrection.cxx @@ -282,7 +282,7 @@ void CbmRichCorrection::ProjectionProducer() //cout << "Mirror track ID = " << mirrTrackID << endl; if (mirrTrackID <= -1) { cout << "Mirror track ID <= 1 !!!" << endl; - cout << "----------------------------------- End of loop N°" << iMirr + 1 + cout << "----------------------------------- End of loop N " << iMirr + 1 << " on the mirror points. -----------------------------------" << endl << endl; continue; @@ -400,7 +400,7 @@ void CbmRichCorrection::ProjectionProducer() cout << "Not a mother particle ..." << endl; } cout << "----------------------------------- " - << "End of loop N°" << iMirr + 1 << " on the mirror points." + << "End of loop N " << iMirr + 1 << " on the mirror points." << " -----------------------------------" << endl << endl; } diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx index 3822017351..d7fe6765f1 100644 --- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx +++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx @@ -575,7 +575,7 @@ void CbmRichCorrectionVector::ProjectionProducer(TClonesArray* projectedPoint) //cout << "Mirror track ID = " << mirrTrackID << endl; if (mirrTrackID <= -1) { cout << "Mirror track ID <= 1 !!!" << endl; - cout << "----------------------------------- End of loop N°" << iMirr + 1 + cout << "----------------------------------- End of loop N " << iMirr + 1 << " on the mirror points. -----------------------------------" << endl << endl; continue; @@ -685,7 +685,7 @@ void CbmRichCorrectionVector::ProjectionProducer(TClonesArray* projectedPoint) cout << "Not a mother particle ..." << endl; } cout << "----------------------------------- " - << "End of loop N°" << iMirr + 1 << " on the mirror points." + << "End of loop N " << iMirr + 1 << " on the mirror points." << " -----------------------------------" << endl << endl; } diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx index 54e1c911eb..157d1fe259 100644 --- a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx +++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx @@ -445,7 +445,7 @@ void CbmRichPMTMapping::ProjectionProducer2() //cout << "Mirror track ID = " << mirrTrackID << endl; if (mirrTrackID <= -1) { cout << "Mirror track ID <= 1 !!!" << endl; - cout << "----------------------------------- End of loop N°" << iMirr + 1 + cout << "----------------------------------- End of loop N " << iMirr + 1 << " on the mirror points. -----------------------------------" << endl << endl; continue; @@ -651,7 +651,7 @@ void CbmRichPMTMapping::ProjectionProducer2() cout << "Not a mother particle ..." << endl; } cout << "----------------------------------- " - << "End of loop N°" << iMirr + 1 << " on the mirror points." + << "End of loop N " << iMirr + 1 << " on the mirror points." << " -----------------------------------" << endl << endl; } @@ -714,7 +714,7 @@ void CbmRichPMTMapping::ProjectionProducer() //cout << "Mirror track ID = " << mirrTrackID << endl; if (mirrTrackID <= -1) { cout << "Mirror track ID <= 1 !!!" << endl; - cout << "----------------------------------- End of loop N°" << iMirr + 1 + cout << "----------------------------------- End of loop N " << iMirr + 1 << " on the mirror points. -----------------------------------" << endl << endl; continue; @@ -928,7 +928,7 @@ void CbmRichPMTMapping::ProjectionProducer() cout << "Not a mother particle ..." << endl; } cout << "----------------------------------- " - << "End of loop N°" << iMirr + 1 << " on the mirror points." + << "End of loop N " << iMirr + 1 << " on the mirror points." << " -----------------------------------" << endl << endl; } diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx index 754c92734f..eb80f93b4a 100644 --- a/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx +++ b/reco/detectors/rich/mcbm/CbmRichMCbmQa.cxx @@ -277,7 +277,7 @@ void CbmRichMCbmQa::Exec(Option_t* /*option*/) Double_t timect = 0.2998 * time; //time in ns, timect in m Double_t trackLength = tofHit->GetR() / 100; Double_t beta = trackLength / timect; - Double_t mass2 = TMath::Power(momTotal, 2.) * (TMath::Power(1 / beta, 2) - 1); //m² = p²*((1/beta)²-1) + Double_t mass2 = TMath::Power(momTotal, 2.) * (TMath::Power(1 / beta, 2) - 1); //m^2 = p^2*((1/beta)^2-1) for (int i = 0; i < nofRichPoints; i++) { @@ -472,7 +472,7 @@ void CbmRichMCbmQa::Exec(Option_t* /*option*/) Double_t trackLength = tofHit->GetR()/100; Double_t beta = trackLength/timect; - Double_t mass2 = TMath::Power(momTotal, 2.) * (TMath::Power(1/beta, 2) - 1); //m² = p²*((1/beta)²-1) + Double_t mass2 = TMath::Power(momTotal, 2.) * (TMath::Power(1/beta, 2) - 1); //m^2 =p^2*((1/beta)^2-1) if(mcTrackIdTofHit == mcTrackIdRing){ diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h index 52c3661df6..470fb6d106 100644 --- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h +++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h @@ -82,7 +82,7 @@ class CbmRichUnpackAlgo : public CbmRichUnpackAlgoBase { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h index ca6aaa6e52..a958d39185 100644 --- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h +++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.h @@ -82,7 +82,7 @@ class CbmRichUnpackAlgo2022 : public CbmRichUnpackAlgoBase { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h index fbec419b35..b28d5a6f2b 100644 --- a/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h +++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgoBase.h @@ -307,7 +307,7 @@ class CbmRichUnpackAlgoBase : public CbmRecoUnpackAlgo<CbmRichDigi> { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ //bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h index 94a8667dd0..36ba662a81 100644 --- a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h +++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.h @@ -105,7 +105,7 @@ class CbmStsUnpackAlgo : public CbmStsUnpackAlgoBase { std::vector<std::vector<bool>>* vbCrobActiveFlag, std::vector<std::vector<std::vector<int32_t>>>* viFebModuleSide); /** - * @brief Main loop over the sts xyter messages in the µSlices + * @brief Main loop over the sts xyter messages in the micro-Slices * * @param msContent * @param uSize @@ -161,12 +161,12 @@ class CbmStsUnpackAlgo : public CbmStsUnpackAlgoBase { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); // Monitoring - /** @brief Current µSlice time */ + /** @brief Current micro-Slice time */ uint64_t fMsStartTime = 0; // Parameter members diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h b/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h index 21f92c1ccb..08a04747af 100644 --- a/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h +++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgoLegacy.h @@ -53,7 +53,7 @@ class CbmStsUnpackAlgoLegacy : public CbmStsUnpackAlgoBase { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); diff --git a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h index ea3346aede..11458a8838 100644 --- a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h +++ b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h @@ -154,7 +154,7 @@ class CbmTofUnpackAlgo : public CbmRecoUnpackAlgo<CbmTofDigi, CbmErrorMessage> { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h index 3c430596fd..418a8dcb2d 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h +++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoBaseR.h @@ -195,7 +195,7 @@ class CbmTrdUnpackAlgoBaseR : public CbmRecoUnpackAlgo<CbmTrdDigi, CbmTrdRawMess /** @brief Map to retrieve module channelId from asicAddress and asicChannel */ std::map<Int_t, std::vector<Int_t>> fAsicChannelMap = {}; - /** @brief Map containing the timeshift parameters for the correction of the µSlice timeshifts. The keys are the tsIdx, if no key is found, the shifts of the previous tsIdx are used again */ + /** @brief Map containing the timeshift parameters for the correction of the micro-Slice timeshifts. The keys are the tsIdx, if no key is found, the shifts of the previous tsIdx are used again */ std::map<size_t, std::vector<Int_t>> fTimeshiftsMap = {}; /** @brief Define if the first 16 channels (00..15) are found on the even (set true) or odd (false) eLinkId. @@ -211,7 +211,7 @@ class CbmTrdUnpackAlgoBaseR : public CbmRecoUnpackAlgo<CbmTrdDigi, CbmTrdRawMess /** @brief Number of missing EOM frames to finish a SOM frame */ size_t fNrMissingEom = 0; - /** @brief Number of wild null words, should only appear at the end of a µSlice */ + /** @brief Number of wild null words, should only appear at the end of a micro-Slice */ size_t fNrWildNul = 0; /** @brief Number of unknown words */ diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx index 82750288b8..fdf4c53dfd 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx +++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.cxx @@ -327,7 +327,7 @@ bool CbmTrdUnpackAlgoLegacy2020R::unpack(const fles::Timeslice* ts, std::uint16_ auto msdesc = ts->descriptor(icomp, imslice); - // Get the µslice size in bytes to calculate the number of completed words + // Get the micro-slice size in bytes to calculate the number of completed words auto mssize = msdesc.size; // Get the number of complete words in the input MS buffer. @@ -336,7 +336,7 @@ bool CbmTrdUnpackAlgoLegacy2020R::unpack(const fles::Timeslice* ts, std::uint16_ const auto mspointer = ts->content(icomp, imslice); const auto mscontent = reinterpret_cast<const size_t*>(mspointer); - // Loop over all 64bit-Spadic-Words in the current µslice + // Loop over all 64bit-Spadic-Words in the current micro-slice for (std::uint32_t iword = 0; iword < msNrWords; iword++) { // Access the actual word from the pointer auto word = static_cast<size_t>(mscontent[iword]); diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h index 4ea2439a3d..be19af2893 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h +++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoLegacy2020R.h @@ -143,13 +143,13 @@ class CbmTrdUnpackAlgoLegacy2020R : public CbmTrdUnpackAlgoBaseR { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ virtual bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); // Parameter storage members - /** @brief Vector containing the timeshift parameters for the correction of the µSlice timeshifts for a given tsIdx.*/ + /** @brief Vector containing the timeshift parameters for the correction of the micro-Slice timeshifts for a given tsIdx.*/ std::vector<std::int32_t>* fTimeshiftsParVec = nullptr; /** @brief Time of the current epoch marker */ diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.cxx index 1860d6fbbc..b894c4c891 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.cxx +++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.cxx @@ -386,16 +386,16 @@ bool CbmTrdUnpackAlgoR::unpack(const fles::Timeslice* ts, std::uint16_t icomp, U auto msdesc = ts->descriptor(icomp, imslice); - // Get the µSlice starttime relative to the timeslice starttime. + // Get the micro-Slice starttime relative to the timeslice starttime. // The UTC is already to large for storing it CbmTrdRawMessageSpadic due to a cast, caused by the multiplication with a double used in the raw message fMsStartTimeRel = msdesc.idx - fTsStartTime; fMsStartTimeRelCC = fMsStartTimeRel / fSpadic->GetClockCycle(); - // Get the hardware ids from which the current µSlice is coming + // Get the hardware ids from which the current micro-Slice is coming std::uint8_t crobId = 0; auto criId = msdesc.eq_id; - // Digest the flags from the µSlice + // Digest the flags from the micro-Slice digestMsFlags(msdesc.flags, criId, crobId); const auto mspointer = ts->content(icomp, imslice); @@ -414,13 +414,13 @@ bool CbmTrdUnpackAlgoR::unpack(const fles::Timeslice* ts, std::uint16_t icomp, U bool CbmTrdUnpackAlgoR::unpackRaw(const fles::MicrosliceDescriptor msdesc, const size_t* mscontent) { - // Get the µslice size in bytes to calculate the number of completed words + // Get the micro-slice size in bytes to calculate the number of completed words auto mssize = msdesc.size; // We have 32 bit spadic frames in this readout version std::uint32_t nwords = mssize / fBytesPerWord; - // Get the hardware ids from which the current µSlice is coming + // Get the hardware ids from which the current micro-Slice is coming std::uint8_t crobId = 0; auto criId = msdesc.eq_id; @@ -428,11 +428,11 @@ bool CbmTrdUnpackAlgoR::unpackRaw(const fles::MicrosliceDescriptor msdesc, const // We only want to count on TS_MSB per Stream per TS_MSB package (each eLink sends its own TS_MSB frame) so we store the current TS_MSB and compare it to the incoming. std::int8_t currTsMsb = 0; - // Reset the TS_MSB counter for the new µSlice we unpack + // Reset the TS_MSB counter for the new micro-Slice we unpack fNrTsMsbVec.clear(); fNrTsMsbVec.resize(fStreamsPerWord); - // Loop over all 64bit-Spadic-Words in the current µslice + // Loop over all 64bit-Spadic-Words in the current micro-slice for (std::uint32_t istream = 0; istream < fStreamsPerWord; istream++) { currTsMsb = -1; for (std::uint32_t iword = 0; iword < nwords; ++iword) { @@ -616,10 +616,10 @@ bool CbmTrdUnpackAlgoR::unpackFex(const fles::MicrosliceDescriptor msdesc, const } bool unpackOk = true; - // Get the µslice size in bytes to calculate the number of completed words + // Get the micro-slice size in bytes to calculate the number of completed words auto mssize = msdesc.size; std::uint32_t nwords = mssize / bytes; - // Get the hardware ids from which the current µSlice is coming + // Get the hardware ids from which the current micro-Slice is coming std::uint8_t crobId = 0; auto criId = msdesc.eq_id; diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.h b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.h index 8ff65e9576..f6df4997fa 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.h +++ b/reco/detectors/trd/unpack/CbmTrdUnpackAlgoR.h @@ -70,8 +70,8 @@ class CbmTrdUnpackAlgoR : public CbmTrdUnpackAlgoBaseR { /** * @brief Digest the aditional flags stored in the 4 "cccc" bits of the EPO messages. * @param frame - * @param criId id of the cri that send the µSlice - * @param criobId id of the crob that send the µSlice (currently not used set to 0 062021 PR) + * @param criId id of the cri that send the micro-Slice + * @param criobId id of the crob that send the micro-Slice (currently not used set to 0 062021 PR) * @param elinkId id of the elink from which the info message frame came * @return Spadic::MsInfoType */ @@ -81,17 +81,17 @@ class CbmTrdUnpackAlgoR : public CbmTrdUnpackAlgoBaseR { /** * @brief Digest a info message run all default information forwarding from the msg. * @param frame - * @param criId id of the cri that send the µSlice - * @param criobId id of the crob that send the µSlice (currently not used set to 0 062021 PR) + * @param criId id of the cri that send the micro-Slice + * @param criobId id of the crob that send the micro-Slice (currently not used set to 0 062021 PR) * @param elinkId id of the elink from which the info message frame came */ void digestInfoMsg(const std::uint32_t frame, std::uint16_t criId, std::uint8_t crobId, std::uint16_t elinkId); /** - * @brief Digest the flags of the currently unpacked µSlice. - * @param flags flags stored in the µSlice descriptor - * @param criId id of the cri that send the µSlice - * @param criobId id of the crob that send the µSlice (currently not used set to 0 062021 PR) + * @brief Digest the flags of the currently unpacked micro-Slice. + * @param flags flags stored in the micro-Slice descriptor + * @param criId id of the cri that send the micro-Slice + * @param criobId id of the crob that send the micro-Slice (currently not used set to 0 062021 PR) */ void digestMsFlags(const std::uint16_t flags, std::uint16_t criId, std::uint8_t crobId); @@ -139,8 +139,8 @@ class CbmTrdUnpackAlgoR : public CbmTrdUnpackAlgoBaseR { * @brief Create a CbmTrdRawMessageSpadic from the hit message input. * * @param word - * @param criId id of the cri that send the µSlice - * @param criobId id of the crob that send the µSlice (currently not used set to 0 062021 PR) + * @param criId id of the cri that send the micro-Slice + * @param criobId id of the crob that send the micro-Slice (currently not used set to 0 062021 PR) * @param istream * @return CbmTrdRawMessageSpadic * @@ -177,7 +177,7 @@ class CbmTrdUnpackAlgoR : public CbmTrdUnpackAlgoBaseR { * @return true * @return false * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); @@ -200,10 +200,10 @@ class CbmTrdUnpackAlgoR : public CbmTrdUnpackAlgoBaseR { /** @brief Number of corrupted EOM frames */ size_t fNrCorruptEom = 0; - /** @brief Start time of the current µSlice relative to the Timeslice start time in ns. */ + /** @brief Start time of the current micro-Slice relative to the Timeslice start time in ns. */ size_t fMsStartTimeRel = 0; - /** @brief Start time of the current µSlice relative to the Timeslice start time in Spadic CC. */ + /** @brief Start time of the current micro-Slice relative to the Timeslice start time in Spadic CC. */ size_t fMsStartTimeRelCC = 0; // Constants diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx index 9885486b6c..db643606d1 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx +++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.cxx @@ -311,7 +311,7 @@ bool CbmTrdUnpackFaspAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp // get MOD_id and ROB id from the equipment, using the comp map: eq_id -> (mod_id, rob_id) fMess->mod = fAsicSet.FindModuleByEqId(msdesc.eq_id, fMess->rob, fMess->elink); //printf("AB :: eq_id[0x%x] -> rob[%d] link[%d] mod[%d]\n", msdesc.eq_id, fMess->rob, fMess->elink, fMess->mod); - // Get the µslice size in bytes to calculate the number of completed words + // Get the micro-slice size in bytes to calculate the number of completed words auto mssize = msdesc.size; // Get the number of complete words in the input MS buffer. diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h index 030bd7c366..c5e0fb6c9f 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h +++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspAlgo.h @@ -201,7 +201,7 @@ class CbmTrdUnpackFaspAlgo : public CbmRecoUnpackAlgo<CbmTrdDigi> { * @param imslice index of the microslice to be unpacked * @return true if all is fine * - * @remark The content of the µslice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice + * @remark The content of the micro-slice can only be accessed via the timeslice. Hence, we need to pass the pointer to the full timeslice */ bool unpack(const fles::Timeslice* ts, std::uint16_t icomp, UInt_t imslice); diff --git a/reco/steer/CbmRecoUnpack.h b/reco/steer/CbmRecoUnpack.h index c9da5be581..de18bbe20d 100644 --- a/reco/steer/CbmRecoUnpack.h +++ b/reco/steer/CbmRecoUnpack.h @@ -397,10 +397,10 @@ class CbmRecoUnpack : public TObject { std::clock_t cpuendtime = std::clock(); auto wallendtime = std::chrono::high_resolution_clock::now(); - // Cpu time in [µs] + // Cpu time in [mus] auto cputime = 1e6 * (cpuendtime - cpustarttime) / CLOCKS_PER_SEC; algo->AddCpuTime(cputime); - // Real time in [µs] + // Real time in [mus] auto walltime = std::chrono::duration<double, std::micro>(wallendtime - wallstarttime).count(); algo->AddWallTime(walltime); @@ -408,7 +408,7 @@ class CbmRecoUnpack : public TObject { // Check some numbers from this timeslice size_t nDigis = digivec.size(); LOG(debug) << "Component " << icomp << " connected to config " << config->GetName() << " n-Digis " << nDigis - << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") µs" + << " processed in walltime(cputime) = " << walltime << "(" << cputime << cputime << ") micro s" << "this timeslice."; if (fDoPerfProf) { diff --git a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx index 3bf98a3f0d..8a2932ce60 100644 --- a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx +++ b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx @@ -440,8 +440,8 @@ void CbmMvdSensorDigitizerTask::Exec() //The digitizer acts only on particles, which crossed the station. //Particles generated in the sensor or being absorbed in this sensor are ignored if (TMath::Abs(point->GetZOut() - point->GetZ()) < 0.9 * fEpiTh) { - LOG(debug) << "hit not on chip with thickness " << fEpiTh * 10000 << "µm"; - LOG(debug) << "hit not on chip with length " << TMath::Abs(point->GetZOut() - point->GetZ()) * 10000 << "µm"; + LOG(debug) << "hit not on chip with thickness " << fEpiTh * 10000 << "mu"; + LOG(debug) << "hit not on chip with length " << TMath::Abs(point->GetZOut() - point->GetZ()) * 10000 << "mu"; continue; } // Reject for the time being light nuclei (no digitization modell yet) diff --git a/sim/detectors/sts/CbmStsDigitize.cxx b/sim/detectors/sts/CbmStsDigitize.cxx index 757f08b658..8ca908b811 100644 --- a/sim/detectors/sts/CbmStsDigitize.cxx +++ b/sim/detectors/sts/CbmStsDigitize.cxx @@ -479,7 +479,7 @@ void CbmStsDigitize::InitParams() Double_t nStripsF = dX / pitchF; Double_t nStripsB = dX / pitchB; - // The stereo sensors with 6.2092 cm width have 1024 strips à 58 mum. + // The stereo sensors with 6.2092 cm width have 1024 strips with 58 mum. if (fUserParSensor->GetClass() == CbmStsSensorClass::kDssdStereo && TMath::Abs(lX - 6.2092) < 0.0001 && TMath::Abs(pitchF - 0.0058) < 0.0001) { nStripsF = 1024.; diff --git a/sim/detectors/trd/CbmTrdDigitizer.cxx b/sim/detectors/trd/CbmTrdDigitizer.cxx index 15f0a8e0f3..432c618cf8 100644 --- a/sim/detectors/trd/CbmTrdDigitizer.cxx +++ b/sim/detectors/trd/CbmTrdDigitizer.cxx @@ -345,21 +345,21 @@ CbmTrdModuleSim* CbmTrdDigitizer::AddModule(Int_t detId) // const Char_t *ewin = "Al;C;Air;C;Al"; const Char_t* ewin = "Al;C;HC;C;Al"; Float_t widths[] = { - 1.2e-3, // 12 µm aluminized polyester foil + 1.2e-3, // 12 mu aluminized polyester foil 0.02, // carbon laminate sheets of 0.2 mm thickness 0.9, // 9mm Nomex honeycom 0.02, // carbon laminate sheets of 0.2 mm thickness - 1.2e-3, // 12 µm aluminized polyester foil + 1.2e-3, // 12 mu aluminized polyester foil }; // // light TRD-2D entrance window // const Char_t *ewin = "Al;C;HC;Po;Al"; // Float_t widths[] = { - // 1.2e-3, // 12 µm aluminized polyester foil + // 1.2e-3, // 12 mu aluminized polyester foil // 0.02, // carbon laminate sheets of 0.2 mm thickness // 0.9, // 9mm Nomex honeycom - // 0.0025, // polyethylen sheets of 50 µm thickness - // 1.2e-3, // 12 µm aluminized polyester foil + // 0.0025, // polyethylen sheets of 50 mu thickness + // 1.2e-3, // 12 mu aluminized polyester foil // }; pwidth = widths; fRadiator2D = make_shared<CbmTrdRadiator>(kTRUE, "tdr18", ewin); fRadiator2D->SetEWwidths(5, widths); diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx index 9f9b49953c..4079ea301b 100644 --- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx +++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx @@ -1346,7 +1346,7 @@ Double_t CbmTrdHitRateFastQa::CalcHitRate(HitRateGeoPara2* GeoPara, Double_t Sta } y += yStepWidth; } - return (HitRate /*/(counter/100.)*/); /*Convertes Hits/Pad -> Hits/cm² on each Pad*/ + return (HitRate /*/(counter/100.)*/); /*Convertes Hits/Pad -> Hits/cm^2 on each Pad*/ } diff --git a/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx index 888031b22f..531c101fd8 100644 --- a/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx +++ b/sim/detectors/trd/qa/CbmTrdHitRateQa.cxx @@ -967,7 +967,7 @@ Double_t CbmTrdHitRateQa::CalcHitRate(HitRateGeoPara* GeoPara, Double_t StartX, } y += yStepWidth; } - return (HitRate /*/(counter/100.)*/); /*Convertes Hits/Pad -> Hits/cm² on each Pad*/ + return (HitRate /*/(counter/100.)*/); /*Convertes Hits/Pad -> Hits/cm^2 on each Pad*/ } diff --git a/sim/transport/base/CbmStackFilter.h b/sim/transport/base/CbmStackFilter.h index c6b675270b..755cf0817d 100644 --- a/sim/transport/base/CbmStackFilter.h +++ b/sim/transport/base/CbmStackFilter.h @@ -85,7 +85,7 @@ public: /** @brief Check the stack particles for fulfilling the storage criteria ** @param particles TClonesArray of TParticles - ** @param points Map holding the number of points in each detector + ** @param points Map holding the number of points in each detector ** @return Storage decision for each index in the TClonesArray ** ** The implemented behaviour is described in the class documentation. diff --git a/sim/transport/base/CbmTarget.cxx b/sim/transport/base/CbmTarget.cxx index 239ea3c6b6..3684853e68 100644 --- a/sim/transport/base/CbmTarget.cxx +++ b/sim/transport/base/CbmTarget.cxx @@ -205,7 +205,7 @@ Double_t CbmTarget::GetStandardDensity(Int_t charge) const // TODO: Better implementation with array or the like switch (charge) { - case 1: return 0.07085; break; // Liquid Hydrogen (20ËšK at 1 atm) + case 1: return 0.07085; break; // Liquid Hydrogen (20K at 1 atm) case 4: return 1.848; break; // Beryllium case 6: return 2.260; break; // Carbon case 28: return 8.908; break; // Nickel -- GitLab From a2f409aecb5767d40a9869ebbb4bdc5d97fe9563 Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Thu, 13 Mar 2025 13:18:24 +0100 Subject: [PATCH 6/6] Fix license header --- macro/fles/readTsaFexOffline.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macro/fles/readTsaFexOffline.C b/macro/fles/readTsaFexOffline.C index eeaf1aa6f2..da59d09891 100644 --- a/macro/fles/readTsaFexOffline.C +++ b/macro/fles/readTsaFexOffline.C @@ -1,6 +1,6 @@ /* Copyright (C) 2017 Institute for Computer Science, Goethe-Universitaet Frankfurt, Frankfurt SPDX-License-Identifier: GPL-3.0-only - Authors: */ + Authors: Cruz de Jesus Garcia Chavez [committer] */ void readTsaFexOffline(TString inFile = -- GitLab