Changeset 19266 for trunk/Mars/fact/analysis

Timestamp:

10/22/18 20:50:24 (6 years ago)

Author:

tbretz

Message:

Fixed some minor issues with the cling based interpreter - this should not have any effect at runtime maybe except stability

Location:

trunk/Mars/fact/analysis

Files:

• callisto_data.C (modified) (3 diffs)
• mc/callisto_data.C (modified) (2 diffs)
• mc/ganymed.C (modified) (3 diffs)
• mc/star.C (modified) (2 diffs)
• merpp.C (modified) (2 diffs)
• merpp_file.C (modified) (2 diffs)
• star_file.C (modified) (1 diff)

trunk/Mars/fact/analysis/callisto_data.C

@@ -75 +75 @@
     // Extraction type: Extract integral and half leading edge
 
-    const int type = maximum ? (MExtralgoSpline::kIntegralRel) : (MExtralgoSpline::kIntegralFixed);
+    const MExtralgoSpline::ExtractionType_t type = maximum ? (MExtralgoSpline::kIntegralRel) : (MExtralgoSpline::kIntegralFixed);
     //const int type = MExtralgoSpline::kIntegralFixed;
 
@@ -355 +355 @@
     fill5ped.SetFilter(&filterped);
 
-    MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV·sl]");
+    MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV#dot sl]");
     MHCamEvent evt5c(0, "CalSig",   "Calibrated and interpolated signal;;S [~phe]");
     MHCamEvent evt5d(4, "ExtSigTm", "Extracted time;;T [sl]");
@@ -458 +458 @@
     // ============================================================
 
-    TFile *ofile = gROOT->GetListOfFiles()->FindObject(fname);
+    TFile *ofile = (TFile*)gROOT->GetListOfFiles()->FindObject(fname);
     if (!ofile || !ofile->IsOpen() || ofile->IsZombie())
     {

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

@@ -5 +5 @@
 #include "MLogManip.h"
 
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if (!defined(__CINT__) && !defined(__CLING__)) || defined(__MAKECINT__)
 
 #include "TH1F.h"
@@ -285 +285 @@
     treat5.SetProcessPedestalEvt(kFALSE);
 
-    MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV·sl]");
+    MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV#dot sl]");
     MHCamEvent evt5c(0, "CalSig",   "Calibrated and interpolated signal;;S [~phe]");
     MHCamEvent evt5d(4, "ExtSigTm", "Extracted time;;T [sl]");

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

@@ -1 @@
-void SetupWriter(MWriteRootFile *write, const char *name, Bool_t ismc) const
+void SetupWriter(MWriteRootFile *write, const char *name, Bool_t ismc)
 {
     if (!write)
@@ -153 +153 @@
     scale.SetVal(1./fNumOffSourcePos);
 
-    MHThetaSq *halphaoff = plist.FindCreateObj("MHThetaSq", "HistOff");
+    MHThetaSq *halphaoff = (MHThetaSq*)plist.FindCreateObj("MHThetaSq", "HistOff");
     halphaoff->ForceUsingSize();
 
@@ -385 +385 @@
     fill3d.SetFilter(&ftheta);
 
-    MHThetaSq *halphaon = plist.FindCreateObj("MHThetaSq", "Hist");
+    MHThetaSq *halphaon = (MHThetaSq*)plist.FindCreateObj("MHThetaSq", "Hist");
     halphaon->ForceUsingSize();
 

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

@@ -5 +5 @@
 #include "MLogManip.h"
 
-#if !defined(__CINT__) || defined(__MAKECINT__)
+#if (!defined(__CINT__) && !defined(__CLING__)) || defined(__MAKECINT__)
+
+#error test1
 
 #include "TH1F.h"
@@ -212 +214 @@
 
     MH3 hrate("MRawRunHeader.GetFileID"/*, "MRawEvtHeader.GetTriggerID"*/);
-    hrate.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
+    hrate.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1.)");
     hrate.SetName("Rate");
     hrate.SetTitle("Event rate after cleaning;File Id;Event Rate [Hz];");

trunk/Mars/fact/analysis/merpp.C

@@ -13 +13 @@
 
     MRawRunHeader *h = NULL;
-    TTree *tree = file.Get("RunHeaders");
+    TTree *tree = (TTree*)file.Get("RunHeaders");
     if (!tree)
     {
@@ -125 +125 @@
 
     TString file = Form("/scratch/fact/sequences/%04d/%02d/%02d/%06d_%03d.seq",
-                        night/10000, (night/100)%100, night%100, num);
+                        night/10000, (night/100)%100, night%100, night, num);
 
     return merpp(file.Data(), path);

trunk/Mars/fact/analysis/merpp_file.C

@@ -1 +1 @@
 #include "MLogManip.h"
 
-void merpp(TString &froot, const char *id, const char *faux)
+void merpp(TString froot, const char *id, const char *faux)
 {
     gLog.Separator(froot+" - "+TString(id));
@@ -13 +13 @@
 
     MRawRunHeader *h = NULL;
-    TTree *tree = file.Get("RunHeaders");
+    TTree *tree = (TTree*)file.Get("RunHeaders");
     if (!tree)
     {

trunk/Mars/fact/analysis/star_file.C

@@ -277 +277 @@
     // ============================================================
 
-    TFile *ofile = gROOT->GetListOfFiles()->FindObject(fname);
+    TFile *ofile = (TFile*)gROOT->GetListOfFiles()->FindObject(fname);
     if (!ofile || !ofile->IsOpen() || ofile->IsZombie())
     {