chore(parbase): Refactor print/close

Author: ChristianTackeGSI

fairroot/parbase/FairParAsciiFileIo.cxx

@@ -19,7 +19,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "FairParAsciiFileIo.h"
 
-#include "FairDetParIo.h"   // for FairDetParIo
 #include "FairGenericParAsciiFileIo.h"
 #include "FairRuntimeDb.h"   // for FairRuntimeDb
 
@@ -135,25 +134,16 @@ void FairParAsciiFileIo::close()
         file->close();
         delete file;
         file = 0;
-        filename = "";
-    }
-    if (detParIoList) {
-        detParIoList->Delete();
     }
+    FairParIo::close();
 }
 
 void FairParAsciiFileIo::print()
 {
     // prints information about the file and the detector I/Os
     if (check()) {
         cout << "Ascii I/O " << filename << " is open\n";
-        TIter next(detParIoList);
-        FairDetParIo* io;
-        cout << "detector I/Os: ";
-        while ((io = static_cast<FairDetParIo*>(next()))) {
-            cout << " " << io->GetName();
-        }
-        cout << '\n';
+        FairParIo::print();
     } else {
         cout << "No file open\n";
     }

fairroot/parbase/FairParIo.cxx

@@ -22,6 +22,7 @@
 
 #include <TCollection.h>   // for TIter
 #include <TList.h>         // for TList
+#include <iostream>
 
 FairParIo::FairParIo()
     : TObject()
@@ -40,7 +41,6 @@ FairParIo::~FairParIo()
     if (detParIoList) {
         detParIoList->Delete();
         delete detParIoList;
-        detParIoList = 0;
     }
 }
 
@@ -76,5 +76,23 @@ void FairParIo::removeDetParIo(Text_t* detName)
     // removes input/output class for a detector
     TObject* p = detParIoList->FindObject(detName);
     delete p;
-    p = 0;
+}
+
+void FairParIo::close()
+{
+    filename = "";
+    if (detParIoList) {
+        detParIoList->Delete();
+    }
+}
+
+void FairParIo::print()
+{
+    TIter next(detParIoList);
+    FairDetParIo* io;
+    std::cout << "detector I/Os: ";
+    while ((io = static_cast<FairDetParIo*>(next()))) {
+        std::cout << " " << io->GetName();
+    }
+    std::cout << '\n';
 }

fairroot/parbase/FairParIo.h

@@ -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,             *
@@ -9,12 +9,12 @@
 #define FAIRPARIO_H
 
 #include <Rtypes.h>    // for Bool_t, Text_t, etc
+#include <TList.h>     // for TList
 #include <TObject.h>   // for TObject
 #include <TString.h>   // for TString
 
 class FairDetParIo;
 class FairRtdbRun;
-class TList;
 
 class FairParIo : public TObject
 {
@@ -25,12 +25,12 @@ class FairParIo : public TObject
 
   public:
     FairParIo();
-    virtual ~FairParIo();
+    ~FairParIo() override;
     virtual FairDetParIo* getDetParIo(const Text_t*);
     virtual void setDetParIo(FairDetParIo*);
     virtual void removeDetParIo(Text_t*);
     void setInputNumber(Int_t);
-    virtual void close() { ; }
+    virtual void close();
 
     // returns the filename
     const char* getFilename() { return filename.Data(); }
@@ -41,7 +41,7 @@ class FairParIo : public TObject
     virtual void setDetParIo(Text_t*) { ; }
 
     // prints information about input/output
-    virtual void print() { ; }
+    virtual void print();
 
     // checks if the input/output is open
     virtual Bool_t check() { return kFALSE; }
@@ -51,7 +51,7 @@ class FairParIo : public TObject
 
     // sets global file pointer in ROOT if input/output is a ROOT-file
     // (code in FairParRootFileIo)
-    virtual void cd() { ; }
+    virtual void cd() {}
 
     // set and get for flag autoWritable
     void setAutoWritable(Bool_t f = kTRUE) { autoWritable = f; }

fairroot/parbase/FairParRootFileIo.cxx

@@ -24,7 +24,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #include "FairParRootFileIo.h"
 
-#include "FairDetParIo.h"    // for FairDetParIo
 #include "FairGenericParRootFileIo.h"
 #include "FairRtdbRun.h"     // for FairRtdbRun
 #include "FairRuntimeDb.h"   // for FairRuntimeDb
@@ -260,24 +259,16 @@ void FairParRootFileIo::close()
         delete file;
         file = 0;
     }
-    if (detParIoList) {
-        detParIoList->Delete();
-    }
+    FairParIo::close();
 }
 
 void FairParRootFileIo::print()
 {
     // prints the content of a open ROOT file and the list of detector I/Os
     if (file) {
         file->ls();
-        TIter next(detParIoList);
-        FairDetParIo* io;
         cout << "Root file I/O " << file->GetName() << " is open\n";
-        cout << "detector I/Os: ";
-        while ((io = static_cast<FairDetParIo*>(next()))) {
-            cout << " " << io->GetName();
-        }
-        cout << '\n';
+        FairParIo::print();
     } else {
         cout << "No ROOT file open\n";
     }