--- PamCut/MiscCuts/TrackRedGeomCut/TrackRedGeomCut.h	2010/01/18 16:34:18	1.1
+++ PamCut/MiscCuts/TrackRedGeomCut/TrackRedGeomCut.h	2010/07/08 14:00:09	1.2
@@ -11,7 +11,7 @@
 #define TRACKREDGEOMCUT_H_
 
 #include "../../PamCutBase/PamCutBase.h"
-#include "../../CaloAxis2.h"
+#include <CaloAxis.h>
 
 /*! @brief The track reduced acceptance (i.e. rectangular pipe) cut.
  * This cut checks if the track is inside the reduced acceptance chosen.
@@ -32,7 +32,10 @@
    * @param yDim The Y-side length in cm.
    */
   TrackRedGeomCut(const char *cutName, PamTrack **pamTrack, float xDim, float yDim) :
-    PamCut(cutName), _pamTrack(pamTrack), _xCaloAxis(NULL), _yCaloAxis(NULL), _xDim(xDim), _yDim(yDim) {
+    PamCut(cutName), _pamTrack(pamTrack), _xDim(xDim), _yDim(yDim) {
+#ifndef NO_CALOAXIS
+    _xCaloAxis = _yCaloAxis = NULL;
+#endif /* NO_CALOAXIS */
   }
 
   /*! @brief Constructor.
@@ -46,9 +49,12 @@
    * @param xDim The X-side length in cm.
    * @param yDim The Y-side length in cm.
    */
+
+#ifndef NO_CALOAXIS
   TrackRedGeomCut(const char *cutName, CaloAxis *xCaloAxis, CaloAxis *yCaloAxis, float xDim, float yDim) :
     PamCut(cutName), _pamTrack(NULL), _xCaloAxis(xCaloAxis), _yCaloAxis(yCaloAxis), _xDim(xDim), _yDim(yDim) {
   }
+#endif /* NO_CALOAXIS */
 
   /*! @brief Destructor. */
   ~TrackRedGeomCut() {
@@ -65,7 +71,9 @@
 private:
 
   PamTrack **_pamTrack;
+#ifndef NO_CALOAXIS
   CaloAxis *_xCaloAxis, *_yCaloAxis;
+#endif /* NO_CALOAXIS */
   float _xDim;
   float _yDim;