Added preprocessor conditionals to support ROOT > 5.11.2.

diff --git a/EVE/Alieve/TPCSector2D.cxx b/EVE/Alieve/TPCSector2D.cxx
index a6d95c1a187337ab05a8d7965dbdf0d856b96bea..ec1251f0f651de2ccce8b0f1f990e701285e2ce0 100644 (file)
--- a/EVE/Alieve/TPCSector2D.cxx
+++ b/EVE/Alieve/TPCSector2D.cxx
@@ -52,7 +52,11 @@ void TPCSector2D::ComputeBBox()
   const TPCSectorData::SegmentInfo&  iSeg = TPCSectorData::GetInnSeg();
   const TPCSectorData::SegmentInfo& o2Seg = TPCSectorData::GetOut2Seg();
 
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   bbox_init();
+#else
+  BBoxInit();
+#endif
   Float_t w = o2Seg.GetNMaxPads()*o2Seg.GetPadWidth()/2;
   fBBox[0] = -w;
   fBBox[1] =  w;

diff --git a/EVE/Alieve/TPCSector2DGL.cxx b/EVE/Alieve/TPCSector2DGL.cxx
index 6350b595a6697d6d5c9eb3cd9c1559b3f0644054..3d52b4956546df158d64fd1692d6410666b4ff0a 100644 (file)
--- a/EVE/Alieve/TPCSector2DGL.cxx
+++ b/EVE/Alieve/TPCSector2DGL.cxx
@@ -40,7 +40,11 @@ TPCSector2DGL::~TPCSector2DGL()
 
 Bool_t TPCSector2DGL::SetModel(TObject* obj)
 {
-  if (set_model(obj, "Alieve::TPCSector2D")) {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
+  if(set_model(obj, "Alieve::TPCSector2D")) {
+#else
+  if(SetModelCheckClass(obj, "Alieve::TPCSector2D")) {
+#endif
     fSector = (TPCSector2D*) fExternalObj;
     return true;
   }
@@ -49,7 +53,11 @@ Bool_t TPCSector2DGL::SetModel(TObject* obj)
 
 void TPCSector2DGL::SetBBox()
 {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   set_axis_aligned_bbox(((TPCSector2D*)fExternalObj)->AssertBBox());
+#else
+  SetAxisAlignedBBox(((TPCSector2D*)fExternalObj)->AssertBBox());
+#endif
 }
 
 /**************************************************************************/

diff --git a/EVE/Alieve/TPCSector3D.cxx b/EVE/Alieve/TPCSector3D.cxx
index 69accd5b462519c16f0ce189d4a37fd1b5859391..5a1fa4f060c76f17678e0cfe2af07e007bde4769 100644 (file)
--- a/EVE/Alieve/TPCSector3D.cxx
+++ b/EVE/Alieve/TPCSector3D.cxx
@@ -50,7 +50,11 @@ void TPCSector3D::ComputeBBox()
   const TPCSectorData::SegmentInfo&  iSeg = TPCSectorData::GetInnSeg();
   const TPCSectorData::SegmentInfo& o2Seg = TPCSectorData::GetOut2Seg();
 
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   bbox_init();
+#else
+  BBoxInit();
+#endif
   Float_t w = o2Seg.GetNMaxPads()*o2Seg.GetPadWidth()/2;
   fBBox[0] = -w;
   fBBox[1] =  w;

diff --git a/EVE/Reve/BoxSet.cxx b/EVE/Reve/BoxSet.cxx
index a30064eb5a652dcfd7fd570199377ea29e568754..3ae4ba115ebee75fd120d5b3db7f03479ab67a7d 100644 (file)
--- a/EVE/Reve/BoxSet.cxx
+++ b/EVE/Reve/BoxSet.cxx
@@ -53,17 +53,29 @@ BoxSet::BoxSet(const Text_t* n, const Text_t* t) :
 void BoxSet::ComputeBBox()
 {
   if(fBoxes.empty()) {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
     bbox_zero();
+#else
+    BBoxZero();
+#endif
     return;
   }
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   bbox_init();
+#else
+  BBoxInit();
+#endif
   for(std::vector<Box>::iterator q=fBoxes.begin(); q!=fBoxes.end(); ++q) {
     Float_t* p = q->vertices;
     for(int i=0; i<8; ++i, p+=3)
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
       bbox_check_point(p);
+#else
+      BBoxCheckPoint(p);
+#endif
   }
-  printf("%s BBox is x(%f,%f), y(%f,%f), z(%f,%f)\n", GetName(),
-        fBBox[0], fBBox[1], fBBox[2], fBBox[3], fBBox[4], fBBox[5]);
+  // printf("%s BBox is x(%f,%f), y(%f,%f), z(%f,%f)\n", GetName(),
+  //        fBBox[0], fBBox[1], fBBox[2], fBBox[3], fBBox[4], fBBox[5]);
 }
 
 void BoxSet::Paint(Option_t* /*option*/)

diff --git a/EVE/Reve/BoxSetGL.cxx b/EVE/Reve/BoxSetGL.cxx
index 32444efcf01fd729c22d4931819ecf7566d3e053..f7e1cf2017d68857eeb6e44f902d992e5de06b2b 100644 (file)
--- a/EVE/Reve/BoxSetGL.cxx
+++ b/EVE/Reve/BoxSetGL.cxx
@@ -30,12 +30,20 @@ BoxSetGL::~BoxSetGL()
 
 Bool_t BoxSetGL::SetModel(TObject* obj)
 {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   return set_model(obj, "Reve::BoxSet");
+#else
+  return SetModelCheckClass(obj, "Reve::BoxSet");
+#endif
 }
 
 void BoxSetGL::SetBBox()
 {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   set_axis_aligned_bbox(((BoxSet*)fExternalObj)->AssertBBox());
+#else
+  SetAxisAlignedBBox(((BoxSet*)fExternalObj)->AssertBBox());
+#endif
 }
 
 /**************************************************************************/

diff --git a/EVE/Reve/QuadSet.cxx b/EVE/Reve/QuadSet.cxx
index 9cb4355461b1c6793580f856d8644178bddec124..069409aa8bbe3019cbb4385bc16f838b3f18ef46 100644 (file)
--- a/EVE/Reve/QuadSet.cxx
+++ b/EVE/Reve/QuadSet.cxx
@@ -52,10 +52,10 @@ Quad::Quad(TRandom& rnd, Float_t origin, Float_t size)
 ClassImp(Reve::QuadSet)
 
 
-void QuadSet::Init()
-{
-  fTrans = false;
-}
+QuadSet::QuadSet(const Text_t* n, const Text_t* t) :
+  TNamed(n, t),
+  fTrans(false)
+{}
 
 void QuadSet::Test(Int_t nquads)
 {
@@ -141,18 +141,28 @@ void QuadSet::Paint(Option_t* )
 void QuadSet::ComputeBBox()
 {
   if(fQuads.empty()) {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
     bbox_zero();
+#else
+    BBoxZero();
+#endif
     return;
   }
-
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   bbox_init();
-
+#else
+  BBoxInit();
+#endif
   for(std::vector<Quad>::iterator q=fQuads.begin(); q!=fQuads.end(); ++q) {
     Float_t* p = q->vertices;
     for(int i=0; i<4; ++i, p+=3)
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
       bbox_check_point(p);
+#else
+      BBoxCheckPoint(p);
+#endif
   }
 
   // printf("%s BBox is x(%f,%f), y(%f,%f), z(%f,%f)\n", GetName(),
-  //    fBBox[0], fBBox[1], fBBox[2], fBBox[3], fBBox[4], fBBox[5]);
+  //        fBBox[0], fBBox[1], fBBox[2], fBBox[3], fBBox[4], fBBox[5]);
 }

diff --git a/EVE/Reve/QuadSet.h b/EVE/Reve/QuadSet.h
index 144e2a3a727e086d5305dfcfc6f15c35432ddaad..6d1e90b40f08934e0dffc4614811eb10c6b33fd5 100644 (file)
--- a/EVE/Reve/QuadSet.h
+++ b/EVE/Reve/QuadSet.h
@@ -42,16 +42,13 @@ class QuadSet : public TNamed, public TAtt3D, public TAttBBox
 {
   friend class QuadSetGL;
 
-  void Init();
-
 protected:
   std::vector<Quad> fQuads;
   Double_t          fMatrix[16];
   Bool_t            fTrans;
 
 public:
-  QuadSet(const Text_t* n="QuadSet", const Text_t* t="") : TNamed(n, t)
-  { Init(); }
+  QuadSet(const Text_t* n="QuadSet", const Text_t* t="");
   virtual ~QuadSet() {}
 
   Bool_t GetTrans() const { return fTrans; }

diff --git a/EVE/Reve/QuadSetGL.cxx b/EVE/Reve/QuadSetGL.cxx
index aecabe4c8fcb7531378b7b5c77e88e13170bca02..c24e3c275971e0d021ffeacc599e9cb7202f9e69 100644 (file)
--- a/EVE/Reve/QuadSetGL.cxx
+++ b/EVE/Reve/QuadSetGL.cxx
@@ -30,12 +30,20 @@ QuadSetGL::~QuadSetGL()
 
 Bool_t QuadSetGL::SetModel(TObject* obj)
 {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   return set_model(obj, "Reve::QuadSet");
+#else
+  return SetModelCheckClass(obj, "Reve::QuadSet");
+#endif
 }
 
 void QuadSetGL::SetBBox()
 {
+#if ROOT_VERSION_CODE <= ROOT_VERSION(5,11,2)
   set_axis_aligned_bbox(((QuadSet*)fExternalObj)->AssertBBox());
+#else
+  SetAxisAlignedBBox(((QuadSet*)fExternalObj)->AssertBBox());
+#endif
 }
 
 /**************************************************************************/