Changeset 9402 for trunk


Ignore:
Timestamp:
03/16/09 15:13:43 (16 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9401 r9402  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
    20  2009/03/16 Daniel Hoehne-Moenchr
     20 2009/03/16 Thomas Bretz
     21
     22   * ganymed.rc, ganymed_onoff.rc, ganymed_wobble.rc:
     23     - added new starguider calibration since 1000534
     24
     25   * datacenter/macros/plotdb.C, datacenter/macros/plotrundb.C:
     26     - added option to set ds-number in datset
     27
     28   * mgeom/MGeomCamMagic.cc:
     29     - fixed layout of the MII camera
     30
     31   * mpointing/MPointingDevCalc.cc:
     32     - updated informations
     33
     34
     35
     36 2009/03/16 Daniel Hoehne-Moench
     37
    2138   * datacenter/scripts/fillcamera
    2239     - bugfix: the first line was moved by a tabulator
    … …  
    2542
    2643 2009/03/16 Stefan Ruegamer
     44
    2745   * datacenter/scripts/makecallistolinks
    2846     - added >/dev/null in line 68 to prevent the mails to dc@astro

  • trunk/MagicSoft/Mars/NEWS

    r9394 r9402  
    22
    33== <cvs> ==
     4
     5 ;ganymed:
     6
     7   * added new starguider calibration for sequences since 1000534
    48
    59

  • trunk/MagicSoft/Mars/datacenter/macros/plotdb.C

    r9385 r9402  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.55 2009-03-04 18:45:26 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.56 2009-03-16 15:13:43 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    379379            delete fDataSet;
    380380    }
    381     void SetDataSet(const TString filename)
     381    void SetDataSet(const TString filename, UInt_t num=(UInt_t)-1)
    382382    {
    383383        if (fDataSet)
    … …  
    392392            return;
    393393
    394         fDataSet = new MDataSet(filename);
     394        fDataSet = new MDataSet(filename, num);
    395395        fPrimaryNumber="Sequences.fSequenceFirst";
    396396    }
    … …  
    427427        case kNone:
    428428        case kGroupByPrimary:
    429             query += Form("%s AS %s", valued.Data(), valued.Data()+1);
     429            query += Form("%s AS %s", named.Data(), valued.Data()+1);
    430430            break;
    431431        case kGroupByHour:
    … …  
    701701}
    702702
    703 int plotdb(TString from, TString to, const char *dataset=0)
     703int plotdb(TString from, TString to, const char *dataset=0, UInt_t num=(UInt_t)-1)
    704704{
    705705    MSQLMagic serv("sql.rc");
    … …  
    721721
    722722    MPlot plot(serv);
    723     plot.SetDataSet(dataset);
     723    plot.SetDataSet(dataset, num);
    724724    plot.SetDisplay(d);
    725725    plot.SetRequestRange(from, to);
    … …  
    731731}
    732732
    733 int plotdb(const char *ds, TString path)
     733int plotdb(const char *ds, UInt_t num, TString path="/magic/sequences")
    734734{
    735735    MSQLMagic serv("sql.rc");
    … …  
    751751
    752752    MPlot plot(serv);
    753     plot.SetDataSet(ds);
     753    plot.SetDataSet(ds, num);
    754754    plot.SetDisplay(d);
    755755    plot.SetRequestRange("", "");
    … …  
    759759
    760760    return 1;
     761}
     762
     763int plotdb(const char *ds, TString path="/magic/sequences")
     764{
     765    return plotdb(ds, (UInt_t)-1, path);
    761766}
    762767

  • trunk/MagicSoft/Mars/datacenter/macros/plotrundb.C

    r9389 r9402  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.8 2009-03-06 20:36:20 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: plotrundb.C,v 1.9 2009-03-16 15:13:43 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    7878        cond += tel;
    7979    }
     80
     81    //cond +=" AND (RunData.fSourceKEY=403 OR RunData.fSourceKEY=871) ";
     82
    8083    plot.SetCondition(cond);
    8184
    … …  
    9497
    9598    plot.SetDescription("L1 trigger rate after cleaning;R_{L1}", "CleanL1");
    96     plot.Plot("RunDataCheck.fRateCleanedTrig", -0, 400, 1);
     99    plot.Plot("RunDataCheck.fRateCleanedTrig", -0.5, 399.5, 1);
    97100    plot.SetDescription("Sum trigger rate after cleaning;R_{sum}", "CleanSum");
    98     plot.Plot("RunDataCheck.fRateCleanedSum", -0, 400, 1);
     101    plot.Plot("RunDataCheck.fRateCleanedSum", -0.5, 399.5, 1);
    99102    plot.SetDescription("Unknown events trigger rate after cleaning;R_{0}", "Clean0");
    100     plot.Plot("RunDataCheck.fRateCleanedNull", -0, 400, 1);
     103    plot.Plot("RunDataCheck.fRateCleanedNull", -0.5, 399.5, 1);
    101104
    102105/*
    … …  
    122125}
    123126
    124 int plotrundb(TString from, TString to, const char *dataset=0)
     127int plotrundb(TString from, TString to, const char *dataset=0, UInt_t num=(UInt_t)-1)
    125128{
    126129    MSQLMagic serv("sql.rc");
    … …  
    142145
    143146    MPlot plot(serv);
    144     plot.SetDataSet(dataset);
     147    plot.SetDataSet(dataset, num);
    145148    plot.SetDisplay(d);
    146149    plot.SetRequestRange(from, to);
    … …  
    152155}
    153156
    154 int plotrundb(const char *ds)
     157int plotrundb(const char *ds, UInt_t num=(UInt_t)-1)
    155158{
    156159    MSQLMagic serv("sql.rc");
    … …  
    172175
    173176    MPlot plot(serv);
    174     plot.SetDataSet(ds);
     177    plot.SetDataSet(ds, num);
    175178    plot.SetDisplay(d);
    176179    plot.SetRequestRange("", "");

  • trunk/MagicSoft/Mars/ganymed.rc

    r9367 r9402  
    5656#MPointingDevCalc.MaxAge       1.0
    5757
    58 MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198
     58MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 1000534
    5959
    6060# -------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/ganymed_onoff.rc

    r9367 r9402  
    5656#MPointingDevCalc.MaxAge       1.0
    5757
    58 MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198
     58MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 1000534
    5959
    6060# -------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/ganymed_wobble.rc

    r9367 r9402  
    5656#MPointingDevCalc.MaxAge       1.0
    5757
    58 MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198
     58MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198 1000534
    5959
    6060# -------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc

    r9398 r9402  
    889889//
    890890MGeomCamMagicII::MGeomCamMagicII(const char *name)
    891     : MGeomCamDwarf(475., 30, 17, name)
     891    : MGeomCamDwarf(505., 30, 17, name)
    892892{
    893893    SetTitle("Geometry information of Magic II Camera");
    … …  
    902902//
    903903MGeomCamMagicII::MGeomCamMagicII(Double_t dist, const char *name)
    904     : MGeomCamDwarf(475., 30, dist, name)
     904    : MGeomCamDwarf(505., 30, dist, name)
    905905{
    906906    SetTitle("Geometry information of Magic II Camera");

  • trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

    r9195 r9402  
    159159//   18. Oct. 2007    291104      // Correction for the offsets introduced by AMC
    160160//   14. Jan. 2008    328198      // Complete new pointing model
    161 //   11. Jun. 2008              (ca. 23:00) // Before new TPoints
     161//   11. Jun. 2008   1000534    (ca. 23:00) // Before new TPoints
    162162//   19. Jun. 2008              (ca. 15:00) // From   new TPoints
     163//    7. Mar. 2009              (ca. 14:00) // From   new TPoints (0808-0902)
    163164//
    164165// From 2.2.2006 beginnig of the night (21:05h, run >=81855) to 24.2.2006
Note: See TracChangeset for help on using the changeset viewer.