Changeset 19266


Ignore:
Timestamp:
Oct 22, 2018, 8:50:24 PM (5 months 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:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/fact/analysis/callisto_data.C

    r18577 r19266  
    7575    // Extraction type: Extract integral and half leading edge
    7676
    77     const int type = maximum ? (MExtralgoSpline::kIntegralRel) : (MExtralgoSpline::kIntegralFixed);
     77    const MExtralgoSpline::ExtractionType_t type = maximum ? (MExtralgoSpline::kIntegralRel) : (MExtralgoSpline::kIntegralFixed);
    7878    //const int type = MExtralgoSpline::kIntegralFixed;
    7979
     
    355355    fill5ped.SetFilter(&filterped);
    356356
    357     MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV·sl]");
     357    MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV#dot sl]");
    358358    MHCamEvent evt5c(0, "CalSig",   "Calibrated and interpolated signal;;S [~phe]");
    359359    MHCamEvent evt5d(4, "ExtSigTm", "Extracted time;;T [sl]");
     
    458458    // ============================================================
    459459
    460     TFile *ofile = gROOT->GetListOfFiles()->FindObject(fname);
     460    TFile *ofile = (TFile*)gROOT->GetListOfFiles()->FindObject(fname);
    461461    if (!ofile || !ofile->IsOpen() || ofile->IsZombie())
    462462    {
  • trunk/Mars/fact/analysis/mc/callisto_data.C

    r18579 r19266  
    55#include "MLogManip.h"
    66
    7 #if !defined(__CINT__) || defined(__MAKECINT__)
     7#if (!defined(__CINT__) && !defined(__CLING__)) || defined(__MAKECINT__)
    88
    99#include "TH1F.h"
     
    285285    treat5.SetProcessPedestalEvt(kFALSE);
    286286
    287     MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV·sl]");
     287    MHCamEvent evt5b(0, "ExtSig",   "Extracted signal;;S [mV#dot sl]");
    288288    MHCamEvent evt5c(0, "CalSig",   "Calibrated and interpolated signal;;S [~phe]");
    289289    MHCamEvent evt5d(4, "ExtSigTm", "Extracted time;;T [sl]");
  • trunk/Mars/fact/analysis/mc/ganymed.C

    r17733 r19266  
    1 void SetupWriter(MWriteRootFile *write, const char *name, Bool_t ismc) const
     1void SetupWriter(MWriteRootFile *write, const char *name, Bool_t ismc)
    22{
    33    if (!write)
     
    153153    scale.SetVal(1./fNumOffSourcePos);
    154154
    155     MHThetaSq *halphaoff = plist.FindCreateObj("MHThetaSq", "HistOff");
     155    MHThetaSq *halphaoff = (MHThetaSq*)plist.FindCreateObj("MHThetaSq", "HistOff");
    156156    halphaoff->ForceUsingSize();
    157157
     
    385385    fill3d.SetFilter(&ftheta);
    386386
    387     MHThetaSq *halphaon = plist.FindCreateObj("MHThetaSq", "Hist");
     387    MHThetaSq *halphaon = (MHThetaSq*)plist.FindCreateObj("MHThetaSq", "Hist");
    388388    halphaon->ForceUsingSize();
    389389
  • trunk/Mars/fact/analysis/mc/star.C

    r17871 r19266  
    55#include "MLogManip.h"
    66
    7 #if !defined(__CINT__) || defined(__MAKECINT__)
     7#if (!defined(__CINT__) && !defined(__CLING__)) || defined(__MAKECINT__)
     8
     9#error test1
    810
    911#include "TH1F.h"
     
    212214
    213215    MH3 hrate("MRawRunHeader.GetFileID"/*, "MRawEvtHeader.GetTriggerID"*/);
    214     hrate.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1)");
     216    hrate.SetWeight("1./TMath::Max(MRawRunHeader.GetRunLength,1.)");
    215217    hrate.SetName("Rate");
    216218    hrate.SetTitle("Event rate after cleaning;File Id;Event Rate [Hz];");
  • trunk/Mars/fact/analysis/merpp.C

    r17885 r19266  
    1313
    1414    MRawRunHeader *h = NULL;
    15     TTree *tree = file.Get("RunHeaders");
     15    TTree *tree = (TTree*)file.Get("RunHeaders");
    1616    if (!tree)
    1717    {
     
    125125
    126126    TString file = Form("/scratch/fact/sequences/%04d/%02d/%02d/%06d_%03d.seq",
    127                         night/10000, (night/100)%100, night%100, num);
     127                        night/10000, (night/100)%100, night%100, night, num);
    128128
    129129    return merpp(file.Data(), path);
  • trunk/Mars/fact/analysis/merpp_file.C

    r18077 r19266  
    11#include "MLogManip.h"
    22
    3 void merpp(TString &froot, const char *id, const char *faux)
     3void merpp(TString froot, const char *id, const char *faux)
    44{
    55    gLog.Separator(froot+" - "+TString(id));
     
    1313
    1414    MRawRunHeader *h = NULL;
    15     TTree *tree = file.Get("RunHeaders");
     15    TTree *tree = (TTree*)file.Get("RunHeaders");
    1616    if (!tree)
    1717    {
  • trunk/Mars/fact/analysis/star_file.C

    r18578 r19266  
    277277    // ============================================================
    278278
    279     TFile *ofile = gROOT->GetListOfFiles()->FindObject(fname);
     279    TFile *ofile = (TFile*)gROOT->GetListOfFiles()->FindObject(fname);
    280280    if (!ofile || !ofile->IsOpen() || ofile->IsZombie())
    281281    {
  • trunk/Mars/fact/plots/plotratescan.C

    r18865 r19266  
    172172    leg.SetFillColor(kWhite);
    173173    leg.SetTextAlign(12);
    174     leg.AddText(Form("Ratescan %d ", search_id));
     174    leg.AddText(Form("Ratescan %lld ", search_id));
    175175    //leg.AddText("");
    176176    leg.AddText(Form("Begin       %s", time_beg));
     
    230230    //c->SaveAs(name+".eps");
    231231    //c->SaveAs("/loc_data/analysis/"+name+".png");
    232     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));
     232    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));
    233233
    234234    delete c;
     235
     236    return kTRUE;
    235237}
    236238
     
    245247    bool old = file.HasColumn("Data0");
    246248
    247     Double_t  *ptime   = file.SetPtrAddress("Time");
    248     UInt_t    *pid     = file.SetPtrAddress(old ? "Data0" : "Id");
    249     Float_t   *rates   = file.SetPtrAddress(old ? "Data5" : "BoardRate");
    250     UInt_t    *pth     = file.SetPtrAddress(old ? "Data1" : "Threshold");
    251     Float_t   *ptrig   = file.SetPtrAddress(old ? "Data4" : "TriggerRate");
    252     Float_t   *pontime = file.SetPtrAddress(old ? "Data3" : "RelOnTime");
     249    Double_t  *ptime   = (Double_t*)file.SetPtrAddress("Time");
     250    UInt_t    *pid     = (UInt_t*)  file.SetPtrAddress(old ? "Data0" : "Id");
     251    Float_t   *rates   = (Float_t*) file.SetPtrAddress(old ? "Data5" : "BoardRate");
     252    UInt_t    *pth     = (UInt_t*)  file.SetPtrAddress(old ? "Data1" : "Threshold");
     253    Float_t   *ptrig   = (Float_t*) file.SetPtrAddress(old ? "Data4" : "TriggerRate");
     254    Float_t   *pontime = (Float_t*) file.SetPtrAddress(old ? "Data3" : "RelOnTime");
    253255
    254256    if (!ptime || !pid || !rates || !pth || !ptrig || !pontime)
     
    283285    Long64_t night = atol(_night);
    284286
    285     TString fname = Form("/fact/aux/%04d/%02d/%02d/%06d.RATE_SCAN_DATA.fits",
     287    TString fname = Form("/fact/aux/%04lld/%02lld/%02lld/%06lld.RATE_SCAN_DATA.fits",
    286288                         night/10000, (night/100)%100, night%100, night);
    287289
     
    316318    }
    317319
    318     TString oname = Form("%06d-ratescan.root", night);
     320    TString oname = Form("%06lld-ratescan.root", night);
    319321    //cout << "   " << oname << '\n' << endl;
    320322    TFile rootfile(oname.Data(), "recreate");
  • trunk/Mars/fact/plots/quality.C

    r18260 r19266  
     1#ifndef __CLING__
    12#include <algorithm>
    23#include <functional>
     4#include <vector>
     5#include <pair>
     6#endif
    37
    48Bool_t Contains(TArrayD **vec, Double_t t0, Double_t range=0)
     
    7175    return 0;
    7276}
    73 
    74 #include <vector>
    75 #include <pair>
    7677
    7778vector<pair<double, Nova::EquPosn>> vecp;
     
    948949    TCanvas *c = NULL;
    949950    TString datestring = Form("%04d%02d%02d", y, m, d);
    950     if( datestring.Atoi() > 20140723 ) {
    951       TCanvas *c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1280);
    952       c->Divide(1, 8, 1e-5, 1e-5);
    953     }else{
    954       TCanvas *c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1120);
    955       c->Divide(1, 7, 1e-5, 1e-5);
     951    if (datestring.Atoi() > 20140723)
     952    {
     953        c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1280);
     954        c->Divide(1, 8, 1e-5, 1e-5);
     955    }
     956    else
     957    {
     958        c = new TCanvas("quality", Form("Quality %04d/%02d/%02d", y, m, d), 1280, 1120);
     959        c->Divide(1, 7, 1e-5, 1e-5);
    956960    }
    957961
     
    983987    gPad->SetLeftMargin(0.04);
    984988    cout << PlotRate(runs, fname) << endl;
    985     cout << PlotRateQC(night, serv) << endl;
     989    PlotRateQC(night, serv);
    986990
    987991    gROOT->SetSelectedPad(0);
  • trunk/Mars/fact/processing/drstemp.C

    r18246 r19266  
    1010    file.SetPtrAddress("Time", &time);
    1111
    12     float *temp = file.SetPtrAddress("temp");
     12    float *temp = (float*)file.SetPtrAddress("temp");
    1313
    1414    double avgmin = 0;
     
    9797    file.SetPtrAddress("Time", &time);
    9898
    99     float *temp = file.SetPtrAddress("temp");
     99    float *temp = (float*)file.SetPtrAddress("temp");
    100100
    101101    double avg = 0;
  • trunk/Mars/fact/processing/fillratescan.C

    r18204 r19266  
    299299    }
    300300    vars += Form("fNight=%d, ",           MTime(tbeg.GetMjd()-1).GetNightAsInt());
    301     vars += Form("fRatescanID=%d, ",      d.id);
     301    vars += Form("fRatescanID=%lld, ",    d.id);
    302302    vars += Form("fTimeBegin='%s', ",     beg.Data());
    303303    vars += Form("fTimeEnd='%s', ",       end.Data());
     
    340340        return -1;
    341341        */
    342     Double_t  *ptime   = file.SetPtrAddress("Time");
    343     ULong64_t *pid     = file.SetPtrAddress(old ? "Data0" : "Id");
    344     UInt_t    *pth     = file.SetPtrAddress(old ? "Data1" : "Threshold");
    345     Float_t   *ptrig   = file.SetPtrAddress(old ? "Data4" : "TriggerRate");
    346     Float_t   *pontime = file.SetPtrAddress(old ? "Data3" : "RelOnTime");
     342    Double_t  *ptime   = (Double_t*) file.SetPtrAddress("Time");
     343    ULong64_t *pid     = (ULong64_t*)file.SetPtrAddress(old ? "Data0" : "Id");
     344    UInt_t    *pth     = (UInt_t*)   file.SetPtrAddress(old ? "Data1" : "Threshold");
     345    Float_t   *ptrig   = (Float_t*)  file.SetPtrAddress(old ? "Data4" : "TriggerRate");
     346    Float_t   *pontime = (Float_t*)  file.SetPtrAddress(old ? "Data3" : "RelOnTime");
    347347
    348348    if (!ptime || !pid || !pth || !ptrig || !pontime)
    349         return;
     349        return kFALSE;
    350350
    351351    Double_t  &time   = *ptime;
Note: See TracChangeset for help on using the changeset viewer.