Changeset 9518


Ignore:
Timestamp:
10/26/09 14:31:19 (15 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
67 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Makefile

    r9497 r9518  
    1616#
    1717
    18 OSTYPE=$(shell uname -s | tr '[:upper:]' '[:lower:]')
    19 
     18include Makefile.conf.general
    2019include Makefile.conf.$(OSTYPE)
    21 include Makefile.conf.general
    2220
    2321#
    … …  
    2624SOLIB    := libmars.so
    2725
    28 CINT     = M
     26CINT      = M
    2927
    3028#

  • trunk/MagicSoft/Mars/Makefile.conf.general

    r9394 r9518  
    1717#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
    1818#
     19OSTYPE   = $(shell uname -s | tr '[:upper:]' '[:lower:]')
     20
    1921DEFINES  := -DMARSVER=\"\<cvs\>\" -D__MARS__ $(ARCHDEF) $(MARSDEFINES)
    2022

  • trunk/MagicSoft/Mars/callisto.cc

    r9482 r9518  
    8787    gLog << "   --movie                   Write a movie in addition to Mode-Y (this might " << endl;
    8888    gLog << "                             stop the eventloop before all evts are processed)" << endl;
     89    gLog << "   --test                    Use this to calibrate the callibration files" << endl;
     90    gLog << "                             instead of the data files (for test purposes)" << endl;
    8991//    gLog << "   --moon                    Force using pedestal fits instead of calculated RMS" << endl;
    9092    gLog << "   --config=callisto.rc      Resource file [default=callisto.rc]" << endl;
    … …  
    177179    const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
    178180    const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--dev-null");
     181    const Bool_t  kTestMode   = arg.HasOnlyAndRemove("--test");
    179182//          Bool_t  kMoon       = arg.HasOnlyAndRemove("--moon");
    180183    Int_t kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
    … …  
    510513        job1.SetUseData();
    511514        job1.SetExtractionFundamental();
    512 //        job1.SetUseHists(kMoon);
    513515
    514516        if (!job1.Process())
    … …  
    627629        job4.SetNullOut(kNullOut);
    628630        job4.SetCommandLine(MArgs::GetCommandLine(argc, argv));
     631        job4.SetTestMode(kTestMode);
    629632        if (!seq.IsMonteCarlo())
    630633            job4.SetExtractor(job2.GetExtractor());

  • trunk/MagicSoft/Mars/ceres.rc

    r9426 r9518  
    4848# BinningZd.Raw:           70      0        70
    4949# BinningViewCone.Raw:    155      0        31
    50 # BinningTrigPod.Raw:     150    -25       125
     50# BinningTrigPos.Raw:     150    -25       125
    5151# BinningEvtWidth.Raw:    150      0        25
    5252# BinningDist.Raw:        100      0       2.5
    … …  
    137137PhotonDetectionEfficiency.FileName:    resmc/dwarf-pde-gapd.txt
    138138ConesAngularAcceptance.FileName:       resmc/dwarf-cones.txt
     139ConesTransmission.FileName:            resmc/dwarf-cones-trans.txt
    139140
    140141

  • trunk/MagicSoft/Mars/condor/program.submit

    r8880 r9518  
    22Arguments     = $(args)
    33
    4 Out           = $(out)
     4Output        = $(out)
    55Error         = $(err)
    66
    … …  
    88copy_to_spool = false
    99getenv        = True
    10 Log           = /tmp/delme.log
     10#Log           = /tmp/dag.log
     11#Log           = $(out)
    1112notification  = Error
    1213

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r9153 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

    r9302 r9518  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.33 2009-02-07 20:40:01 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.34 2009-10-26 14:31:17 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    170170
    171171// Datacenter default path for catalogs
    172 const TString MAstroCatalog::kDefaultPath="/magic/datacenter/setup";
     172const TString MAstroCatalog::kDefaultPath="/magic/datacenter/setup/";
    173173
    174174// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mastro/Makefile

    r7784 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mbadpixels/Makefile

    r8577 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mbase/MAGIC.cc

    r9195 r9518  
    4040bool MARS::CheckRootVer()
    4141{
     42    if (strcmp(gROOT->GetVersion(), "5.22/00")>0)
     43    {
     44        cout << "WARNING - Especially root 5.24/00 has a severe bug in projection 2D histograms" << endl;
     45        cout << "          which might cause unexpected crashes and could also affect the results." << endl;
     46        cout << "          Please, avoid using these root versions." << endl;
     47    }
     48
    4249    if (!strcmp(gROOT->GetVersion(), ROOT_RELEASE))
    4350        return true;

  • trunk/MagicSoft/Mars/mbase/MEnv.h

    r9345 r9518  
    4141    Int_t       GetValue(const char *name, Int_t dflt);
    4242    Double_t    GetValue(const char *name, Double_t dflt);
    43     const char *GetValue(const char *name, const char *dflt);
     43    const char *GetValue(const char *name, const char *dflt="");
    4444
    4545    // GetValue: regexp

  • trunk/MagicSoft/Mars/mbase/MLut.cc

    r9462 r9518  
    3838#include <stdlib.h>  // atoi (Ubuntu 8.10)
    3939
     40#include <TRegexp.h>
     41
    4042#include "MLog.h"
    4143#include "MLogManip.h"
    … …  
    286288Int_t MLut::ReadStream(istream &fin)
    287289{
     290    static const TRegexp reg("[^ 1234567890]");
     291
    288292    Delete();
     293
     294    Int_t n = 0;
    289295
    290296    while (1)
    … …  
    294300        if (!fin)
    295301            break;
     302
     303        n++;
     304
     305        if (line.Contains(reg))
     306        {
     307            gLog << warn << "WARNING - MLut::ReadStream: Line #" << n << " contains invalid character... ignored." << endl;
     308            continue;
     309        }
    296310
    297311        // Split line by whitespaces

  • trunk/MagicSoft/Mars/mbase/MParSpline.cc

    r9428 r9518  
    322322    fSpline->Paint("PC");
    323323}
     324
     325void MParSpline::RecursiveRemove(TObject *obj)
     326{
     327    if (obj==fSpline)
     328        fSpline=0;
     329}

  • trunk/MagicSoft/Mars/mbase/MParSpline.h

    r9428 r9518  
    2323public:
    2424    MParSpline(const char *name=0, const char *title=0);
     25    ~MParSpline()  { Clear(); }
    2526
    2627    // MParSpline
    … …  
    5051    void Paint(Option_t *o="");
    5152
     53    void RecursiveRemove(TObject *obj);
     54
    5255    ClassDef(MParSpline, 1) // Container to hold a MSpline3
    5356};

  • trunk/MagicSoft/Mars/mbase/MSpline3.cc

    r9450 r9518  
    157157//     W := fX[i+1]-fX[i]
    158158//
    159 Double_t MSpline3::Integral(Int_t i, Double_t x) const
     159Double_t MSpline3::IntegralBin(Int_t i, Double_t x) const
    160160{
    161161    Double_t x0, y, b, c, d;
    … …  
    171171// Return the integral of the spline's bin i.
    172172//
    173 Double_t MSpline3::Integral(Int_t i) const
     173Double_t MSpline3::IntegralBin(Int_t i) const
    174174{
    175175    Double_t x, y;
    … …  
    177177    GetKnot(i+1, x, y);
    178178
    179     return Integral(i, x);
     179    return IntegralBin(i, x);
    180180}
    181181
    … …  
    189189    const Int_t m = FindX(b);
    190190
    191     Double_t sum = -Integral(n, a);
     191    Double_t sum = -IntegralBin(n, a);
    192192
    193193    for (int i=n; i<=m-1; i++)
    194         sum += Integral(i);
    195 
    196     sum += Integral(m, b);
     194        sum += IntegralBin(i);
     195
     196    sum += IntegralBin(m, b);
    197197
    198198    return sum;
    … …  
    208208
    209209    for (int i=0; i<GetNp()-1; i++)
    210         sum += Integral(i);
     210        sum += IntegralBin(i);
    211211
    212212    return sum;

  • trunk/MagicSoft/Mars/mbase/MSpline3.h

    r9424 r9518  
    1515    MArrayD &ConvertFunc(const TF1 &f, Float_t freq) const;
    1616
    17     Double_t Integral(Int_t i, Double_t x) const;
    18     Double_t Integral(Int_t i) const;
     17    Double_t IntegralBin(Int_t i, Double_t x) const;
     18    Double_t IntegralBin(Int_t i) const;
    1919
    2020public:

  • trunk/MagicSoft/Mars/mbase/Makefile

    r9428 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r9374 r9518  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.187 2009-03-02 14:32:49 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.188 2009-10-26 14:31:18 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    13571357        {
    13581358          areavars[i] = (areavars[i] - areaphes[i]*areaphes[i]/numareavalid[i]) / (numareavalid[i]-1);
    1359           areaphes[i] = areaphes[i] / numareavalid[i];
     1359          areaphes[i] /= numareavalid[i];
    13601360        }
    13611361     

  • trunk/MagicSoft/Mars/mcalib/Makefile

    r8657 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mcamera/Makefile

    r7443 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mcorsika/MCorsikaRead.h

    r9186 r9518  
    1717{
    1818private:
    19     MCorsikaRunHeader *fRunHeader;  // run header information container to fill from file
    20     MCorsikaEvtHeader *fEvtHeader;  // event header information container to fill from file
    21     MPhotonEvent      *fEvent;      // event information
     19    MCorsikaRunHeader *fRunHeader;  //! run header information container to fill from file
     20    MCorsikaEvtHeader *fEvtHeader;  //! event header information container to fill from file
     21    MPhotonEvent      *fEvent;      //! event information
    2222
    2323    Bool_t          fForceMode;     // Force mode skipping defect RUNE

  • trunk/MagicSoft/Mars/mcorsika/Makefile

    r9182 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mdata/MDataMember.h

    r8892 r9518  
    1717    TString fDataMember;
    1818
    19     MParContainer *fObject;
    20     TMethodCall   *fCall;
     19    MParContainer *fObject; //! A pointer to the container from the paramater list
     20    TMethodCall   *fCall;   //! The corresponding method call to the member function
    2121
    2222    enum { kIsInt = BIT(14) };
    … …  
    4848    void SetVariables(const TArrayD &arr) { }
    4949
    50     ClassDef(MDataMember, 1) // MData object corresponding to a single data member of a Mars container
     50    ClassDef(MDataMember, 2) // MData object corresponding to a single data member of a Mars container
    5151};
    5252

  • trunk/MagicSoft/Mars/mdata/Makefile

    r8073 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/melectronics/Makefile

    r9473 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mextralgo/Makefile

    r7942 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfbase/Makefile

    r8091 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mfileio/Makefile

    r9029 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------
    1212
    1313INCLUDES = -I. -I../mbase -I../mraw -I../mmc -I../mreflector -I../mgui \
    14            -I../mdata -I../mbadpixels
     14           -I../mdata -I../mbadpixels -I../msim
    1515#mraw:       MRawRunHeader (MReadMaraFile)
    1616#mmc:        MMcRunHeader  (MReadMarsFile)

  • trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc

    r9374 r9518  
    388388    memset(fCut, 0, sizeof(fCut));
    389389
     390    switch (fType)
     391    {
     392    case kSinglePixelNeighbors:
     393        if (fNumNeighbors<2)
     394            *fLog << inf << "Software trigger switched off (fNumNeighbors<2)." << endl;
     395        else
     396            *fLog << inf << fNumNeighbors << " required above " << fThreshold << " within " << fTimeWindow << "ns." << endl;
     397        break;
     398    case kAnyPattern:
     399        *fLog << inf << "Cluster trigger switched on." << endl;
     400        break;
     401    }
     402
    390403    return kTRUE;
    391404}
    … …  
    400413    {
    401414    case kSinglePixelNeighbors:
    402         fResult = SwTrigger();
     415        fResult = fNumNeighbors>1 ? SwTrigger() : kTRUE;
    403416        break;
    404417    case kAnyPattern:

  • trunk/MagicSoft/Mars/mfilter/Makefile

    r8419 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mgeom/Makefile

    r9464 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mgui/Makefile

    r3927 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhbase/MH3.cc

    r9362 r9518  
    367367MH3::~MH3()
    368368{
    369     delete fHist;
     369    if (fHist)
     370        delete fHist;
    370371
    371372    for (int i=0; i<4; i++)

  • trunk/MagicSoft/Mars/mhbase/MHn.cc

    r9302 r9518  
    596596    }
    597597}
     598
     599void MHn::RecursiveRemove(TObject *obj)
     600{
     601    for (int i=0; i<6; i++)
     602    {
     603        if (!fHist[i])
     604            continue;
     605
     606        if (obj==fHist[i])
     607            fHist[i] = 0;
     608        else
     609            fHist[i]->RecursiveRemove(obj);
     610    }
     611}

  • trunk/MagicSoft/Mars/mhbase/MHn.h

    r9195 r9518  
    7575    //void Paint(Option_t *opt="");
    7676
     77    void RecursiveRemove(TObject *obj);
     78
    7779    ClassDef(MHn, 1) // Generalized histogram class for up to six histograms
    7880};

  • trunk/MagicSoft/Mars/mhbase/Makefile

    r8695 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhcalib/Makefile

    r8988 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhflux/Makefile

    r7717 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhft/Makefile

    r6857 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

    r9312 r9518  
    407407    if (obj==fErr)
    408408        fErr = 0;
    409 }
     409    if (obj==fSum)
     410        fSum = 0;
     411}

  • trunk/MagicSoft/Mars/mhvstime/Makefile

    r5676 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mimage/Makefile

    r8957 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r9480 r9518  
    17351735    cont.Add(&fSequence);
    17361736
     1737    TNamed cmdline("CommandLine", fCommandLine.Data());
     1738    cont.Add(&cmdline);
     1739
    17371740    return WriteContainer(cont, GetOutputFileName(), "UPDATE");
    17381741}

  • trunk/MagicSoft/Mars/mjobs/Makefile

    r9275 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mjoptim/Makefile

    r8643 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mmain/Makefile

    r9347 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mmontecarlo/Makefile

    r6939 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mmovie/Makefile

    r8434 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mmuon/Makefile

    r6979 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mpedestal/Makefile

    r8154 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

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

    r9402 r9518  
    162162//   19. Jun. 2008              (ca. 15:00) // From   new TPoints
    163163//    7. Mar. 2009              (ca. 14:00) // From   new TPoints (0808-0902)
     164//   14. May  2009                // M1/M2 after upgrade (from TPoints taken in the days before)
     165//   17. Aug. 2009              New pointing models for both telescopes
     166//
    164167//
    165168// From 2.2.2006 beginnig of the night (21:05h, run >=81855) to 24.2.2006
    … …  
    240243// found.
    241244//
     245// [2009-08-05 Mail from Markus Garcz. about M1]
     246// [...]
     247// On the 23.07.2009 we tested the new LUTs using the star Etamin. The
     248// PSF (sigma) improved from 11.0 mm to 9.5 mm and the total light content
     249// in one PMT from 54% to 62%.
     250// Furthermore I saw a small movement of the spot after the new focussing:
     251//   dX = 3 CCD pixel = 7 mm
     252//   dY = 2 CCD pixel = 4.7 mm
     253// The new LUTs are now installed since the 23.07.2009 and are used as
     254// default during the observation.
     255// [...]
     256//
     257//
     258// [2009-10-16 Email Adrian]
     259//
     260// I checked the AMC2 log files to check which LUTs had been used in which nights
     261//   until    09/09/12  the old version from March had always been used
     262//   09/09/13-09/09/16  LUT_090913 (test) was used (by mistake)
     263//   09/09/17-09/09/20  switched back to the version from March
     264//   since    09/09/21  using actual version LUT_090918
     265//                      (PSF at ~10deg still rather poor, but I see strange
     266//                      effects I do not yet understand and therefore cannot
     267//                      correct)
     268//  Especially: nothing has changed in the AMC on 09/09/09,
     269//  except that around that date the SBIG camera was readjusted (but this
     270//  has no direct affect on the AMC)
     271//
     272//
     273// Others
     274// ------
     275//
     276// The pointing of both(!) telescopes changed >2009/06/11 2:36h
     277// In both cases the reason is unknown.
     278//
     279// The pointing has changed for M2 after    2009/09/09 noon
     280// It recovered to the previous pointing at 2009/10/08 noon
     281// Resons unknown (there were LUT changes but at different dates)
     282//
    242283//
    243284// ToDo:

  • trunk/MagicSoft/Mars/mpointing/Makefile

    r7560 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mranforest/Makefile

    r7413 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mraw/Makefile

    r8999 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mreport/Makefile

    r8955 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/msignal/Makefile

    r8154 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/msim/Makefile

    r9351 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc

    r9462 r9518  
    173173        break;
    174174
     175    case 3:
     176        ncells    = 60;
     177        crosstalk = 0.15;
     178        deadtime  = 3;
     179        recovery  = 8.75;
     180        break;
     181
    175182    default:
    176183        *fLog << err << "ERROR - APD type " << fType << " undefined." << endl;

  • trunk/MagicSoft/Mars/msimcamera/MSimBundlePhotons.cc

    r9422 r9518  
    173173        const Int_t &idx = row[0];
    174174
    175         // Check if we were routed to a valid entry
     175        // Check if we were routed to a valid entry ("not connected")
    176176        // if not throw away this photon.
    177177        if (idx<0)

  • trunk/MagicSoft/Mars/msimcamera/MSimExcessNoise.cc

    r9252 r9518  
    5959//
    6060MSimExcessNoise::MSimExcessNoise(const char* name, const char *title)
    61 : fEvt(0)
     61: fEvt(0), fExcessNoise(0.2)
    6262{
    6363    fName  = name  ? name  : "MSimExcessNoise";
    … …  
    7777        return kFALSE;
    7878    }
     79
     80    *fLog << inf << "Excess Noise Factor in use " << fExcessNoise << "%" << endl;
    7981
    8082    return kTRUE;
    … …  
    9698            continue;
    9799
    98         const Float_t neww = gRandom->Gaus(oldw, 0.2*TMath::Sqrt(oldw));
     100        const Float_t neww = gRandom->Gaus(oldw, fExcessNoise*TMath::Sqrt(oldw));
    99101        ph.SetWeight(neww);
    100102    }
    … …  
    102104    return kTRUE;
    103105}
     106
     107// --------------------------------------------------------------------------
     108//
     109// ExcessNoise: 0.2
     110//
     111Int_t MSimExcessNoise::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
     112{
     113    Bool_t rc = kFALSE;
     114    if (IsEnvDefined(env, prefix, "ExcessNoise", print))
     115    {
     116        rc = kTRUE;
     117        fExcessNoise = GetEnvValue(env, prefix, "ExcessNoise", fExcessNoise);
     118    }
     119
     120    return rc;
     121}

  • trunk/MagicSoft/Mars/msimcamera/MSimExcessNoise.h

    r9239 r9518  
    1414    MPhotonEvent *fEvt;     //! Event storing the photons
    1515
     16    Double_t fExcessNoise;
     17
     18    // MParContainer
     19    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
     20
    1621    // MTask
    1722    Int_t PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc

    r9465 r9518  
    277277    }
    278278
    279     fElectronicNoise = 0;
    280     if (fShiftBaseline)
    281     {
    282         fElectronicNoise = (MPedestalCam*)pList->FindObject("ElectronicNoise", "MPedestalCam");
    283         if (!fElectronicNoise)
    284         {
    285             *fLog << err << "ElectronicNoise [MPedestalCam] not found... aborting." << endl;
    286             return kFALSE;
    287         }
    288         *fLog << inf << "Baseline will be shifted back to 0 for discriminator." << endl;
    289     }
    290 
    291     fGain = 0;
    292     if (fUngainSignal)
    293     {
    294         fGain = (MPedestalCam*)pList->FindObject("Gain", "MPedestalCam");
    295         if (!fGain)
    296         {
    297             *fLog << err << "Gain [MPedestalCam] not found... aborting." << endl;
    298             return kFALSE;
    299         }
    300         *fLog << inf << "Discriminator will be multiplied by applied gain." << endl;
    301     }
    302 
    303279    fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
    304280    if (!fRunHeader)
    … …  
    311287    if (!fEvtHeader)
    312288        return kFALSE;
     289
     290    if (!fSimulateElectronics)
     291    {
     292        *fLog << inf << "Simulation of electronics switched off... first photon will trigger." << endl;
     293        return kTRUE;
     294    }
     295
     296    fElectronicNoise = 0;
     297    if (fShiftBaseline)
     298    {
     299        fElectronicNoise = (MPedestalCam*)pList->FindObject("ElectronicNoise", "MPedestalCam");
     300        if (!fElectronicNoise)
     301        {
     302            *fLog << err << "ElectronicNoise [MPedestalCam] not found... aborting." << endl;
     303            return kFALSE;
     304        }
     305        *fLog << inf << "Baseline will be shifted back to 0 for discriminator." << endl;
     306    }
     307
     308    fGain = 0;
     309    if (fUngainSignal)
     310    {
     311        fGain = (MPedestalCam*)pList->FindObject("Gain", "MPedestalCam");
     312        if (!fGain)
     313        {
     314            *fLog << err << "Gain [MPedestalCam] not found... aborting." << endl;
     315            return kFALSE;
     316        }
     317        *fLog << inf << "Discriminator will be multiplied by applied gain." << endl;
     318    }
    313319
    314320    fRouteAC.Delete();

  • trunk/MagicSoft/Mars/msimcamera/Makefile

    r9436 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/msimreflector/MReflector.cc

    r9490 r9518  
    373373// SigmaPSF can be used to set a default for the psf of the mirrors
    374374// read from the file. Note, that this can be overwritten for individual
    375 // mirrors in the file.
     375// mirrors in the file. The SigmaPSF is the sigma of a 1D-Gauss fitted
     376// to the radial profile of the light distribution.
    376377//
    377378// For details on the file structure see MReflector::ReadFile

  • trunk/MagicSoft/Mars/msql/Makefile

    r7940 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111############################################################

  • trunk/MagicSoft/Mars/mtrigger/Makefile

    r5725 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------

  • trunk/MagicSoft/include-Classes/MMcFormat/Makefile

    r7436 r9518  
    66#
    77##################################################################
     8include ../Makefile.conf.general
    89include ../Makefile.conf.$(OSTYPE)
    9 include ../Makefile.conf.general
    1010
    1111#------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.