Changeset 10693 for trunk/FACT++/src

Timestamp:

05/13/11 11:24:35 (14 years ago)

Author:

tbretz

Message:

Implemented support for compilation without fits.

File:

• trunk/FACT++/src/dataLogger.cc (modified) (16 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -66 +66 @@
 #include <sys/stat.h>
 
-#define HAS_FITS
 //#define ONE_RUN_FITS_ONLY
 
@@ -79 +78 @@
 #include <boost/thread.hpp>
 
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
 #include "Fits.h"
 #endif
@@ -177 +176 @@
         struct SubscriptionType
         { 
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
                 ///Nightly FITS output file
                 Fits    nightlyFile;
@@ -192 +191 @@
                 void operator = (const SubscriptionType& other)
                 {
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
                         nightlyFile = other.nightlyFile;
                         runFile = other.runFile;
@@ -203 +202 @@
                 SubscriptionType(const SubscriptionType& other)
                 {
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
                         nightlyFile = other.nightlyFile;
                         runFile = other.runFile;
@@ -233 +232 @@
                                 if (dimInfo)
                                 delete dimInfo;
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
                                 if (nightlyFile.IsOpen())
                                         nightlyFile.Close();
@@ -277 +276 @@
         ///from NightlyOpen to waiting transition
         int NightlyToWaitRunPlease(); 
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
         ///Open fits files
         void OpenFITSFilesPlease(SubscriptionType& sub);
@@ -342 +341 @@
 void DataLogger::calculateTotalSizeWritten(DataLoggerStats& statVar, bool& shouldWarn, bool isPrinting)
 {
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
         if (isPrinting)
         {
@@ -473 +472 @@
                         //update the fits files sizes
                         calculateTotalSizeWritten(statVar, statWarning, false);/*
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
                         SubscriptionsListType::iterator x;
                         std::map<std::string, SubscriptionType>::iterator y;
@@ -576 +575 @@
                 fRunNumber = -1;
                 fPreviousRunNumber = fRunNumber;
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
 #ifdef ONE_RUN_FITS_ONLY
                 fRunFitsFile = NULL;
@@ -869 +868 @@
         delete fNumSubAndFits;
 //TODO notify that all files were closed
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
 #ifdef ONE_RUN_FITS_ONLY
         if (fRunFitsFile != NULL)
@@ -1127 +1126 @@
         }
 
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
         if (isItaReport)
         {
@@ -1293 +1292 @@
         DataLoggerStats statVar;
         calculateTotalSizeWritten(statVar, statWarning, false);/*
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
         str.str("");
         str << "There are " << fNumSubAndFitsData.numOpenFits << " FITS files open:";
@@ -1663 +1662 @@
 }
 
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
 // --------------------------------------------------------------------------
 //
@@ -1995 +1994 @@
         if (fRunReportFile.is_open())
                 fRunReportFile.close();
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
         for (SubscriptionsListType::iterator i = fServiceSubscriptions.begin(); i != fServiceSubscriptions.end(); i++)
                 for (std::map<std::string, SubscriptionType>::iterator j = i->second.begin(); j != i->second.end(); j++)
@@ -2039 +2038 @@
                 fRunReportFile.close();
                 
-#ifdef HAS_FITS
+#ifdef HAVE_FITS
         for (SubscriptionsListType::iterator i = fServiceSubscriptions.begin(); i != fServiceSubscriptions.end(); i++)
                 for (std::map<std::string, SubscriptionType>::iterator j = i->second.begin(); j != i->second.end(); j++)