--- PamCut/CaloCuts/CaloNotIntCut/CaloNotIntCut.h	2009/11/03 16:07:20	1.3
+++ PamCut/CaloCuts/CaloNotIntCut/CaloNotIntCut.h	2010/07/08 14:00:29	1.4
@@ -11,7 +11,9 @@
 #define CALONOTINTCUT_H_
 
 #include "../../PamCutBase/PamCutBase.h"
-#include "../../CaloAxis2.h"
+#ifndef NO_CALOAXIS
+#include <CaloAxis.h>
+#endif /* NO_CALOAXIS */
 
 /*! @brief The non-interacting track cut.
  * This check discards all the events who interacts in the calorimeter. It is possible to choose the track to use for
@@ -35,8 +37,12 @@
    * @param pamTrack Pointer to the Pamela track object.
    * @param qRatioMin The minimum threshold for the ratio between track charge and total charge in CALO.
    */
-  CaloNotIntCut(const char *cutName, PamTrack **pamTrack, float qRatioMin=0.8) :
-    PamCut(cutName), _pamTrack(pamTrack), _xCaloAxis(NULL), _yCaloAxis(NULL), _qRatioMin(qRatioMin) {
+
+  CaloNotIntCut(const char *cutName, PamTrack **pamTrack, float qRatioMin = 0.8) :
+    PamCut(cutName), _pamTrack(pamTrack), _qRatioMin(qRatioMin) {
+#ifndef NO_CALOAXIS
+    _xCaloAxis = _yCaloAxis = NULL;
+#endif /* NO_CALOAXIS */
   }
 
   /*! @brief Constructor for calorimeter track.
@@ -49,10 +55,11 @@
    * @param qRatioMin The minimum threshold for the ratio between track charge and total charge in CALO.
    * @return
    */
-  CaloNotIntCut(const char *cutName, CaloAxis *xCaloAxis, CaloAxis *yCaloAxis, float qRatioMin=0.8) :
+#ifndef NO_CALOAXIS
+  CaloNotIntCut(const char *cutName, CaloAxis *xCaloAxis, CaloAxis *yCaloAxis, float qRatioMin = 0.8) :
     PamCut(cutName), _pamTrack(NULL), _xCaloAxis(xCaloAxis), _yCaloAxis(yCaloAxis), _qRatioMin(qRatioMin) {
   }
-
+#endif /* NO_CALOAXIS */
   //TODO: aggiungere il costruttore per il TOF.
 
   /*! @brief Destructor. */
@@ -71,7 +78,9 @@
 private:
 
   PamTrack **_pamTrack;
+#ifndef NO_CALOAXIS
   CaloAxis *_xCaloAxis, *_yCaloAxis;
+#endif /* NO_CALOAXIS */
   float _qRatioMin;
 
 };