Changeset 19829


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/fact/analysis/gain/extract_singles.C

    r17328 r19829  
    646646                    Int_t        max_dist   = 14,
    647647                    Double_t     threshold  =  5,
    648                     const char  *runfile    = "/fact/raw/2012/07/23/20120723_",
     648                    const char  *runfile    = "/media/tbretz/d84f26d3-fc9b-4b30-8cfd-85246846dd1a/hawcseye01/raw/2019/10/27/20191027_",
    649649                    int          firstRunID =  6,
    650650                    int          lastRunID  =  6,
    651                     const char  *drsfile    = "/fact/raw/2012/07/23/20120723_004.drs.fits.gz",
     651                    const char  *drsfile    = "/media/tbretz/d84f26d3-fc9b-4b30-8cfd-85246846dd1a/hawcseye01/raw/2019/10/27/20191027_003.drs.fits",
    652652                    const char  *outpath    = "."
    653653                   )
     
    655655    // ======================================================
    656656
     657    return 0;
     658
    657659    MDirIter iter;
    658660
    659     // built outpu filename and path
     661    // built output filename and path
    660662    TString outfile = Form("%s/", outpath);
    661663    outfile += gSystem->BaseName(runfile);
     
    685687
    686688    // map file to use (get that from La Palma!)
    687     const char *map = usemap ? "/scratch/fact/FACTmap111030.txt" : NULL;
     689    const char *map = usemap ? "/home/tbretz/SW/FACT++/famous/resources/hawcseye01/HAWCsEyemap181214.txt" : NULL;
    688690
    689691    // ------------------------------------------------------
  • trunk/Mars/mcore/fits.h

    r19655 r19829  
    2626#endif
    2727
    28 #if defined(__MARS__) || defined(__CINT__) || defined(__CLING__)
     28// ROOT_VERSION is not defined in ROOTv5, but special treatment is
     29// needed depending on whether this is to create the disctionary or not
     30// For ROOTv6 now either __CLING__ (dirctionary) or __ROOTv6__ (compiler)
     31// should be defined.
     32#if defined(ROOT_VERSION_CODE)
     33#if ROOT_VERSION_CODE >= ROOT_VERSION(6,00,0)
     34#define __ROOTv6__ 1
     35#endif
     36#endif
     37
     38#if defined(__MARS__) || defined(__CINT__) || defined (__CLING__) || defined (__ROOTv6__)
    2939#include "MLog.h"
    3040#include "MLogManip.h"
     
    4454#endif
    4555
    46 #if defined(HAVE_ZLIB) || defined(__CINT__) || defined(__CLING__)
     56#if defined(HAVE_ZLIB) || defined(__CINT__) || defined(__CLING__) || defined (__ROOTv6__)
    4757#include "izstream.h"
    4858#else
Note: See TracChangeset for help on using the changeset viewer.