Changeset 4882


Ignore:
Timestamp:
09/07/04 12:12:05 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r4881 r4882  
    2020                                                 -*-*- END OF LINE -*-*-
    2121
     22 2004/09/07: Thomas Bretz
     23
     24   * merpp.cc:
     25     - added lost update-option
     26
     27   * mjobs/MJCalibrateSignal.cc:
     28     - fixed a compiler error geom.ClassName() --> geom
     29
     30   * mraw/MRawRunHeader.cc:
     31     - added 'header' option to Print-function
     32
     33   * msql/MSQLServer.[h,cc]:
     34     - added new onstructors taking TEnv as argument
     35
     36   * macros/sql/*.C:
     37     - updated to use sql.rc
     38
     39   * macros/sql/sql.rc:
     40     - added
     41
     42   * mcalib/MCalib*.[h,cc]:
     43     - simplified the includes a little bit to accelerate compiling
     44       and maybe to secure everything from compiler bugs a bit more
     45
     46
     47
    2248 2004/09/07: Markus Gaug
    2349
    … …  
    3662   * mcalib/MCalibColorSet.cc
    3763     - implemented intensity recognition
     64
    3865
    3966

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

    r4661 r4882  
    99#endif
    1010#ifndef ROOT_TArrayI
    11 #include "TArrayI.h"
     11#include <TArrayI.h>
    1212#endif
    1313#ifndef ROOT_TArrayF
    14 #include "TArrayF.h"
     14#include <TArrayF.h>
    1515#endif
    1616
    … …  
    5353
    5454  MCalibrationCam(const char *name=NULL, const char *title=NULL);
    55   virtual ~MCalibrationCam();
     55  ~MCalibrationCam();
    5656 
    57   virtual void Clear           ( Option_t *o="");
    58   virtual void DrawPixelContent( Int_t num) const;   
    59   virtual void Copy(TObject& object) const;
     57  void Clear           ( Option_t *o="");
     58  void DrawPixelContent( Int_t num) const;
     59  void Copy(TObject& object) const;
    6060 
    6161  // Getters
    … …  
    7575  const Int_t            GetNumUnreliable       ( Int_t aidx ) const;
    7676
    77   virtual Bool_t         GetPixelContent     ( Double_t &val, Int_t idx,
    78                                                const MGeomCam &cam, Int_t type=0) const;
     77  Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
    7978  const PulserColor_t    GetPulserColor()                 const { return fPulserColor;         }
    8079  const Int_t            GetSize()                        const;
    … …  
    8483
    8584  // Inits
    86   virtual void  Init           ( const MGeomCam &geom         );
     85  void  Init           ( const MGeomCam &geom         );
    8786  void  InitSize               ( const UInt_t i               );
    8887  void  InitAverageAreas       ( const UInt_t i               );

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

    r4673 r4882  
    4343#include "MCalibrationChargeBlindPix.h"
    4444
    45 #include "MCalibrationCam.h"
    4645#include "MParContainer.h"
    4746

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindCam.h

    r4671 r4882  
    11#ifndef MARS_MCalibrationChargeBlindCam
    22#define MARS_MCalibrationChargeBlindCam
    3 
    4 #ifndef MARS_MParContainer
    5 #include "MParContainer.h"
    6 #endif
    73
    84#ifndef ROOT_TObjArray

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

    r4669 r4882  
    3737#include "MCalibrationChargeBlindPix.h"
    3838
    39 #include "MCalibrationCam.h"
    40 
    4139ClassImp(MCalibrationChargeBlindCamOneOldStyle);
    4240
    4341using namespace std;
     42
    4443// --------------------------------------------------------------------------
    4544//

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

    r4842 r4882  
    3737#include "MCalibrationChargeBlindPix.h"
    3838
    39 #include "MCalibrationCam.h"
    40 
    4139ClassImp(MCalibrationChargeBlindCamTwoNewStyle);
    4240
    4341using namespace std;
     42
    4443// --------------------------------------------------------------------------
    4544//

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

    r4673 r4882  
    5353/////////////////////////////////////////////////////////////////////////////
    5454#include "MCalibrationChargeBlindPix.h"
    55 #include "MCalibrationCam.h"
    5655
    5756#include <TH1.h>

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.h

    r4673 r4882  
    22#define MARS_MCalibrationChargeBlindPix
    33
    4 #ifndef MARS_MCalibrationChargeCam
    5 #include "MCalibrationChargeCam.h"
     4#ifndef ROOT_TArrayF
     5#include <TArrayF.h>
     6#endif
     7
     8#ifndef MARS_MCalibrationCam
     9#include "MCalibrationCam.h"
    610#endif
    711

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

    r4853 r4882  
    216216
    217217#include "MBadPixelsCam.h"
    218 #include "MBadPixelsPix.h"
    219218
    220219#include "MCalibrationQECam.h"
    221220#include "MCalibrationQEPix.h"
    222 
    223 #include "MCalibrationCam.h"
    224221
    225222ClassImp(MCalibrationChargeCalc);

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

    r4851 r4882  
    2424
    2525#ifndef ROOT_TArrayC
    26 #include "TArrayC.h"
     26#include <TArrayC.h>
    2727#endif
    2828
    … …  
    4242class MExtractedSignalPINDiode;
    4343class MBadPixelsCam;
    44 class MBadPixelsPix;
    4544class MTime;
     45
    4646class MCalibrationChargeCalc : public MTask
    4747{

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

    r4852 r4882  
    8181/////////////////////////////////////////////////////////////////////////////
    8282#include "MCalibrationChargeCam.h"
    83 #include "MCalibrationCam.h"
    8483
    8584#include <TClonesArray.h>

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

    r4852 r4882  
    77
    88#ifndef ROOT_TArrayI
    9 #include "TArrayI.h"
     9#include <TArrayI.h>
    1010#endif
    1111

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

    r3698 r4882  
    5151#include "MCalibrationChargePINDiode.h"
    5252#include "MCalibrationChargePix.h"
    53 
    54 #include "MCalibrationCam.h"
    5553
    5654#include "MLog.h"

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

    r4853 r4882  
    2121!
    2222\* ======================================================================== */
     23
    2324/////////////////////////////////////////////////////////////////////////////
    2425//                                                                         

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

    r3657 r4882  
    4646/////////////////////////////////////////////////////////////////////////////
    4747#include "MCalibrationPedCam.h"
    48 #include "MCalibrationCam.h"
    4948
    5049#include <TClonesArray.h>

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

    r4857 r4882  
    7474/////////////////////////////////////////////////////////////////////////////
    7575#include "MCalibrationQECam.h"
    76 #include "MCalibrationCam.h"
    7776
    7877#include <TClonesArray.h>
    … …  
    8786using namespace std;
    8887
    89 const Float_t MCalibrationQECam::gkPlexiglassQE         = 0.96;
    90 const Float_t MCalibrationQECam::gkPlexiglassQEErr      = 0.01;
     88const Float_t MCalibrationQECam::gkPlexiglassQE    = 0.96;
     89const Float_t MCalibrationQECam::gkPlexiglassQEErr = 0.01;
     90
    9191// --------------------------------------------------------------------------
    9292//

  • trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h

    r4876 r4882  
    77
    88#ifndef ROOT_TArrayC
    9 #include "TArrayC.h"
     9#include <TArrayC.h>
    1010#endif
    1111
    … …  
    7676
    7777#endif
    78 
    79 
    80 
    81 
    82 

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

    r4850 r4882  
    182182/////////////////////////////////////////////////////////////////////////////
    183183#include "MCalibrationQEPix.h"
    184 #include "MCalibrationCam.h"
    185184
    186185#include "MLog.h"
    187186#include "MLogManip.h"
    188 
    189 #include "TArrayF.h"
    190 #include "TArrayC.h"
    191187
    192188ClassImp(MCalibrationQEPix);

  • trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h

    r4850 r4882  
    77
    88#ifndef ROOT_TArrayF
    9 #include "TArrayF.h"
     9#include <TArrayF.h>
    1010#endif
    1111
    1212#ifndef ROOT_TArrayC
    13 #include "TArrayC.h"
     13#include <TArrayC.h>
    1414#endif
    1515

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

    r4133 r4882  
    33
    44/////////////////////////////////////////////////////////////////////////////
    5 //                                                                         //
    6 // MCalibrationRelTimeCalc                                                   //
    7 //                                                                         //
    8 // Integrates the time slices of the all pixels of a calibration event     //
    9 // and substract the pedestal value                                        //
    10 //                                                                         //
     5//
     6// MCalibrationRelTimeCalc
     7//
     8// Integrates the time slices of the all pixels of a calibration event
     9// and substract the pedestal value
     10//
    1111/////////////////////////////////////////////////////////////////////////////
    1212
    … …  
    1919#endif
    2020
    21 #ifndef MARS_MCalibrationRelTimeCam
    22 #include "MCalibrationRelTimeCam.h"
    23 #endif
    24 
    25 class MCalibrationRelTimePix;
    2621class MCalibrationRelTimeCam;
    2722class MGeomCam;
    2823class MBadPixelsCam;
    29 class MBadPixelsPix;
     24
    3025class MCalibrationRelTimeCalc : public MTask
    3126{

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

    r4269 r4882  
    55#include "MCalibrationCam.h"
    66#endif
    7 
    8 #ifndef ROOT_TArrayI
    9 #include "TArrayI.h"
    10 #endif
    11 
    127
    138class MCalibrationRelTimeCam : public MCalibrationCam

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

    r3644 r4882  
    4545
    4646using namespace std;
     47
    4748// --------------------------------------------------------------------------
    4849//

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

    r4649 r4882  
    2323class MBadPixelsCam;
    2424class MGeomCam;
     25
    2526class MCalibrationTestCalc : public MTask
    2627{

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

    r4658 r4882  
    1111
    1212#ifndef ROOT_TArrayI
    13 #include "TArrayI.h"
     13#include <TArrayI.h>
    1414#endif
    1515
    1616class TClonesArray;
    1717class MCalibrationTestPix;
     18
    1819class MCalibrationTestCam : public MParContainer, public MCamEvent
    1920{

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

    r4873 r4882  
    8181const Int_t   MHCalibrationCam::fgAverageNbins    = 2000;
    8282const Int_t   MHCalibrationCam::fgPulserFrequency = 500;
     83
    8384// --------------------------------------------------------------------------
    8485//
    … …  
    123124    SetPulserFrequency();
    124125
     126}
     127
     128const Int_t MHCalibrationCam::GetSize() const
     129{
     130    return fHiGainArray->GetSize();
    125131}
    126132

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h

    r4873 r4882  
    11#ifndef MARS_MHCalibrationCam
    22#define MARS_MHCalibrationCam
    3 
    4 #ifndef ROOT_TObjArray
    5 #include <TObjArray.h>
    6 #endif
    73
    84#ifndef ROOT_TArrayI
    … …  
    3026
    3127class TText;
    32 class TArrayI;
    33 class TArrayF;
     28class TObjArray;
     29
    3430class MHGausEvents;
    3531class MGeomCam;
    … …  
    3935class MBadPixelsCam;
    4036class MBadPixelsPix;
     37
    4138class MHCalibrationCam : public MH, public MCamEvent
    4239{
    … …  
    151148  const Float_t        GetNumLoGainSaturationLimit()     const  { return fNumLoGainSaturationLimit; }
    152149  const TArrayI       &GetRunNumbers         ()          const;
    153   const Int_t          GetSize               ()          const  { return fHiGainArray->GetSize();   }
     150  const Int_t          GetSize               ()          const;
    154151
    155152  const Bool_t         IsDebug               ()          const  { return fDebug; }

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindCam.h

    r4602 r4882  
    22#define MARS_MHCalibrationChargeBlindCam
    33
    4 #ifndef ROOT_TObjArray
    5 #include <TObjArray.h>
    6 #endif
    7 
    84#ifndef MARS_MH
    95#include "MH.h"
    10 #endif
    11 #ifndef MARS_MCamEvent
    12 #include "MCamEvent.h"
    13 #endif
    14 #ifndef MARS_MBadPixelsPix
    15 #include "MBadPixelsPix.h"
    166#endif
    177#ifndef MARS_MHCalibrationChargeBlindPix
    … …  
    199#endif
    2010
     11class TObjArray;
     12
     13class MRawRunHeader;
    2114class MExtractedSignalBlindPixel;
    2215class MCalibrationChargeBlindCam;
    23 class MRawRunHeader;
    2416class MHCalibrationChargeBlindPix;
     17
    2518class MHCalibrationChargeBlindCam : public MH
    2619{

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h

    r4602 r4882  
    77#endif
    88
    9 #ifndef ROOT_TMatrix
    10 #include <TMatrix.h>
    11 #endif
    12 
    139#ifndef ROOT_TF1
    1410#include <TF1.h>
    1511#endif
    1612
     13#ifndef ROOT_TVector
     14#include <TVector.h>
     15#endif
     16
    1717class TH1F;
    18 class TF1;
    1918class TPaveText;
    2019class TText;
    … …  
    2423class MExtractBlindPixel;
    2524class MExtractedSignalBlindPixel;
     25
    2626class MHCalibrationChargeBlindPix : public MHGausEvents
    2727{

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h

    r4814 r4882  
    1919class MCalibrationChargePix;
    2020class MHCalibrationChargePix;
     21
    2122class MHCalibrationChargeCam : public MHCalibrationCam
    2223{

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

    r4790 r4882  
    4646const Axis_t  MHCalibrationChargeHiGainPix::fgAbsTimeFirst    = -0.5;
    4747const Axis_t  MHCalibrationChargeHiGainPix::fgAbsTimeLast     = 19.5;
     48
    4849// --------------------------------------------------------------------------
    4950//

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h

    r4792 r4882  
    77#endif
    88
    9 class TH1F;
    109class MHCalibrationChargeHiGainPix : public MHCalibrationChargePix
    1110{

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.h

    r3696 r4882  
    1010class MExtractedSignalPINDiode;
    1111class MCalibrationChargePINDiode;
     12
    1213class MHCalibrationChargePINDiode : public MHCalibrationChargePix
    1314{

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h

    r4636 r4882  
    66#endif
    77
    8 class TH1F;
    98class MHCalibrationChargePix : public MHGausEvents
    109{

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

    r4815 r4882  
    107107#include "MHGausEvents.h"
    108108
    109 #include "MArrayI.h"
    110 #include "MArrayD.h"
    111 
    112109ClassImp(MHCalibrationRelTimeCam);
    113110
    … …  
    403400Bool_t MHCalibrationRelTimeCam::FinalizeHists()
    404401{
    405 
    406402  for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
    407403    {
    … …  
    422418    }
    423419 
    424 
    425420  for (Int_t j=0; j<fAverageHiGainAreas->GetSize(); j++)
    426421    {
    … …  
    438433   }
    439434 
    440 
    441435  for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
    442436    {
    … …  
    452446        GetAverageHiGainSector(j).SetExcluded();
    453447    }
    454  
     448
    455449
    456450  FitHiGainArrays((*fCam),*fBadPixels,

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.h

    r4658 r4882  
    55#include "MHCalibrationCam.h"
    66#endif
     7
    78#ifndef ROOT_TArrayF
    8 #include "TArrayF.h"
     9#include <TArrayF.h>
    910#endif
    1011#ifndef ROOT_TArrayI
    11 #include "TArrayI.h"
     12#include <TArrayI.h>
    1213#endif
    1314
    14 
    15 class MGeomCam;
    1615class MHCalibrationTestCam : public MHCalibrationCam
    1716{

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.h

    r3846 r4882  
    66#endif
    77
    8 class TH1F;
    98class MHCalibrationTestPix : public MHGausEvents
    109{

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationTestTimeCam.h

    r3979 r4882  
    66#endif
    77
    8 class MGeomCam;
    98class MHCalibrationTestTimeCam : public MHCalibrationCam
    109{

  • trunk/MagicSoft/Mars/mcalib/MHGausEvents.h

    r4873 r4882  
    1616class TH1I;
    1717class TF1;
     18
    1819class MHGausEvents : public MH
    1920{
Note: See TracChangeset for help on using the changeset viewer.