Ignore:
Timestamp:
08/01/06 14:13:34 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mcalib
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r7384 r7829  
    313313            fNumFails++;
    314314            *fLog << warn << "WARNING - Finalization of charges failed the " << fNumFails << ". time..." << endl;
     315            return kTRUE;
    315316        }
    316317
    … …  
    395396  if (fIntensCharge)
    396397    {
    397       fIntensCharge->AddToList(Form("MCalibrationChargeCam%04d",fNumCam),*fGeom);
    398       fIntensCharge->GetCam()->SetRunNumber(runnumber);
     398        MCalibrationChargeCam *cold = (MCalibrationChargeCam*)fIntensCharge->GetCam();
     399
     400        fIntensCharge->AddToList(Form("MCalibrationChargeCam%04d",fNumCam),*fGeom);
     401
     402        MCalibrationChargeCam *cnew = (MCalibrationChargeCam*)fIntensCharge->GetCam();
     403        cnew->SetRunNumber(runnumber);
     404
     405        if (cold)
     406            cnew->MergeHiLoConversionFactors(*cold);
     407
    399408      *fLog << "MCalibrationChargeCam...";
    400409    }

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

    r7804 r7829  
    312312          // used later to convert from C-photons into "equivalent phes":
    313313          //
     314
     315          // Average areas not yet initialized? use default value
     316          fRenormFactor = MCalibrationQEPix::gkDefaultAverageQE;
    314317          if (fQEs->GetAverageAreas() > 0)
    315318          {
    … …  
    317320              fRenormFactor = avqepix.GetAverageQE();
    318321          }
    319           else // Average areas not yet initialized, use default value
    320               fRenormFactor = MCalibrationQEPix::gkDefaultAverageQE;
    321 
    322           fRenormFactor = MCalibrationQEPix::gkDefaultAverageQE;
    323322          break;
     323
    324324      case kPhot:
    325325          fRenormFactor = 1.;
    … …  
    543543    // For the moment, we use only a dummy zenith for the calibration:
    544544    //
    545     const Float_t zenith = -1.;
    546 
    547545    UInt_t skip = 0;
    548546
    … …  
    620618                  if (pix.IsFFactorMethodValid())
    621619                    {
    622                       const Float_t convmin1 = qe.GetQECascadesFFactor(zenith)/pix.GetMeanConvFADC2Phe();
     620                      const Float_t convmin1 = qe.GetQECascadesFFactor()/pix.GetMeanConvFADC2Phe();
    623621                      if (convmin1 > 0)
    624622                        calibFFactor *= TMath::Sqrt(convmin1);
    … …  
    634632                    continue;
    635633                  }
    636                 calibQE     = qe.GetQECascadesBlindPixel   ( zenith );
    637                 calibQEVar  = qe.GetQECascadesBlindPixelVar( zenith );
     634                calibQE     = qe.GetQECascadesBlindPixel();
     635                calibQEVar  = qe.GetQECascadesBlindPixelVar();
    638636                break;
    639637               
    … …  
    644642                    continue;
    645643                  }
    646                 calibQE     = qe.GetQECascadesPINDiode   ( zenith );
    647                 calibQEVar  = qe.GetQECascadesPINDiodeVar( zenith );
     644                calibQE     = qe.GetQECascadesPINDiode();
     645                calibQEVar  = qe.GetQECascadesPINDiodeVar();
    648646                break;
    649647               
    … …  
    654652                    continue;
    655653                  }
    656                 calibQE     = qe.GetQECascadesFFactor   ( zenith );
    657                 calibQEVar  = qe.GetQECascadesFFactorVar( zenith );
     654                calibQE     = qe.GetQECascadesFFactor();
     655                calibQEVar  = qe.GetQECascadesFFactorVar();
    658656                break;
    659657               
    … …  
    664662                    continue;
    665663                  }
    666                 calibQE     = qe.GetQECascadesCombined   ( zenith );
    667                 calibQEVar  = qe.GetQECascadesCombinedVar( zenith );
     664                calibQE     = qe.GetQECascadesCombined();
     665                calibQEVar  = qe.GetQECascadesCombinedVar();
    668666                break;
    669667               
    … …  
    695693
    696694        fHiLoConv     [pixidx] = hiloconv;
    697         fHiLoConvErr  [pixidx] = hiloconverr;       
     695        fHiLoConvErr  [pixidx] = hiloconverr;
    698696        fCalibConsts  [pixidx] = calibConv;
    699697        fCalibFFactors[pixidx] = calibFFactor;
    … …  
    711709
    712710      } /*     for (Int_t pixidx=0; pixidx<fGeomCam->GetNumPixels(); pixidx++) */
    713    
     711
    714712    if (skip>fGeomCam->GetNumPixels()*0.9)
    715713    {

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

    r7353 r7829  
    1818!   Author(s): Markus Gaug  04/2004 <mailto:markus@ifae.es>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2004
     20!   Copyright: MAGIC Software Development, 2000-2006
    2121!
    2222!
    … …  
    4545
    4646#include "MParList.h"
    47 #include "MH.h"
    4847
    4948#include "MGeomCam.h"
    … …  
    132131        const Float_t offset = pix.GetTimeOffset();
    133132
    134         (*fArrivalTime)[idx].SetArrivalTime(signal - offset);
     133        (*fArrivalTime)[idx].SetArrivalTime(signal-offset);
     134        (*fArrivalTime)[idx].SetLoGainUsed(sig.IsLoGainUsed());
    135135    }
    136136

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

    r6855 r7829  
    22#define MARS_MCalibrateRelTimes
    33
    4 /////////////////////////////////////////////////////////////////////////////
    5 //                                                                         //
    6 // MCalibrateRelTimes                                                      //
    7 //                                                                         //
    8 // Calculates the relative arrival time and applies the offset,            //
    9 // stored in MCalibrationRelTimePix                                        //
    10 //                                                                         //
    11 /////////////////////////////////////////////////////////////////////////////
    124#ifndef MARS_MTask
    135#include "MTask.h"

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

    r5412 r7829  
    8787//     by one of the three methods.
    8888//
    89 // 11) A call to GetQECascadesBlindPixel(zenith), GetQECascadesFFactor(zenith) or
    90 //     GetQECascadesPINDiode(zenith) returns then the normalization multiplied with an average QE
     89// 11) A call to GetQECascadesBlindPixel(), GetQECascadesFFactor() or
     90//     GetQECascadesPINDiode() returns then the normalization multiplied with an average QE
    9191//     folded into a cascades spectrum. This number should be dependent on zenith angle, but
    9292//     this feature is not yet implemented, instead a fixed number gkDefaultAverageQE is used.
    … …  
    210210const Float_t MCalibrationQEPix::gkLightGuidesEffCT1      = 0.94 ;
    211211const Float_t MCalibrationQEPix::gkLightGuidesEffCT1Err   = 0.03 ;
     212
    212213// --------------------------------------------------------------------------
    213214//
    … …  
    447448// -----------------------------------------------------------------
    448449//
    449 // Return the average Default QE (depending on zenith angle)
    450 // FIXME: The zenith angle dependency is not yet implemented
    451 //
    452 const Float_t MCalibrationQEPix::GetAverageQE( const Float_t zenith ) const
    453 {
    454   //  return gkDefaultAverageQE ;
     450// Return the average Default QE
     451//
     452const Float_t MCalibrationQEPix::GetAverageQE() const
     453{
    455454  return fAverageQE;
    456455}
    … …  
    458457// -----------------------------------------------------------------
    459458//
    460 // Return the relative variance of the average Default QE (depending on zenith angle)
    461 // FIXME: The zenith angle dependency is not yet implemented
    462 //
    463 const Float_t MCalibrationQEPix::GetAverageQERelVar( const Float_t zenith ) const
     459// Return the relative variance of the average Default QE
     460//
     461const Float_t MCalibrationQEPix::GetAverageQERelVar() const
    464462{
    465463  return gkDefaultAverageQEErr * gkDefaultAverageQEErr / (gkDefaultAverageQE * gkDefaultAverageQE );
    … …  
    469467//
    470468// Return the relative variance of the average normalization (Blind Pixel Method)
    471 // FIXME: The zenith angle dependency is not yet implemented
    472469//
    473470const Float_t MCalibrationQEPix::GetAvNormBlindPixelRelVar( ) const
    … …  
    479476//
    480477// Return the relative variance of the average normalization (Combined Method)
    481 // FIXME: The zenith angle dependency is not yet implemented
    482478//
    483479const Float_t MCalibrationQEPix::GetAvNormCombinedRelVar( ) const
    … …  
    498494//
    499495// Return the relative variance of the average normalization (PIN Diode Method)
    500 // FIXME: The zenith angle dependency is not yet implemented
    501496//
    502497const Float_t MCalibrationQEPix::GetAvNormPINDiodeRelVar( ) const
    … …  
    624619// ------------------------------------------------------------------------------
    625620//
    626 // Get the light guides efficiency for Cherenkov spectra,
    627 // depending on the zenith angle of the telescope
     621// Get the light guides efficiency for Cherenkov spectra.
    628622// FIXME: Lacking detailed measurement, these number are not yet available
    629623//        for the individual colours and therefore, only one same number is
    630624//        returned, namely gkLightGuidesEffBlue
    631625//
    632 Float_t MCalibrationQEPix::GetLightGuidesEff( const Float_t zenith )  const
     626Float_t MCalibrationQEPix::GetLightGuidesEff()  const
    633627{
    634628  return gkLightGuidesEffBlue;
    … …  
    638632// ------------------------------------------------------------------------------
    639633//
    640 // Get the relative variance of the light guides efficiency for Cherenkov spectra
    641 // depending on the zenith angle of the telescope
     634// Get the relative variance of the light guides efficiency for Cherenkov spectra.
    642635// FIXME: Lacking detailed measurement, these number are not yet available
    643636//        for the individual colours and therefore, only one same number is
    644637//        returned, namely gkLightGuidesEffBlueErr^2 / gkLightGuidesBlueEff^2
    645638//
    646 Float_t MCalibrationQEPix::GetLightGuidesEffRelVar( const Float_t zenith )  const
     639Float_t MCalibrationQEPix::GetLightGuidesEffRelVar()  const
    647640{
    648641  return gkLightGuidesEffBlueErr  * gkLightGuidesEffBlueErr / gkLightGuidesEffBlue / gkLightGuidesEffBlue;
    … …  
    846839// with the blind pixel method and averaged over the results from the different colours.
    847840//
    848 Float_t MCalibrationQEPix::GetQECascadesBlindPixel( const Float_t zenith  )  const
    849 {
    850   return fAvNormBlindPixel * GetAverageQE ( zenith );
     841Float_t MCalibrationQEPix::GetQECascadesBlindPixel()  const
     842{
     843  return fAvNormBlindPixel * GetAverageQE();
    851844}
    852845
    … …  
    857850// different colours.
    858851//
    859 Float_t MCalibrationQEPix::GetQECascadesBlindPixelVar( const Float_t zenith  )  const
    860 {
    861   return ( GetAvNormBlindPixelRelVar()  + GetAverageQERelVar(zenith))
    862     * GetQECascadesBlindPixel(zenith) * GetQECascadesBlindPixel(zenith);
     852Float_t MCalibrationQEPix::GetQECascadesBlindPixelVar()  const
     853{
     854  return ( GetAvNormBlindPixelRelVar()  + GetAverageQERelVar())
     855    * GetQECascadesBlindPixel() * GetQECascadesBlindPixel();
    863856}
    864857
    … …  
    869862// different colours.
    870863//
    871 Float_t MCalibrationQEPix::GetQECascadesBlindPixelErr( const Float_t zenith  )  const
    872 {
    873   const Float_t var = GetQECascadesBlindPixelVar(zenith);
     864Float_t MCalibrationQEPix::GetQECascadesBlindPixelErr()  const
     865{
     866  const Float_t var = GetQECascadesBlindPixelVar();
    874867 
    875868  if (var < 0.)
    … …  
    885878// from the different colours.
    886879//
    887 Float_t MCalibrationQEPix::GetQECascadesCombined( const Float_t zenith  ) const
    888 {
    889   return fAvNormCombined * GetAverageQE ( zenith );
     880Float_t MCalibrationQEPix::GetQECascadesCombined() const
     881{
     882  return fAvNormCombined * GetAverageQE();
    890883}
    891884
    … …  
    896889// different colours.
    897890//
    898 Float_t MCalibrationQEPix::GetQECascadesCombinedErr( const Float_t zenith  ) const
    899 {
    900   const Float_t var = GetQECascadesCombinedVar(zenith);
     891Float_t MCalibrationQEPix::GetQECascadesCombinedErr() const
     892{
     893  const Float_t var = GetQECascadesCombinedVar();
    901894 
    902895  if (var < 0.)
    … …  
    912905// different colours.
    913906//
    914 Float_t MCalibrationQEPix::GetQECascadesCombinedVar( const Float_t zenith  ) const
    915 {
    916   return ( GetAvNormCombinedRelVar()  + GetAverageQERelVar(zenith))
    917     * GetQECascadesCombined(zenith) * GetQECascadesCombined(zenith);
     907Float_t MCalibrationQEPix::GetQECascadesCombinedVar() const
     908{
     909  return ( GetAvNormCombinedRelVar()  + GetAverageQERelVar())
     910    * GetQECascadesCombined() * GetQECascadesCombined();
    918911}
    919912
    … …  
    923916// with the F-Factor method and averaged over the results from the different colours.
    924917//
    925 Float_t MCalibrationQEPix::GetQECascadesFFactor( const Float_t zenith  )  const
    926 {
    927   return fAvNormFFactor * GetAverageQE ( zenith );
     918Float_t MCalibrationQEPix::GetQECascadesFFactor()  const
     919{
     920  return fAvNormFFactor * GetAverageQE();
    928921}
    929922
    … …  
    934927// different colours.
    935928//
    936 Float_t MCalibrationQEPix::GetQECascadesFFactorErr( const Float_t zenith  )  const
    937 {
    938   const Float_t var = GetQECascadesFFactorVar(zenith);
     929Float_t MCalibrationQEPix::GetQECascadesFFactorErr()  const
     930{
     931  const Float_t var = GetQECascadesFFactorVar();
    939932 
    940933  if (var < 0.)
    … …  
    950943// different colours.
    951944//
    952 Float_t MCalibrationQEPix::GetQECascadesFFactorVar( const Float_t zenith  )  const
    953 {
    954   return ( GetAvNormFFactorRelVar()  + GetAverageQERelVar(zenith))
    955     * GetQECascadesFFactor(zenith) * GetQECascadesFFactor(zenith);
     945Float_t MCalibrationQEPix::GetQECascadesFFactorVar()  const
     946{
     947  return ( GetAvNormFFactorRelVar()  + GetAverageQERelVar())
     948    * GetQECascadesFFactor() * GetQECascadesFFactor();
    956949}
    957950
    … …  
    961954// with the PIN Diode method and averaged over the results from the different colours.
    962955//
    963 Float_t MCalibrationQEPix::GetQECascadesPINDiode( const Float_t zenith  )  const
    964 {
    965   return fAvNormPINDiode * GetAverageQE ( zenith );
     956Float_t MCalibrationQEPix::GetQECascadesPINDiode()  const
     957{
     958  return fAvNormPINDiode * GetAverageQE();
    966959}
    967960
    … …  
    972965// different colours.
    973966//
    974 Float_t MCalibrationQEPix::GetQECascadesPINDiodeErr( const Float_t zenith  ) const
    975 {
    976   const Float_t var = GetQECascadesPINDiodeVar(zenith);
     967Float_t MCalibrationQEPix::GetQECascadesPINDiodeErr() const
     968{
     969  const Float_t var = GetQECascadesPINDiodeVar();
    977970 
    978971  if (var < 0.)
    … …  
    988981// different colours.
    989982//
    990 Float_t MCalibrationQEPix::GetQECascadesPINDiodeVar( const Float_t zenith  ) const
    991 {
    992   return ( GetAvNormPINDiodeRelVar()  + GetAverageQERelVar(zenith))
    993     * GetQECascadesPINDiode(zenith) * GetQECascadesPINDiode(zenith);
     983Float_t MCalibrationQEPix::GetQECascadesPINDiodeVar() const
     984{
     985  return ( GetAvNormPINDiodeRelVar()  + GetAverageQERelVar())
     986    * GetQECascadesPINDiode() * GetQECascadesPINDiode();
    994987}
    995988

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

    r5412 r7829  
    8989
    9090  // Getters
    91   const Float_t GetAverageQE     ( const Float_t zenith=0. ) const; 
    92   const Float_t GetAverageQERelVar( const Float_t zenith=0. ) const;
     91  const Float_t GetAverageQE() const;
     92  const Float_t GetAverageQERelVar() const;
    9393 
    9494  Float_t GetDefaultQE                   ( const MCalibrationCam::PulserColor_t col ) const;
    … …  
    9696  Float_t GetLightGuidesEff              ( const MCalibrationCam::PulserColor_t col ) const;
    9797  Float_t GetLightGuidesEffRelVar        ( const MCalibrationCam::PulserColor_t col ) const;
    98   Float_t GetLightGuidesEff              ( const Float_t zenith=0.)                   const;
    99   Float_t GetLightGuidesEffRelVar        ( const Float_t zenith=0.)                   const;
     98  Float_t GetLightGuidesEff              ()                   const;
     99  Float_t GetLightGuidesEffRelVar        ()                   const;
    100100  Float_t GetQEBlindPixel                ( const MCalibrationCam::PulserColor_t col ) const; 
    101101  Float_t GetQEBlindPixelErr             ( const MCalibrationCam::PulserColor_t col ) const;
    102102  Float_t GetQEBlindPixelRelVar          ( const MCalibrationCam::PulserColor_t col ) const; 
    103   Float_t GetQECascadesBlindPixel        ( const Float_t zenith=0.)                   const;
    104   Float_t GetQECascadesBlindPixelErr     ( const Float_t zenith=0.)                   const;
    105   Float_t GetQECascadesBlindPixelVar     ( const Float_t zenith=0.)                   const;
    106   Float_t GetQECascadesCombined          ( const Float_t zenith=0.)                   const; 
    107   Float_t GetQECascadesCombinedErr       ( const Float_t zenith=0.)                   const;
    108   Float_t GetQECascadesCombinedVar       ( const Float_t zenith=0.)                   const;   
    109   Float_t GetQECascadesFFactor           ( const Float_t zenith=0.)                   const; 
    110   Float_t GetQECascadesFFactorErr        ( const Float_t zenith=0 )                   const;
    111   Float_t GetQECascadesFFactorVar        ( const Float_t zenith=0 )                   const;   
    112   Float_t GetQECascadesPINDiode          ( const Float_t zenith=0.)                   const;
    113   Float_t GetQECascadesPINDiodeErr       ( const Float_t zenith=0.)                   const;
    114   Float_t GetQECascadesPINDiodeVar       ( const Float_t zenith=0.)                   const; 
     103  Float_t GetQECascadesBlindPixel        ()                   const;
     104  Float_t GetQECascadesBlindPixelErr     ()                   const;
     105  Float_t GetQECascadesBlindPixelVar     ()                   const;
     106  Float_t GetQECascadesCombined          ()                   const; 
     107  Float_t GetQECascadesCombinedErr       ()                   const;
     108  Float_t GetQECascadesCombinedVar       ()                   const;   
     109  Float_t GetQECascadesFFactor           ()                   const; 
     110  Float_t GetQECascadesFFactorErr        ()                   const;
     111  Float_t GetQECascadesFFactorVar        ()                   const;   
     112  Float_t GetQECascadesPINDiode          ()                   const;
     113  Float_t GetQECascadesPINDiodeErr       ()                   const;
     114  Float_t GetQECascadesPINDiodeVar       ()                   const; 
    115115  Float_t GetQECombined                  ( const MCalibrationCam::PulserColor_t col ) const;       
    116116  Float_t GetQECombinedErr               ( const MCalibrationCam::PulserColor_t col ) const;
Note: See TracChangeset for help on using the changeset viewer.