Changeset 9374 for trunk


Ignore:
Timestamp:
03/02/09 14:34:40 (16 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9373 r9374  
    3131     msimreflector/MMirrorSquare.[h,cc], msimreflector/MReflector.[h,cc]:
    3232     - added GetA member function
     33
     34   * manalysis/MCameraData.cc, mbadpixels/MBadPixelsCalc.cc,
     35     mbadpixels/MBadPixelsCam.cc, mbadpixels/MBadPixelsTreat.cc,
     36     mcalib/MCalibrationCam.cc, mcalib/MCalibrationChargeCalc.cc,
     37     mcalib/MCalibrationChargeCam.cc, mcalib/MCalibrationPulseTimeCam.cc,
     38     mcalib/MCalibrationRelTimeCalc.cc, mcalib/MCalibrationRelTimeCam.cc,
     39     mcalib/MCalibrationTestCalc.cc, mcalib/MCalibrationTestCam.cc,
     40     mcorsika/MCorsikaEvtHeader.cc, mfilter/MFSoftwareTrigger.cc,
     41     mgeom/MGeomCam.cc, mhcalib/MHCalibrationCam.cc,
     42     mhcalib/MHCalibrationChargeCam.cc, mhcalib/MHCalibrationPulseTimeCam.cc,
     43     mhcalib/MHCalibrationRelTimeCam.cc, mhft/MHexagonalFTCalc.cc,
     44     mhist/MHCamera.cc, mimage/MHillas.cc, mimage/MNewImagePar.cc,
     45     mjobs/MJCut.cc, mjobs/MJSimulation.cc, mpedestal/MExtractPedestal.cc,
     46     mpedestal/MPedPhotCam.cc, mpedestal/MPedestalCam.cc,
     47     mpointing/MPointingPos.h, msignal/MSignalCam.cc,
     48     msimcamera/MSimGeomCam.cc:
     49     - replaced MGeomPix by MGeom
     50
     51   * mjobs/MJStar.cc:
     52     - added BinningDist
     53     - converted Muon cuts from mm to deg
    3354
    3455

  • trunk/MagicSoft/Mars/manalysis/MCameraData.cc

    r8491 r9374  
    4343
    4444#include "MGeomCam.h"
    45 #include "MGeomPix.h"
     45#include "MGeom.h"
    4646
    4747#include "MPedPhotCam.h"

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

    r7760 r9374  
    6767
    6868#include "MGeomCam.h"
    69 #include "MGeomPix.h"
     69#include "MGeom.h"
    7070
    7171#include "MPedPhotCam.h"

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

    r9369 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.53 2009-03-01 21:48:13 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.54 2009-03-02 14:32:49 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    4747
    4848#include "MGeomCam.h"
    49 #include "MGeomPix.h"
     49#include "MGeom.h"
    5050
    5151ClassImp(MBadPixelsCam);

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

    r9369 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.42 2009-03-01 21:48:13 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.43 2009-03-02 14:32:49 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    8585#include "MParList.h"
    8686
    87 #include "MGeomPix.h"
     87#include "MGeom.h"
    8888#include "MGeomCam.h"
    8989

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

    r8504 r9374  
    5959
    6060#include "MGeomCam.h"
    61 #include "MGeomPix.h"
     61#include "MGeom.h"
    6262
    6363#include "MBadPixelsCam.h"

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

    r9369 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.186 2009-03-01 21:48:13 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.187 2009-03-02 14:32:49 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    221221
    222222#include "MGeomCam.h"
    223 #include "MGeomPix.h"
     223#include "MGeom.h"
    224224#include "MHCamera.h"
    225225

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

    r8923 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.72 2008-06-03 15:26:39 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.73 2009-03-02 14:32:49 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    9595
    9696#include "MGeomCam.h"
    97 #include "MGeomPix.h"
     97#include "MGeom.h"
    9898
    9999#include "MBadPixelsCam.h"

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

    r8957 r9374  
    8282
    8383#include "MGeomCam.h"
    84 #include "MGeomPix.h"
     84#include "MGeom.h"
    8585
    8686#include "MCalibrationPix.h"

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

    r8582 r9374  
    7272
    7373#include "MGeomCam.h"
    74 #include "MGeomPix.h"
     74#include "MGeom.h"
    7575
    7676#include "MCalibrationRelTimeCam.h"

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

    r8497 r9374  
    8282
    8383#include "MGeomCam.h"
    84 #include "MGeomPix.h"
     84#include "MGeom.h"
    8585
    8686#include "MCalibrationRelTimePix.h"

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

    r9369 r9374  
    6060
    6161#include "MGeomCam.h"
    62 #include "MGeomPix.h"
     62#include "MGeom.h"
    6363#include "MHCamera.h"
    6464

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

    r6243 r9374  
    4242
    4343#include "MGeomCam.h"
    44 #include "MGeomPix.h"
     44#include "MGeom.h"
    4545
    4646ClassImp(MCalibrationTestCam);

  • trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

    r9336 r9374  
    112112    fStartAltitude          = f[3];
    113113    fFirstTargetNum         = f[4];
    114     fFirstInteractionHeight = f[5];
     114    fFirstInteractionHeight = f[5]; // FIXME: Could be negative
    115115
    116116    // Pointing opposite particle direction

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

    r9369 r9374  
    7272#include "MParList.h"
    7373
    74 #include "MGeomPix.h"
     74#include "MGeom.h"
    7575#include "MGeomCam.h"
    7676

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

    r9369 r9374  
    7373#include "MLogManip.h"
    7474
    75 #include "MGeomPix.h"
     75#include "MGeom.h"
    7676
    7777ClassImp(MGeomCam);
    … …  
    177177void MGeomCam::InitOuterRing()
    178178{
    179     fPixels.R__FOR_EACH(MGeomPix, CheckOuterRing)(*this);
     179    fPixels.R__FOR_EACH(MGeom, CheckOuterRing)(*this);
    180180}
    181181
    … …  
    518518//
    519519// Return direction of p2 w.r.t. p1. For more details
    520 // see MGeomPix::GetDirection
     520// see MGeom::GetDirection
    521521//
    522522Int_t MGeomCam::GetDirection(UInt_t p1, UInt_t p2) const

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

    r9153 r9374  
    8585
    8686#include "MGeomCam.h"
    87 #include "MGeomPix.h"
     87#include "MGeom.h"
    8888
    8989#include "MParList.h"

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

    r8988 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.62 2008-06-30 09:36:36 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.63 2009-03-02 14:32:50 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    147147
    148148#include "MGeomCam.h"
    149 #include "MGeomPix.h"
     149#include "MGeom.h"
    150150
    151151#include "MBadPixelsCam.h"

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

    r9157 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.43 2008-11-12 15:55:32 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.44 2009-03-02 14:32:50 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    133133
    134134#include "MGeomCam.h"
    135 #include "MGeomPix.h"
     135#include "MGeom.h"
    136136
    137137#include "MBadPixelsCam.h"

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

    r8910 r9374  
    117117
    118118#include "MGeomCam.h"
    119 #include "MGeomPix.h"
     119#include "MGeom.h"
    120120
    121121#include "MBadPixelsCam.h"

  • trunk/MagicSoft/Mars/mhft/MHexagonalFTCalc.cc

    r6857 r9374  
    5858
    5959#include "MGeomCam.h"
    60 #include "MGeomPix.h"
     60#include "MGeom.h"
    6161
    6262#include "MSignalCam.h"

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

    r9369 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.119 2009-03-01 21:48:14 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.120 2009-03-02 14:32:50 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    8080#include "MBinning.h"
    8181
    82 #include "MGeomPix.h"
     82#include "MGeom.h"
    8383#include "MGeomCam.h"
    8484

  • trunk/MagicSoft/Mars/mimage/MHillas.cc

    r9369 r9374  
    6666#include <TVector2.h>
    6767
    68 #include "MGeomPix.h"
     68#include "MGeom.h"
    6969#include "MGeomCam.h"
    7070

  • trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

    r9369 r9374  
    8484
    8585#include "MGeomCam.h"
    86 #include "MGeomPix.h"
     86#include "MGeom.h"
    8787
    8888#include "MSignalCam.h"

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

    r9278 r9374  
    259259    if (fNameResult.IsNull() && fStoreResult)
    260260    {
     261        // If no special name fNameResult is given but the result should be stored,
     262        // search for a file named oname (fNameOutput or ganymed%08d.root)
    261263        file = (TFile*)gROOT->GetListOfFiles()->FindObject(oname);
    262         if (file)
    263             file->cd();
     264        if (!file)
     265        {
     266            *fLog << err << "ERROR - File " << oname << " expected to be open, but isn't..." << endl;
     267            return kFALSE;
     268        }
     269
     270        file->cd();
    264271    }
    265272    else
     273    {
     274        // If special name fNameResult is given or no storage requested,
     275        // open a new file named oname (fNameOutput or ganymed%08d.root)
    266276        file = TFile::Open(oname, fOverwrite?"RECREATE":"NEW", "File created by MJCut", 9);
    267277
    268     if (!file)
    269     {
    270         *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
    271         return kFALSE;
    272     }
    273 
     278        if (!file)
     279        {
     280            *fLog << err << "ERROR - Couldn't open new file " << oname << " for writing..." << endl;
     281            return kFALSE;
     282        }
     283    }
     284
     285    // Write container to output file
    274286    const Bool_t rc = WriteContainer(cont);
    275287
     288    // If file was newly opened, close it
    276289    if (!(fNameResult.IsNull() && fStoreResult))
    277290        delete file;
    278291
     292    // Return result of writing
    279293    return rc;
    280294}
    … …  
    301315        arr.Add((TObject*)(&halpha->GetAlphaFitter()));
    302316
    303     // Save also the dataset
     317    // Save also the dataset, environment and display
    304318    arr.Add(const_cast<MDataSet*>(&set));
     319    arr.Add(const_cast<TEnv*>(GetEnv()));
     320    if (fDisplay)
     321        arr.Add(fDisplay);
    305322
    306323    const Int_t num = set.GetNumAnalysis();
    … …  
    317334        }
    318335    }
    319 
    320     if (fDisplay)
    321         arr.Add(fDisplay);
    322 
    323     arr.Add(const_cast<TEnv*>(GetEnv()));
    324336
    325337    return WriteContainer(arr, fname, "UPDATE");
    … …  
    9951007    fillsrc.SetNameTab("SrcPos");
    9961008
    997     if (set.IsWobbleMode() && !set.IsMonteCarlo())
     1009    if (set.IsWobbleMode()/* && !set.IsMonteCarlo()*/)
    9981010        tlist2.AddToListBefore(&fillsrc, &hcalc);
    9991011

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

    r9362 r9374  
    496496    //  NSB = 0.2*6e-3
    497497
    498     // FIXME: Simulate photons before QE!
     498    // MAGIC: 84MHz       / Pixel
     499    // DWARF: 14MHz-25Mhz / APD
     500
     501
     502    // FIXME: Simulate photons before cones and QE!
    499503
    500504    MSimRandomPhotons  simnsb;
    … …  
    520524
    521525    MParameterD pulpos("IntendedPulsePos");
    522 //    pulpos.SetVal(40);  // [ns]
     526    // FIXME: Set a default which could be 1/3 of the digitization window
     527    //    pulpos.SetVal(40);  // [ns]
    523528    plist.AddToList(&pulpos);
    524529

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

    r9369 r9374  
    174174    MBinning bins5("BinningMuonWidth");
    175175    MBinning bins6("BinningArcPhi");
     176    MBinning binsd("BinningDist");
    176177    plist.AddToList(&bins1);
    177178    plist.AddToList(&bins2);
    … …  
    180181    plist.AddToList(&bins5);
    181182    plist.AddToList(&bins6);
     183    plist.AddToList(&binsd);
    182184
    183185
    … …  
    434436    MFDataPhrase fmuon1("MHillas.fSize>150 && MNewImagePar.fConcCOG<0.1", "MuonPreCut");
    435437    // Filter to calculate further muon parameters
    436     MFDataPhrase fmuon2("(MMuonSearchPar.fRadius>180) && (MMuonSearchPar.fRadius<400) &&"
    437                         "(MMuonSearchPar.fDeviation<45)", "MuonSearchCut");
     438    MFDataPhrase fmuon2("(MMuonSearchPar.fRadius*MGeomCam.fConvMm2Deg>0.6) && (MMuonSearchPar.fRadius*MGeomCam.fConvMm2Deg<1.35) &&"
     439                        "(MMuonSearchPar.fDeviation*MGeomCam.fConvMm2Deg<0.152)", "MuonSearchCut");
    438440    // Filter to fill the MHMuonPar
    439     MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation<35) &&"
     441    MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation*MGeomCam.fConvMm2Deg<0.118) &&"
    440442                        "(MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04) &&"
    441443                        "MMuonCalibPar.fRelTimeSigma<1.5",

  • trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

    r9157 r9374  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.39 2008-11-12 16:04:18 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.40 2009-03-02 14:32:50 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    166166#include "MPedestalCam.h"
    167167
    168 #include "MGeomPix.h"
     168#include "MGeom.h"
    169169#include "MGeomCam.h"
    170170

  • trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc

    r7804 r9374  
    5050
    5151#include "MGeomCam.h"
    52 #include "MGeomPix.h"
     52#include "MGeom.h"
    5353
    5454#include "MBadPixelsCam.h"

  • trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc

    r8912 r9374  
    5858
    5959#include "MGeomCam.h"
    60 #include "MGeomPix.h"
     60#include "MGeom.h"
    6161
    6262#include "MBadPixelsCam.h"

  • trunk/MagicSoft/Mars/mpointing/MPointingPos.h

    r8915 r9374  
    2727    Double_t fHa;  // [h]   Hour angle
    2828    Double_t fDec; // [deg] Declination
     29
     30    // Hour angle!
     31    // Angle to magnetic field!
    2932
    3033public:

  • trunk/MagicSoft/Mars/msignal/MSignalCam.cc

    r9369 r9374  
    4545
    4646#include "MGeomCam.h"
    47 #include "MGeomPix.h"
     47#include "MGeom.h"
    4848
    4949ClassImp(MSignalCam);

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

    r9356 r9374  
    5454
    5555#include "MGeomCam.h"
    56 #include "MGeomPix.h"
     56#include "MGeom.h"
    5757
    5858#include "MPhotonEvent.h"
Note: See TracChangeset for help on using the changeset viewer.