Changeset 1353 for trunk/MagicSoft/Mars/mbase

Timestamp:

06/10/02 09:01:08 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MAGIC.h (modified) (1 diff)
• MGList.cc (modified) (1 diff)
• MWriteAsciiFile.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
+#pragma link C++ enum ParticleId_t;
+
 #pragma link C++ global kCONTINUE;
-#pragma link C++ global kGAMMA;
-#pragma link C++ global kPROTON;
-#pragma link C++ global kHELIUM;
-#pragma link C++ global kOXIGEN;
-#pragma link C++ global kIRON;
 #pragma link C++ global kPI;
 #pragma link C++ global kRad2Deg;

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -22 +22 @@
 //     ParticleId for Monte Carlo simulation
 //
-const Int_t kGAMMA  =    1;
-const Int_t kPROTON =   14;
-const Int_t kHELIUM =  402;
-const Int_t kOXIGEN = 1608;
-const Int_t kIRON   = 5626;
+typedef enum
+{
+    kGAMMA  =    1,
+    kPROTON =   14,
+    kHELIUM =  402,
+    kOXYGEN = 1608,
+    kIRON   = 5626
+} ParticleId_t;
 
 const Double_t kPI      = 3.1415926535897932384626433832795028841971693993751;

trunk/MagicSoft/Mars/mbase/MGList.cc

@@ -99 +99 @@
     //
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,02,07)
-    if (!obj->IsA()->InheritsFrom(TGWidget::Class()))
+    if (!obj->InheritsFrom(TGWidget::Class()))
         return NULL;
 #endif

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -50 +50 @@
 #include <fstream.h>
 
-#include <TClass.h>      // IsA
 #include <TMethodCall.h> // TMethodCall, AsciiWrite
 
@@ -247 +246 @@
         // MData is the highest class in the inheritance tree
         //
-        if (obj->IsA()->InheritsFrom(MData::Class()))
+        if (obj->InheritsFrom(MData::Class()))
         {
             if (!((MData*)obj)->PreProcess(plist))
@@ -257 +256 @@
         // MParContainer is the next class in the inheritance tree
         //
-        if (obj->IsA()->InheritsFrom(MParContainer::Class()))
+        if (obj->InheritsFrom(MParContainer::Class()))
             continue;
 
@@ -287 +286 @@
     Int_t num = fList.GetEntries();
 
-    *fLog << all << "CHECK&WRITE " << num << endl;
-
     TIter Next(&fList);
     while ((obj=(MParContainer*)Next()))
     {
-        *fLog << all << endl << obj->IsA()->GetName() << ": 0..." << flush;
-
         if (!obj->IsReadyToSave())
             continue;
 
-        *fLog << all << "1..." << flush;
-
         if (!obj->AsciiWrite(*fOut))
             continue;
 
-        *fLog << all << "2..." << flush;
-
         written = kTRUE;