Improving compatibility with legacy code

Author: TobiasStockmanns

eventdisplay/FairBoxSetDraw.cxx

@@ -32,28 +32,20 @@ Double_t fX, fY, fZ;
 FairBoxSetDraw::FairBoxSetDraw()
     : FairTask("FairBoxSetDraw", 0)
     , fVerbose(0)
-    , fEventManager(nullptr)
-    , fq(nullptr)
-    , fX(0.3)
-    , fY(0.3)
-    , fZ(0.3)
-    , fTimeWindowPlus(0.)
-    , fTimeWindowMinus(0.)
 {}
 
 FairBoxSetDraw::FairBoxSetDraw(const char* name, FairDataSourceI* dataSource, Int_t iVerbose)
     : FairTask(name, iVerbose)
     , fVerbose(iVerbose)
-    , fEventManager(nullptr)
-    , fq(nullptr)
-    , fX(0.3)
-    , fY(0.3)
-    , fZ(0.3)
-    , fTimeWindowPlus(0.)
-    , fTimeWindowMinus(0.)
     , fDataSource(dataSource)
 {}
 
+FairBoxSetDraw::FairBoxSetDraw(const char* name, Int_t iVerbose)
+    : FairTask(name, iVerbose)
+    , fVerbose(iVerbose)
+    , fDataSource(nullptr)
+{}
+
 InitStatus FairBoxSetDraw::Init()
 {
     LOG(debug) << "FairBoxSetDraw::Init()";

eventdisplay/FairBoxSetDraw.h

@@ -45,10 +45,18 @@ class FairBoxSetDraw : public FairTask
 
     /** Standard constructor
      *@param name        Name of task
+     *@param dataSource  Input source of the data to be displayed
      *@param iVerbose    Verbosity level
      **/
     FairBoxSetDraw(const char* name, FairDataSourceI* dataSource, Int_t iVerbose = 1);
 
+    /** Legacy constructor
+     *  Sets the input dataSource to nullptr which sets it to read in TClonesArray
+     *@param name        Name of task
+     *@param iVerbose    Verbosity level
+     **/
+    FairBoxSetDraw(const char* name, Int_t iVerbose = 1);
+
     /** Destructor **/
     virtual ~FairBoxSetDraw();
 
@@ -87,12 +95,14 @@ class FairBoxSetDraw : public FairTask
     virtual Int_t GetValue(TObject* obj, Int_t i);
     virtual void AddBoxes(FairBoxSet* set, TObject* obj, Int_t i = 0);
 
-    FairEventManager* fEventManager;   //!
-    FairBoxSet* fq;                    //!
-    Double_t fX, fY, fZ;
+    FairEventManager* fEventManager = nullptr;   //!
+    FairBoxSet* fq = nullptr;                    //!
+    Double_t fX{0.3};
+    Double_t fY{0.3};
+    Double_t fZ{0.3};
 
-    Double_t fTimeWindowPlus;
-    Double_t fTimeWindowMinus;
+    Double_t fTimeWindowPlus{0.};
+    Double_t fTimeWindowMinus{0.};
     FairDataSourceI* fDataSource = nullptr;
 
   private:

eventdisplay/FairHitDraw.cxx

@@ -24,6 +24,10 @@ FairHitDraw::FairHitDraw(const char* name, FairDataSourceI* dataSource, Int_t iV
     : FairBoxSetDraw(name, dataSource, iVerbose)
 {}
 
+FairHitDraw::FairHitDraw(const char* name, Int_t iVerbose)
+    : FairBoxSetDraw(name, iVerbose)
+{}
+
 TVector3 FairHitDraw::GetVector(TObject* obj)
 {
     FairHit* hit = static_cast<FairHit*>(obj);

eventdisplay/FairHitDraw.h

@@ -31,9 +31,17 @@ class FairHitDraw : public FairBoxSetDraw
 
     /** Standard constructor
      *@param name        Name of task
+     *@param dataSource  Input container for data to be displayed
      *@param iVerbose    Verbosity level
      **/
-    FairHitDraw(const char* name, FairDataSourceI* dataSource = nullptr, Int_t iVerbose = 1);
+    FairHitDraw(const char* name, FairDataSourceI* dataSource, Int_t iVerbose = 1);
+
+    /** Legacy constructor
+     *@param name        Name of task
+     *@param dataSource  Input container for data to be displayed
+     *@param iVerbose    Verbosity level
+     **/
+    FairHitDraw(const char* name, Int_t iVerbose = 1);
 
   protected:
     TVector3 GetVector(TObject* obj);

eventdisplay/FairHitPointSetDraw.h

@@ -15,6 +15,7 @@
 #ifndef FAIRHITPOINTSETDRAW_H_
 #define FAIRHITPOINTSETDRAW_H_
 
+#include "FairDataSourceI.h"
 #include "FairPointSetDraw.h"   // for FairPointSetDraw
 
 #include <Rtypes.h>   // for FairHitPointSetDraw::Class, etc

eventdisplay/FairPointSetDraw.h

@@ -37,11 +37,23 @@ class FairPointSetDraw : public FairTask
 
     /** Standard constructor
      *@param name        Name of task
+     *@param dataSource  Input data container for data to be displayed
+     *@param color		 Color of points
+     *@param mstyle		 Style of points
      *@param iVerbose    Verbosity level
      **/
-    FairPointSetDraw(const char* name, Color_t color, Style_t mstyle, Int_t iVerbose = 1);
     FairPointSetDraw(const char* name, FairDataSourceI* dataSource, Color_t color, Style_t mstyle, Int_t iVerbose = 1);
 
+    /** Legacy constructor
+     *  Input data source will be set to nullptr which implicitly activates the read in via TClonesArray branch
+     *@param name        Name of task
+     *@param color		 Color of points
+     *@param mstyle		 Style of points
+     *@param iVerbose    Verbosity level
+     **/
+
+    FairPointSetDraw(const char* name, Color_t color, Style_t mstyle, Int_t iVerbose = 1);
+
     /** Destructor **/
     virtual ~FairPointSetDraw();
 
@@ -64,7 +76,7 @@ class FairPointSetDraw : public FairTask
     virtual InitStatus Init();
     /** Action after each event**/
     virtual void Finish();
-    TEvePointSet* fq;                //!
+    TEvePointSet* fq = nullptr;      //!
     Color_t fColor;                  //!
     Style_t fStyle;                  //!
     Bool_t fUseTimeOffset = kTRUE;   //!