chore(parbase): Some cleanup of FairParSet

Author: karabowi

fairroot/parbase/FairParSet.cxx

@@ -35,7 +35,7 @@ FairParSet::FairParSet(const char* name, const char* title, const char* context,
     , author("")
     , description("")
 {
-    for (Int_t i = 0; i < 3; i++) {
+    for (int i = 0; i < 3; i++) {
         versions[i] = -1;
     }
 }
@@ -50,7 +50,7 @@ Bool_t FairParSet::init()
     // FairRunAna* fRun =FairRunAna::Instance();
     // cout << "-I-  FairParSet::init() " << GetName() << endl;
 
-    Bool_t allFound = kFALSE;
+    bool allFound = false;
     FairParIo* io = 0;
     if (rtdb) {
         io = rtdb->getFirstInput();
@@ -91,44 +91,36 @@ Int_t FairParSet::write()
 void FairParSet::print()
 {
     // prints information about container (versions,status,hasChanged...)
-    cout << "-----  " << GetName() << "  -----" << '\n';
+    LOG(info) << "-----  " << GetName() << "  -----";
     if (!paramContext.IsNull()) {
-        cout << "Context/Purpose:       " << paramContext << '\n';
+        LOG(info) << "Context/Purpose:       " << paramContext;
     }
     if (!author.IsNull()) {
-        cout << "Author:                " << author << '\n';
+        LOG(info) << "Author:                " << author;
     }
     if (!description.IsNull()) {
-        cout << "Description:           " << description << '\n';
-    }
-    cout << "first input version:   " << versions[1] << '\n';
-    cout << "second input version:  " << versions[2] << '\n';
-    if (changed) {
-        cout << "has changed" << '\n';
-    } else {
-        cout << "has not changed" << '\n';
-    }
-    if (status) {
-        cout << "is static" << '\n';
-    } else {
-        cout << "is not static" << '\n';
+        LOG(info) << "Description:           " << description;
     }
+    LOG(info) << "first input version:   " << versions[1];
+    LOG(info) << "second input version:  " << versions[2];
+    LOG(info) << "has" << (changed ? "" : " not") << " changed";
+    LOG(info) << "is" << (status ? "" : " not") << " static";
 }
 
 void FairParSet::clear()
 {
-    status = kFALSE;
+    status = false;
     resetInputVersions();
 }
 
 void FairParSet::resetInputVersions()
 {
     // resets the input versions if the container is not static
     if (!status) {
-        for (Int_t i = 0; i < 3; i++) {
+        for (int i = 0; i < 3; i++) {
             versions[i] = -1;
         }
-        changed = kFALSE;
+        changed = false;
     }
 }
 
@@ -150,7 +142,7 @@ FairParSet::FairParSet(const FairParSet& from)
  fTitle   = from.fTitle;
  detName  = from.detName;
 */
-    for (Int_t i = 0; i < 3; i++)
+    for (int i = 0; i < 3; i++)
         versions[i] = from.versions[i];
     /*
  status   = from.status;

fairroot/parbase/FairParSet.h

@@ -20,16 +20,16 @@ class FairParSet : public TObject
     TString fName;          //
     TString fTitle;         //
     TString detName;        //! name of the detector the container belongs to
-    Int_t versions[3];      //! versions of container in the 2 possible inputs
-    Bool_t status;          //! static flag
-    Bool_t changed;         //! flag is kTRUE if parameters have changed
-    Bool_t owned;           //! if flag is KTRUE FairDB has the par. class ownership
+    int versions[3];        //! versions of container in the 2 possible inputs
+    bool status;            //! static flag
+    bool changed;           //! flag is kTRUE if parameters have changed
+    bool owned;             //! if flag is KTRUE FairDB has the par. class ownership
     TString paramContext;   // Context/purpose for parameters and conditions
     TString author;         // Author of parameters
     TString description;    // Description of parameters
 
   public:
-    FairParSet(const char* name = "", const char* title = "", const char* context = "", Bool_t owner = kFALSE);
+    FairParSet(const char* name = "", const char* title = "", const char* context = "", bool owner = false);
     virtual ~FairParSet() {}
 
     const char* GetName() const override { return fName.Data(); }
@@ -45,13 +45,13 @@ class FairParSet : public TObject
     const char* getDetectorName() { return detName.Data(); }
     void resetInputVersions();
 
-    void setInputVersion(Int_t v = -1, Int_t i = 0)
+    void setInputVersion(int v = -1, int i = 0)
     {
         if (i >= 0 && i < 3) {
             versions[i] = v;
         }
     }
-    Int_t getInputVersion(Int_t i)
+    int getInputVersion(int i)
     {
         if (i >= 0 && i < 3) {
             return versions[i];
@@ -60,14 +60,14 @@ class FairParSet : public TObject
         }
     }
 
-    void setStatic(Bool_t flag = kTRUE) { status = flag; }
-    Bool_t isStatic() { return status; }
+    void setStatic(bool flag = kTRUE) { status = flag; }
+    bool isStatic() { return status; }
 
-    void setOwnership(Bool_t flag = kTRUE) { owned = flag; }
-    Bool_t isOwned() { return owned; }
+    void setOwnership(bool flag = kTRUE) { owned = flag; }
+    bool isOwned() { return owned; }
 
-    void setChanged(Bool_t flag = kTRUE) { changed = flag; }
-    Bool_t hasChanged() { return changed; }
+    void setChanged(bool flag = kTRUE) { changed = flag; }
+    bool hasChanged() { return changed; }
 
     const char* getParamContext() const { return paramContext.Data(); }