Changeset 11593 for trunk

Timestamp:

07/26/11 10:22:21 (14 years ago)

Author:

tbretz

Message:

Used a fixed-length type for the Dim reports.

Location:

trunk/FACT++/src

Files:

• Fits.cc (modified) (2 diffs)
• Fits.h (modified) (2 diffs)
• datalogger.cc (modified) (2 diffs)

trunk/FACT++/src/Fits.cc

@@ -20 +20 @@
 #include "MessageImp.h"
 
-//for file stats
-#include <sys/stat.h>
+
+#include <sys/stat.h> //for file stats
 
 using namespace std;
@@ -129 +129 @@
 //! @param runNumber the runNumber for which this file is opened. 0 means nightly file.
 //
-bool Fits::Open(const string& fileName, const string& tableName, FITS* file, int* fitsCounter, MessageImp* out, int runNumber)
+bool Fits::Open(const string& fileName, const string& tableName, FITS* file, uint32_t* fitsCounter, MessageImp* out, int runNumber)
 {               
 //      if (fMess)

trunk/FACT++/src/Fits.h

@@ -54 +54 @@
 private:
                 ///Keep track of number of opened fits
-                int* fNumOpenFitsFiles;
+                uint32_t* fNumOpenFitsFiles;
                 ///were to log the errors
                 MessageImp* fMess;              
@@ -91 +91 @@
 
                 ///Opens a FITS file
-        bool Open(const string& fileName, const string& tableName, CCfits::FITS* file, int* fitsCounter, MessageImp* out, int runNumber);//ostream& out);
+        bool Open(const string& fileName, const string& tableName, CCfits::FITS* file, uint32_t* fitsCounter, MessageImp* out, int runNumber);//ostream& out);
 
                 ///Write one line of data. Use the given converter.

trunk/FACT++/src/datalogger.cc

@@ -67 +67 @@
 ///distributes the number of opened subscriptions and fits files
 struct NumSubAndFitsType {
-    int numSubscriptions;
-    int numOpenFits;
+    uint32_t numSubscriptions;
+    uint32_t numOpenFits;
 };
 ///distributes which files were opened.
 struct OpenFileToDim {
-    int code;
+    uint32_t code;
     char fileName[FILENAME_MAX];
 };
@@ -1733 +1733 @@
     memcpy(fToDim.fileName, name.c_str(), name.size()+1);
 
-    service->setData(reinterpret_cast<void*>(&fToDim), name.size()+1+sizeof(int));
+    service->setData(reinterpret_cast<void*>(&fToDim), name.size()+1+sizeof(uint32_t));
     service->setQuality(0);
     service->updateService();