Changeset 17870 for trunk

Timestamp:

05/16/14 14:53:23 (11 years ago)

Author:

tbretz

Message:

This version should run uncompiled as well.

File:

• trunk/Mars/fact/analysis/mc/callisto.C (modified) (7 diffs)

trunk/Mars/fact/analysis/mc/callisto.C

@@ -4 +4 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#if !defined(__CINT__) || defined(__MAKECINT__)
 
 #include "TH1F.h"
@@ -47 +49 @@
 #include "MWriteAsciiFile.h"
 
+#endif
+
 using namespace std;
 
@@ -115 +119 @@
 
     // map file to use (get that from La Palma!)
-    const char *map = usemap ? "TestForThomas/FACT/FACTmap111030.txt" : NULL;
+    const char *pmap = usemap ? "TestForThomas/FACT/FACTmap111030.txt" : NULL;
 
     Bool_t maximum = kTRUE;
@@ -164 +168 @@
     // ======================================================
 
-    if (map && gSystem->AccessPathName(map, kFileExists))
+    if (pmap && gSystem->AccessPathName(pmap, kFileExists))
     {
-        gLog << err << "ERROR - Cannot access mapping file '" << map << "'" << endl;
+        gLog << err << "ERROR - Cannot access mapping file '" << pmap << "'" << endl;
         return 1;
     }
@@ -357 +361 @@
 
     MRawFitsRead read3;
-    read3.LoadMap(map);
+    read3.LoadMap(pmap);
     read3.AddFile(pedfile);
 
@@ -448 +452 @@
 
     MRawFitsRead read4;
-    read4.LoadMap(map);
+    read4.LoadMap(pmap);
     read4.AddFile(pedfile);
 
@@ -533 +537 @@
     MRawFitsRead read5a;
     MReadMarsFile read5b("Events");
-    read5a.LoadMap(map);
+    read5a.LoadMap(pmap);
     read5a.AddFile(datfile);
     read5b.DisableAutoScheme();