fix most new clang-tidy warnings

ChristianTackeGSI · dennisklein · commit 7d9aadee6d15 · 2023-08-03T11:18:15.000+02:00
Clang-Tidy 15 has added some more warnings.
Fix most of them.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -67,7 +67,7 @@ def jobMatrix(String prefix, String type, List specs) {
           if (check == "warnings") {
             recordIssues(tools: [clangTidy(pattern: logpattern)],
                          filters: [excludeFile('build/.*/G__.*[.]cxx')],
-                         qualityGates: [[threshold: 3, type: 'NEW', unstable: true]],
+                         qualityGates: [[threshold: 4, type: 'NEW', unstable: true]],
                          ignoreFailedBuilds: false,
                          skipBlames: true)
             archiveArtifacts(artifacts: logpattern, allowEmptyArchive: true, fingerprint: true)
diff --git a/examples/MQ/pixelDetector/src/devices/FairMQPixelSamplerBin.cxx b/examples/MQ/pixelDetector/src/devices/FairMQPixelSamplerBin.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -96,8 +96,8 @@ bool FairMQPixelSamplerBin::ConditionalRun()
     for (int iobj = 0; iobj < fNObjects; iobj++) {
         if (strcmp(fInputObjects[iobj]->GetName(), "EventHeader.") == 0) {
             PixelPayload::EventHeader* header = new PixelPayload::EventHeader();
-            header->fRunId = ((FairEventHeader*)fInputObjects[iobj])->GetRunId();
-            header->fMCEntryNo = ((FairEventHeader*)fInputObjects[iobj])->GetMCEntryNumber();
+            header->fRunId = static_cast<FairEventHeader*>(fInputObjects[iobj])->GetRunId();
+            header->fMCEntryNo = static_cast<FairEventHeader*>(fInputObjects[iobj])->GetMCEntryNumber();
             header->fPartNo = 0;
             auto msgHeader(NewMessage(header, sizeof(PixelPayload::EventHeader), [](void* data, void* /*hint*/) {
                 delete static_cast<PixelPayload::EventHeader*>(data);
@@ -106,15 +106,15 @@ bool FairMQPixelSamplerBin::ConditionalRun()
             // LOG(debug) << "-----------------------------";
             // LOG(debug) << "first part has size = " << sizeof(PixelPayload::EventHeader);
         } else {
-            Int_t nofEntries = ((TClonesArray*)fInputObjects[iobj])->GetEntries();
+            Int_t nofEntries = static_cast<TClonesArray*>(fInputObjects[iobj])->GetEntries();
             size_t digisSize = nofEntries * sizeof(PixelPayload::Digi);
 
             auto msgTCA(NewMessage(digisSize));
 
             PixelPayload::Digi* digiPayload = static_cast<PixelPayload::Digi*>(msgTCA->GetData());
 
             for (int idigi = 0; idigi < nofEntries; idigi++) {
-                PixelDigi* digi = static_cast<PixelDigi*>(((TClonesArray*)fInputObjects[iobj])->At(idigi));
+                auto digi = static_cast<PixelDigi*>(static_cast<TClonesArray*>(fInputObjects[iobj])->At(idigi));
                 if (!digi) {
                     continue;
                 }
diff --git a/examples/advanced/Tutorial3/MQ/samplerTask/SamplerTask.h b/examples/advanced/Tutorial3/MQ/samplerTask/SamplerTask.h
@@ -47,7 +47,7 @@ class SamplerTask : public FairTask
     void SetEventIndex(Long64_t eventIndex) { fEventIndex = eventIndex; }
     void SetBranch(const std::string& branch) { fBranch = branch; }
 
-    void GetPayload(std::unique_ptr<fair::mq::Message>& msg) { msg = move(fPayload); }
+    void GetPayload(std::unique_ptr<fair::mq::Message>& msg) { msg = std::move(fPayload); }
     void SetTransport(std::shared_ptr<fair::mq::TransportFactory> factory) { fTransportFactory = factory; }
 
   protected:
diff --git a/fairroot/base/sim/FairMCApplication.cxx b/fairroot/base/sim/FairMCApplication.cxx
@@ -718,8 +718,8 @@ void FairMCApplication::ConstructOpGeometry()
         NK = medium->getNpckov();
         if (NK > 0) {
             Int_t Mid = 0;
-            TGeoMedium* Med = 0;
-            if (gGeoManager && (Med = gGeoManager->GetMedium(medium->GetName()))) {
+            TGeoMedium* Med = (gGeoManager ? gGeoManager->GetMedium(medium->GetName()) : nullptr);
+            if (Med) {
                 Mid = Med->GetId();
             } else {
                 Mid = medium->getMediumIndex();
diff --git a/fairroot/datamatch/FairMCObject.cxx b/fairroot/datamatch/FairMCObject.cxx
@@ -65,14 +65,12 @@ void FairMCObject::AddLink(FairLink link, int index)
 
 void FairMCObject::AdoptSize(int index)
 {
-    int start = fStage.size();
     while (static_cast<int>(fStage.size()) < index + 1) {
         FairMCEntry myVec;
         myVec.SetPos(fStage.size());
         myVec.SetSource(GetStageId());
         myVec.SetPersistanceCheck(kFALSE);
         fStage.push_back(myVec);
-        start++;
     }
 }
 
diff --git a/fairroot/generators/FairEvtGenGenerator.cxx b/fairroot/generators/FairEvtGenGenerator.cxx
@@ -36,7 +36,8 @@ FairEvtGenGenerator::FairEvtGenGenerator(const char* fileName)
     , fDensityFunction(0)
 {
     LOG(info) << "FairEvtGenGenerator: Opening input file " << fileName;
-    if ((fInputFile = fopen(fFileName, "r")) == nullptr)
+    fInputFile = fopen(fFileName, "r");
+    if (!fInputFile)
     //  fInputFile = new ifstream(fFileName);
     //  if ( ! fInputFile->is_open() )
     {
@@ -55,7 +56,8 @@ FairEvtGenGenerator::FairEvtGenGenerator(const char* fileName, Double_t Rsigma,
     , fDensityFunction(DensityFunction)
 {
     LOG(info) << "FairEvtGenGenerator: Opening input file " << fileName;
-    if ((fInputFile = fopen(fFileName, "r")) == nullptr) {
+    fInputFile = fopen(fFileName, "r");
+    if (!fInputFile) {
         LOG(fatal) << "Cannot open input file.";
     }
 }
diff --git a/fairroot/geobase/FairGeoVector.h b/fairroot/geobase/FairGeoVector.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -155,7 +155,7 @@ inline FairGeoVector& FairGeoVector::operator=(const FairGeoVector& v)
 
 inline Bool_t FairGeoVector::operator==(const FairGeoVector& v) const
 {
-    return (!(v.getX() != x || v.getY() != y || v.getZ() != z));
+    return (v.x == x) && (v.y == y) && (v.z == z);
 }
 
 inline Bool_t FairGeoVector::operator!=(const FairGeoVector& v) const
@@ -165,22 +165,22 @@ inline Bool_t FairGeoVector::operator!=(const FairGeoVector& v) const
 /// check with ilse
 inline Bool_t FairGeoVector::operator<(const Double_t a)
 {
-    return !(x >= a || y >= a || z >= a);
+    return (x < a) && (y < a) && (z < a);
 }
 
 inline Bool_t FairGeoVector::operator<=(const Double_t a)
 {
-    return !(x > a || y > a || z > a);
+    return (x <= a) && (y <= a) && (z <= a);
 }
 
 inline Bool_t FairGeoVector::operator>(const Double_t a)
 {
-    return !(x <= a || y <= a || z <= a);
+    return (x > a) && (y > a) && (z > a);
 }
 
 inline Bool_t FairGeoVector::operator>=(const Double_t a)
 {
-    return !(x < a || y < a || z < a);
+    return (x >= a) & (y >= a) && (z >= a);
 }
 
 inline FairGeoVector& FairGeoVector::operator+=(const Double_t a)
diff --git a/fairroot/mcconfigurator/FairYamlVMCConfig.cxx b/fairroot/mcconfigurator/FairYamlVMCConfig.cxx
@@ -41,7 +41,7 @@ FairYamlVMCConfig::FairYamlVMCConfig()
 void FairYamlVMCConfig::Setup(const char* mcEngine)
 {
     fMCEngine = mcEngine;
-    if (!((strcmp(mcEngine, "TGeant4") == 0) || (strcmp(mcEngine, "TGeant3") == 0))) {
+    if ((strcmp(mcEngine, "TGeant4") != 0) && (strcmp(mcEngine, "TGeant3") != 0)) {
         LOG(fatal) << "FairYamlVMCConfig::Setup() Engine \"" << mcEngine << "\" unknown!";
     }
 
diff --git a/fairroot/parbase/FairContFact.cxx b/fairroot/parbase/FairContFact.cxx
@@ -182,22 +182,25 @@ FairParSet* FairContFact::getContainer(const char* name)
     // createContainer(FairContainer*), which is implemented in the derived classes
     // and calls the corresponding constructor. Then the pointer it added in the
     // runtime database.
-    auto c = static_cast<FairContainer*>((containers->FindObject(name)));
-
-    FairParSet* cont = nullptr;
-    if (c) {
-        TString cn = c->getConcatName();
-        FairRuntimeDb* rtdb = FairRuntimeDb::instance();
-        if (!(cont = rtdb->findContainer(c->getConcatName().Data()))) {
-            if (strlen(c->getActualContext()) == 0) {
-                c->setActualContext(c->getDefaultContext());
-            }
-            cont = createContainer(c);
-            if (cont) {
-                rtdb->addContainer(cont);
-            }
-        }
+    auto c = static_cast<FairContainer*>(containers->FindObject(name));
+    if (!c) {
+        return nullptr;
+    }
+
+    FairRuntimeDb* rtdb = FairRuntimeDb::instance();
+    FairParSet* cont = rtdb->findContainer(c->getConcatName().Data());
+    if (cont) {
+        return cont;
     }
+
+    if (strlen(c->getActualContext()) == 0) {
+        c->setActualContext(c->getDefaultContext());
+    }
+    cont = createContainer(c);
+    if (cont) {
+        rtdb->addContainer(cont);
+    }
+
     return cont;
 }
 
diff --git a/fairroot/parbase/FairParAsciiFileIo.cxx b/fairroot/parbase/FairParAsciiFileIo.cxx
@@ -50,7 +50,7 @@ Bool_t FairParAsciiFileIo::open(const Text_t* fname, const Text_t* status)
     // if a file is already open, this file will be closed
     // activates detector I/Os
     close();
-    if (!((strcmp(status, "in") == 0) || (strcmp(status, "out") == 0))) {
+    if ((strcmp(status, "in") != 0) && (strcmp(status, "out") != 0)) {
         cout << "Put the right stream option for file " << fname
              << "\n  writing state : out\n   reading state : in  \nopen  aborted \n";
         return kFALSE;
diff --git a/fairroot/parbase/FairRuntimeDb.cxx b/fairroot/parbase/FairRuntimeDb.cxx
@@ -350,7 +350,8 @@ Int_t FairRuntimeDb::findOutputVersion(FairParSet* cont)
                 run = static_cast<FairRtdbRun*>(runs->At(i));
                 vers = run->getParVersion(name);
                 if (vers->getInputVersion(1) == in1 && vers->getInputVersion(2) == in2) {
-                    if ((v = vers->getRootVersion()) != 0) {
+                    v = vers->getRootVersion();
+                    if (v != 0) {
                         return v;
                     }
                 }
@@ -367,7 +368,8 @@ Int_t FairRuntimeDb::findOutputVersion(FairParSet* cont)
     while ((run = static_cast<FairRtdbRun*>(next()))) {
         vers = run->getParVersion(name);
         if (vers->getInputVersion(1) == in1 && vers->getInputVersion(2) == in2) {
-            if ((v = vers->getRootVersion()) != 0) {
+            v = vers->getRootVersion();
+            if (v != 0) {
                 return v;
             }
         }
diff --git a/fairroot/tools/FairSystemInfo.cxx b/fairroot/tools/FairSystemInfo.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -62,8 +62,8 @@ size_t FairSystemInfo::GetCurrentMemory()
     /* Linux ---------------------------------------------------- */
     unsigned long rss = 0L;
     unsigned long pagesize = static_cast<unsigned long>(sysconf(_SC_PAGESIZE));
-    FILE* fp = NULL;
-    if ((fp = fopen("/proc/self/statm", "r")) == NULL)
+    FILE* fp = fopen("/proc/self/statm", "r");
+    if (!fp)
         return (size_t)0L; /* Can't open? */
     if (fscanf(fp, "%*s%ld", &rss) != 1) {
         fclose(fp);

Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,12 @@ void FairMCObject::AddLink(FairLink link, int index)`
`65`	`65`
`66`	`66`	`void FairMCObject::AdoptSize(int index)`
`67`	`67`	`{`
`68`		`- int start = fStage.size();`
`69`	`68`	`while (static_cast<int>(fStage.size()) < index + 1) {`
`70`	`69`	`FairMCEntry myVec;`
`71`	`70`	`myVec.SetPos(fStage.size());`
`72`	`71`	`myVec.SetSource(GetStageId());`
`73`	`72`	`myVec.SetPersistanceCheck(kFALSE);`
`74`	`73`	`fStage.push_back(myVec);`
`75`		`- start++;`
`76`	`74`	`}`
`77`	`75`	`}`
`78`	`76`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ FairEvtGenGenerator::FairEvtGenGenerator(const char* fileName)`
`36`	`36`	`, fDensityFunction(0)`
`37`	`37`	`{`
`38`	`38`	`LOG(info) << "FairEvtGenGenerator: Opening input file " << fileName;`
`39`		`- if ((fInputFile = fopen(fFileName, "r")) == nullptr)`
	`39`	`+ fInputFile = fopen(fFileName, "r");`
	`40`	`+ if (!fInputFile)`
`40`	`41`	`// fInputFile = new ifstream(fFileName);`
`41`	`42`	`// if ( ! fInputFile->is_open() )`
`42`	`43`	`{`
`@@ -55,7 +56,8 @@ FairEvtGenGenerator::FairEvtGenGenerator(const char* fileName, Double_t Rsigma,`
`55`	`56`	`, fDensityFunction(DensityFunction)`
`56`	`57`	`{`
`57`	`58`	`LOG(info) << "FairEvtGenGenerator: Opening input file " << fileName;`
`58`		`- if ((fInputFile = fopen(fFileName, "r")) == nullptr) {`
	`59`	`+ fInputFile = fopen(fFileName, "r");`
	`60`	`+ if (!fInputFile) {`
`59`	`61`	`LOG(fatal) << "Cannot open input file.";`
`60`	`62`	`}`
`61`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/********************************************************************************`
`2`		`- * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *`
	`2`	`+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *`
`3`	`3`	`* *`
`4`	`4`	`* This software is distributed under the terms of the *`
`5`	`5`	`* GNU Lesser General Public Licence (LGPL) version 3, *`
`@@ -155,7 +155,7 @@ inline FairGeoVector& FairGeoVector::operator=(const FairGeoVector& v)`
`155`	`155`
`156`	`156`	`inline Bool_t FairGeoVector::operator==(const FairGeoVector& v) const`
`157`	`157`	`{`
`158`		`- return (!(v.getX() != x \|\| v.getY() != y \|\| v.getZ() != z));`
	`158`	`+ return (v.x == x) && (v.y == y) && (v.z == z);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`inline Bool_t FairGeoVector::operator!=(const FairGeoVector& v) const`
`@@ -165,22 +165,22 @@ inline Bool_t FairGeoVector::operator!=(const FairGeoVector& v) const`
`165`	`165`	`/// check with ilse`
`166`	`166`	`inline Bool_t FairGeoVector::operator<(const Double_t a)`
`167`	`167`	`{`
`168`		`- return !(x >= a \|\| y >= a \|\| z >= a);`
	`168`	`+ return (x < a) && (y < a) && (z < a);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`inline Bool_t FairGeoVector::operator<=(const Double_t a)`
`172`	`172`	`{`
`173`		`- return !(x > a \|\| y > a \|\| z > a);`
	`173`	`+ return (x <= a) && (y <= a) && (z <= a);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`inline Bool_t FairGeoVector::operator>(const Double_t a)`
`177`	`177`	`{`
`178`		`- return !(x <= a \|\| y <= a \|\| z <= a);`
	`178`	`+ return (x > a) && (y > a) && (z > a);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`inline Bool_t FairGeoVector::operator>=(const Double_t a)`
`182`	`182`	`{`
`183`		`- return !(x < a \|\| y < a \|\| z < a);`
	`183`	`+ return (x >= a) & (y >= a) && (z >= a);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`inline FairGeoVector& FairGeoVector::operator+=(const Double_t a)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ FairYamlVMCConfig::FairYamlVMCConfig()`
`41`	`41`	`void FairYamlVMCConfig::Setup(const char* mcEngine)`
`42`	`42`	`{`
`43`	`43`	`fMCEngine = mcEngine;`
`44`		`- if (!((strcmp(mcEngine, "TGeant4") == 0) \|\| (strcmp(mcEngine, "TGeant3") == 0))) {`
	`44`	`+ if ((strcmp(mcEngine, "TGeant4") != 0) && (strcmp(mcEngine, "TGeant3") != 0)) {`
`45`	`45`	`LOG(fatal) << "FairYamlVMCConfig::Setup() Engine \"" << mcEngine << "\" unknown!";`
`46`	`46`	`}`
`47`	`47`