Changeset 8999 for trunk/MagicSoft/Mars/mraw

Timestamp:

07/14/08 20:59:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mraw

Files:

• MRawRunHeader.cc (modified) (2 diffs)
• MRawRunHeader.h (modified) (1 diff)
• Makefile (modified) (1 diff)
• RawLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -156 +156 @@
 
 #include "MArrayS.h"
+#include "MString.h"
 
 ClassImp(MRawRunHeader);
@@ -268 +269 @@
 // --------------------------------------------------------------------------
 //
+// Return Telescope number, runnumber and filenumber on the form:
+//      run
+// as string for runnumber<1000000 and
+//      telescope:run/file
+// otherwise.
+//
+TString  MRawRunHeader::GetStringID() const
+{
+    return fRunNumber<1000000?MString::Format("%d", fRunNumber):MString::Format("%d:%d/%d", fTelescopeNumber, fRunNumber, fFileNumber);
+}
+
+// --------------------------------------------------------------------------
+//
 // Consistency checks. See code for detils.
 //

trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

@@ -108 +108 @@
     UInt_t   GetTypeID() const            { return (fRunNumber/1000000)%100; }
     UInt_t   GetFileID() const            { return fRunNumber>1000000?(fRunNumber%1000000)*1000+(fFileNumber%1000):fRunNumber; }
+    TString  GetStringID() const;
     UShort_t GetTelescopeNumber() const   { return fRunType; }
     UShort_t GetRunType() const           { return fRunType; }

trunk/MagicSoft/Mars/mraw/Makefile

@@ -29 +29 @@
            MRawCrateData.cc \
            MRawRead.cc \
-           MRawFileRead.cc \
-           MRawSocketRead.cc
+           MRawFileRead.cc
 
 ############################################################

trunk/MagicSoft/Mars/mraw/RawLinkDef.h

@@ -15 +15 @@
 
 #pragma link C++ class MRawRead+;
-#pragma link C++ class MRawSocketRead+;
 #pragma link C++ class MRawFileRead+;
+//#pragma link C++ class MRawSocketRead+;
 //#pragma link C++ class MRawFileWrite+;