Changeset 19829 for trunk/Mars

Timestamp:

10/30/19 14:29:43 (5 years ago)

Author:

tbretz

Message:

There is a problem with the rootcint hack with root v6. I hope that fixes it.

Location:

trunk/Mars

Files:

• fact/analysis/gain/extract_singles.C (modified) (3 diffs)
• mcore/fits.h (modified) (2 diffs)

trunk/Mars/fact/analysis/gain/extract_singles.C

@@ -646 +646 @@
                     Int_t        max_dist   = 14,
                     Double_t     threshold  =  5,
-                    const char  *runfile    = "/fact/raw/2012/07/23/20120723_",
+                    const char  *runfile    = "/media/tbretz/d84f26d3-fc9b-4b30-8cfd-85246846dd1a/hawcseye01/raw/2019/10/27/20191027_",
                     int          firstRunID =  6,
                     int          lastRunID  =  6,
-                    const char  *drsfile    = "/fact/raw/2012/07/23/20120723_004.drs.fits.gz",
+                    const char  *drsfile    = "/media/tbretz/d84f26d3-fc9b-4b30-8cfd-85246846dd1a/hawcseye01/raw/2019/10/27/20191027_003.drs.fits",
                     const char  *outpath    = "."
                    )
@@ -655 +655 @@
     // ======================================================
 
+    return 0;
+
     MDirIter iter;
 
-    // built outpu filename and path
+    // built output filename and path
     TString outfile = Form("%s/", outpath);
     outfile += gSystem->BaseName(runfile);
@@ -685 +687 @@
 
     // map file to use (get that from La Palma!)
-    const char *map = usemap ? "/scratch/fact/FACTmap111030.txt" : NULL;
+    const char *map = usemap ? "/home/tbretz/SW/FACT++/famous/resources/hawcseye01/HAWCsEyemap181214.txt" : NULL;
 
     // ------------------------------------------------------

trunk/Mars/mcore/fits.h

@@ -26 +26 @@
 #endif
 
-#if defined(__MARS__) || defined(__CINT__) || defined(__CLING__)
+// ROOT_VERSION is not defined in ROOTv5, but special treatment is
+// needed depending on whether this is to create the disctionary or not
+// For ROOTv6 now either __CLING__ (dirctionary) or __ROOTv6__ (compiler)
+// should be defined.
+#if defined(ROOT_VERSION_CODE)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,00,0)
+#define __ROOTv6__ 1
+#endif
+#endif
+
+#if defined(__MARS__) || defined(__CINT__) || defined (__CLING__) || defined (__ROOTv6__)
 #include "MLog.h"
 #include "MLogManip.h"
@@ -44 +54 @@
 #endif
 
-#if defined(HAVE_ZLIB) || defined(__CINT__) || defined(__CLING__)
+#if defined(HAVE_ZLIB) || defined(__CINT__) || defined(__CLING__) || defined (__ROOTv6__)
 #include "izstream.h"
 #else