Changeset 19266 for trunk/Mars

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

Files:

• analysis/callisto_data.C (modified) (3 diffs)
• analysis/mc/callisto_data.C (modified) (2 diffs)
• analysis/mc/ganymed.C (modified) (3 diffs)
• analysis/mc/star.C (modified) (2 diffs)
• analysis/merpp.C (modified) (2 diffs)
• analysis/merpp_file.C (modified) (2 diffs)
• analysis/star_file.C (modified) (1 diff)
• plots/plotratescan.C (modified) (5 diffs)
• plots/quality.C (modified) (4 diffs)
• processing/drstemp.C (modified) (2 diffs)
• processing/fillratescan.C (modified) (2 diffs)

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())
     {

trunk/Mars/fact/plots/plotratescan.C

@@ -172 +172 @@
     leg.SetFillColor(kWhite);
     leg.SetTextAlign(12);
-    leg.AddText(Form("Ratescan %d ", search_id));
+    leg.AddText(Form("Ratescan %lld ", search_id));
     //leg.AddText("");
     leg.AddText(Form("Begin       %s", time_beg));
@@ -230 +230 @@
     //c->SaveAs(name+".eps");
     //c->SaveAs("/loc_data/analysis/"+name+".png");
-    c->SaveAs(Form("/data1/analysis/ratescans/%04d/%02d/%02d/%06d_%d.png", atoi(night)/10000, (atoi(night)/100)%100, atoi(night)%100, atoi(night), search_id));
+    c->SaveAs(Form("/data1/analysis/ratescans/%04d/%02d/%02d/%06d_%lld.png", atoi(night)/10000, (atoi(night)/100)%100, atoi(night)%100, atoi(night), search_id));
 
     delete c;
+
+    return kTRUE;
 }
 
@@ -245 +247 @@
     bool old = file.HasColumn("Data0");
 
-    Double_t  *ptime   = file.SetPtrAddress("Time");
-    UInt_t    *pid     = file.SetPtrAddress(old ? "Data0" : "Id");
-    Float_t   *rates   = file.SetPtrAddress(old ? "Data5" : "BoardRate");
-    UInt_t    *pth     = file.SetPtrAddress(old ? "Data1" : "Threshold");
-    Float_t   *ptrig   = file.SetPtrAddress(old ? "Data4" : "TriggerRate");
-    Float_t   *pontime = file.SetPtrAddress(old ? "Data3" : "RelOnTime");
+    Double_t  *ptime   = (Double_t*)file.SetPtrAddress("Time");
+    UInt_t    *pid     = (UInt_t*)  file.SetPtrAddress(old ? "Data0" : "Id");
+    Float_t   *rates   = (Float_t*) file.SetPtrAddress(old ? "Data5" : "BoardRate");
+    UInt_t    *pth     = (UInt_t*)  file.SetPtrAddress(old ? "Data1" : "Threshold");
+    Float_t   *ptrig   = (Float_t*) file.SetPtrAddress(old ? "Data4" : "TriggerRate");
+    Float_t   *pontime = (Float_t*) file.SetPtrAddress(old ? "Data3" : "RelOnTime");
 
     if (!ptime || !pid || !rates || !pth || !ptrig || !pontime)
@@ -283 +285 @@
     Long64_t night = atol(_night);
 
-    TString fname = Form("/fact/aux/%04d/%02d/%02d/%06d.RATE_SCAN_DATA.fits",
+    TString fname = Form("/fact/aux/%04lld/%02lld/%02lld/%06lld.RATE_SCAN_DATA.fits",
                          night/10000, (night/100)%100, night%100, night);
 
@@ -316 +318 @@
     }
 
-    TString oname = Form("%06d-ratescan.root", night);
+    TString oname = Form("%06lld-ratescan.root", night);
     //cout << "   " << oname << '\n' << endl;
     TFile rootfile(oname.Data(), "recreate");

trunk/Mars/fact/plots/quality.C

@@ +1 @@
+#ifndef __CLING__
 #include <algorithm>
 #include <functional>
+#include <vector>
+#include <pair>
+#endif
 
 Bool_t Contains(TArrayD **vec, Double_t t0, Double_t range=0)
@@ -71 +75 @@
     return 0;
 }
-
-#include <vector>
-#include <pair>
 
 vector<pair<double, Nova::EquPosn>> vecp;
@@ -948 +949 @@
     TCanvas *c = NULL;
     TString datestring = Form("%04d%02d%02d", y, m, d);
-    if( datestring.Atoi() > 20140723 ) {
-      TCanvas *c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1280);
-      c->Divide(1, 8, 1e-5, 1e-5);
-    }else{
-      TCanvas *c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1120);
-      c->Divide(1, 7, 1e-5, 1e-5);
+    if (datestring.Atoi() > 20140723)
+    {
+        c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1280);
+        c->Divide(1, 8, 1e-5, 1e-5);
+    }
+    else
+    {
+        c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1120);
+        c->Divide(1, 7, 1e-5, 1e-5);
     }
 
@@ -983 +987 @@
     gPad->SetLeftMargin(0.04);
     cout << PlotRate(runs, fname) << endl;
-    cout << PlotRateQC(night, serv) << endl;
+    PlotRateQC(night, serv);
 
     gROOT->SetSelectedPad(0);

trunk/Mars/fact/processing/drstemp.C

@@ -10 +10 @@
     file.SetPtrAddress("Time", &time);
 
-    float *temp = file.SetPtrAddress("temp");
+    float *temp = (float*)file.SetPtrAddress("temp");
 
     double avgmin = 0;
@@ -97 +97 @@
     file.SetPtrAddress("Time", &time);
 
-    float *temp = file.SetPtrAddress("temp");
+    float *temp = (float*)file.SetPtrAddress("temp");
 
     double avg = 0;

trunk/Mars/fact/processing/fillratescan.C

@@ -299 +299 @@
     }
     vars += Form("fNight=%d, ",           MTime(tbeg.GetMjd()-1).GetNightAsInt());
-    vars += Form("fRatescanID=%d, ",      d.id);
+    vars += Form("fRatescanID=%lld, ",    d.id);
     vars += Form("fTimeBegin='%s', ",     beg.Data());
     vars += Form("fTimeEnd='%s', ",       end.Data());
@@ -340 +340 @@
         return -1;
         */
-    Double_t  *ptime   = file.SetPtrAddress("Time");
-    ULong64_t *pid     = file.SetPtrAddress(old ? "Data0" : "Id");
-    UInt_t    *pth     = file.SetPtrAddress(old ? "Data1" : "Threshold");
-    Float_t   *ptrig   = file.SetPtrAddress(old ? "Data4" : "TriggerRate");
-    Float_t   *pontime = file.SetPtrAddress(old ? "Data3" : "RelOnTime");
+    Double_t  *ptime   = (Double_t*) file.SetPtrAddress("Time");
+    ULong64_t *pid     = (ULong64_t*)file.SetPtrAddress(old ? "Data0" : "Id");
+    UInt_t    *pth     = (UInt_t*)   file.SetPtrAddress(old ? "Data1" : "Threshold");
+    Float_t   *ptrig   = (Float_t*)  file.SetPtrAddress(old ? "Data4" : "TriggerRate");
+    Float_t   *pontime = (Float_t*)  file.SetPtrAddress(old ? "Data3" : "RelOnTime");
 
     if (!ptime || !pid || !pth || !ptrig || !pontime)
-        return;
+        return kFALSE;
 
     Double_t  &time   = *ptime;