Changeset 3293 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
02/25/04 06:40:43 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/macros/calibration.C

    r3265 r3293  
    2323\* ======================================================================== */
    2424
    25 //const TString pedfile = "../20040215_16770_P_OffCrab4_E.root";
    26 //const TString calfile = "../20040215_16771_C_OffCrab4_E.root";
     25//const TString pedfile = "/remote/home/pc2/operator/Crab20040214/20040215_16743_P_CrabOn_E.root";
     26//const TString calfile = "/remote/home/pc2/operator/Crab20040214/20040215_16744_C_CrabOn_E.root";
     27const TString pedfile = "../20040215_16770_P_OffCrab4_E.root";
     28const TString calfile = "../20040215_16771_C_OffCrab4_E.root";
    2729
    2830//const TString pedfile = "/mnt/users/mdoro/Mars/Data/20040201_14418_P_OffMrk421-1_E.root";
    … …  
    3941
    4042void calibration(TString pedname=pedfile,
    41              TString calname=calfile)
     43                 TString calname=calfile)
    4244{
    4345
    … …  
    220222    plist2.AddToList(&tlist2);
    221223
    222     MExtractedSignalCam     sigcam;
    223     MCalibrationChargeCam   calcam;
    224     MHCalibrationRelTimeCam timecam;
    225     MHCalibrationChargeCam  chargecam;
    226     MHCalibrationChargePINDiode chargepin;
    227 
    228    //
     224    MExtractedSignalCam        sigcam;
     225    MCalibrationChargeCam      calcam;
     226    MCalibrationChargePINDiode pindiode;   
     227    MCalibrationChargeBlindPix blindpix;   
     228   
     229    MHCalibrationRelTimeCam     histtime;
     230    MHCalibrationChargeCam      histcharge;
     231    MHCalibrationChargePINDiode histpin;
     232    MHCalibrationChargeBlindPix histblind;
     233    //
     234    // As long, as we don't have digital modules,
     235    // we have to set the color of the pulser LED by hand
     236    //
     237    calcam.SetColor(MCalibrationChargeCam::kECT1);
     238    pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
     239    //
    229240    // Get the previously created MPedestalCam into the new Parameter List
    230241    //
    … …  
    233244    plist2.AddToList(&sigcam);
    234245    plist2.AddToList(&calcam);
    235     plist2.AddToList(&timecam);
    236     plist2.AddToList(&chargecam);
    237     plist2.AddToList(&chargepin);
     246    plist2.AddToList(&histtime);
     247    plist2.AddToList(&histcharge);
     248    plist2.AddToList(&histpin);
     249    plist2.AddToList(&histblind);
    238250    //
    239251    // Get the MAGIC geometry
    … …  
    258270    MCalibrationChargeCalc calcalc;
    259271
    260     MFillH filltime("MHCalibrationRelTimeCam", "MArrivalTime");
    261     MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
    262     MFillH fillcam("MHCalibrationChargeCam"     , "MExtractedSignalCam");
     272    MFillH filltime ("MHCalibrationRelTimeCam"    , "MArrivalTime");
     273    MFillH fillpin  ("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     274    MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
     275    MFillH fillcam  ("MHCalibrationChargeCam"     , "MExtractedSignalCam");
    263276
    264277    //
    … …  
    321334    tlist2.AddToList(&filltime);
    322335    tlist2.AddToList(&fillpin);
     336    tlist2.AddToList(&fillblind);
    323337    tlist2.AddToList(&fillcam);
    324338    //
    … …  
    347361    // just one example how to get the plots of individual pixels
    348362    //
    349     chargecam[5].DrawClone("fourierevents");
     363//    histblind.DrawClone("all");
     364//    histcharge[5].DrawClone("time");
    350365
    351366    // Create histograms to display
    … …  
    355370    MHCamera disp4  (geomcam, "Cal;RSigma",         "Reduced Sigmas");
    356371    MHCamera disp5  (geomcam, "Cal;RSigma/Charge",  "Reduced Sigma per Charge");
    357     MHCamera disp6  (geomcam, "Cal;FFactorPh",      "Nr. of Photons (F-Factor Method)");
    358     MHCamera disp7  (geomcam, "Cal;FFactorConv",    "Conversion Factor (F-Factor Method)");
     372    MHCamera disp6  (geomcam, "Cal;FFactorPh",      "Nr. of Photo-electrons (F-Factor Method)");
     373    MHCamera disp7  (geomcam, "Cal;FFactorConv",    "Conversion Factor to photons (F-Factor Method)");
    359374    MHCamera disp8  (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)");
    360375    MHCamera disp9  (geomcam, "Cal;BlindPixPh",     "Photon flux inside plexiglass (Blind Pixel Method)");
    361     MHCamera disp10 (geomcam, "Cal;BlindPixConv",   "Conversion Factor (Blind Pixel Method)");
     376    MHCamera disp10 (geomcam, "Cal;BlindPixConv",   "Conversion Factor to photons (Blind Pixel Method)");
    362377    MHCamera disp11 (geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)");
    363378    MHCamera disp12 (geomcam, "Cal;PINDiodePh",     "Photon flux outside plexiglass (PIN Diode Method)");
    364     MHCamera disp13 (geomcam, "Cal;PINDiodeConv",   "Conversion Factor (PIN Diode Method)");
     379    MHCamera disp13 (geomcam, "Cal;PINDiodeConv",   "Conversion Factor tp photons (PIN Diode Method)");
    365380    MHCamera disp14 (geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)");
    366381    MHCamera disp15 (geomcam, "Cal;Excluded",       "Pixels previously excluded");
    367382    MHCamera disp16 (geomcam, "Cal;NotFitted",      "Pixels that could not be fitted");
    368383    MHCamera disp17 (geomcam, "Cal;NotFitValid",    "Pixels with not valid fit results");
    369     MHCamera disp18 (geomcam, "Cal;HiGainOscillating", "Oscillating Pixels HI Gain");
    370     MHCamera disp19 (geomcam, "Cal;LoGainOscillating", "Oscillating Pixels LO Gain");
    371     MHCamera disp20 (geomcam, "Cal;HiGainPickup",      "Number Pickup events Hi Gain");
    372     MHCamera disp21 (geomcam, "Cal;LoGainPickup",      "Number Pickup events Lo Gain");
    373     MHCamera disp22 (geomcam, "Cal;Saturation",        "Pixels with saturated Hi Gain");
    374     MHCamera disp23 (geomcam, "Cal;FFactorValid",      "Pixels with valid F-Factor calibration");
    375     MHCamera disp24 (geomcam, "Cal;BlindPixelValid",   "Pixels with valid BlindPixel calibration");
     384    MHCamera disp18 (geomcam, "Cal;HiGainOscillating",     "Oscillating Pixels HI Gain");
     385    MHCamera disp19 (geomcam, "Cal;LoGainOscillating",     "Oscillating Pixels LO Gain");
     386    MHCamera disp20 (geomcam, "Cal;HiGainPickup",          "Number Pickup events Hi Gain");
     387    MHCamera disp21 (geomcam, "Cal;LoGainPickup",          "Number Pickup events Lo Gain");
     388    MHCamera disp22 (geomcam, "Cal;Saturation",            "Pixels with saturated Hi Gain");
     389    MHCamera disp23 (geomcam, "Cal;FFactorValid",          "Pixels with valid F-Factor calibration");
     390    MHCamera disp24 (geomcam, "Cal;BlindPixelValid",       "Pixels with valid BlindPixel calibration");
    376391    MHCamera disp25 (geomcam, "Cal;PINdiodeFFactorValid",  "Pixels with valid PINDiode calibration");
    377392
    … …  
    450465    disp27.SetCamError(  calcam,41);
    451466
    452 /*
    453467    // Relative Times
    454468    disp28.SetCamContent(timecam,0);
    … …  
    459473    disp31.SetCamContent(timecam,5);
    460474    disp32.SetCamContent(timecam,6);
    461 */
     475
    462476    // Absolute Times
    463477    disp33.SetCamContent(calcam,42);
    … …  
    472486    disp5.SetYTitle("Reduced Sigma / Mean Charge [1]");
    473487
    474     disp6.SetYTitle("Nr. Photons [1]");
     488    disp6.SetYTitle("Nr. Photo-electrons [1]");
    475489    disp7.SetYTitle("Conversion Factor [Ph/FADC Count]");
    476     disp8.SetYTitle("\\sqrt{N_{PhE}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
     490    disp8.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1] ");
    477491
    478492    disp9.SetYTitle("Photon flux [ph/mm^2]");
    … …  
    585599    CamDraw(c9,disp27,calcam,2,2,2);
    586600
    587 /*
    588601    // Rel. Times
    589602    TCanvas &c10 = display->AddTab("Fitted Rel. Times");
    … …  
    600613    CamDraw(c11, disp31,calcam,1,2, 0);
    601614    CamDraw(c11, disp32,calcam,2,2, 0);
    602 */
     615
    603616    // Abs. Times
    604617    TCanvas &c12 = display->AddTab("Abs. Times");

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

    r3292 r3293  
    7373
    7474  // Setters
     75  void SetColor       ( const PulserColor_t color )  {  fColor = color;  }
     76
    7577  void SetLambda      ( const Float_t f ) { fLambda      = f;  }
    7678  void SetLambdaCheck ( const Float_t f ) { fLambdaCheck = f;  }

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

    r3292 r3293  
    4444public:
    4545
    46   enum PulserColor_t { kEBlue, kEGreen, kEUV, kECT1 } ;
    47 
    48 private:
    49 
    50   PulserColor_t fColor; 
    51  
    52 public:
    53 
    5446  MCalibrationChargeCam(const char *name=NULL, const char *title=NULL);
    5547  ~MCalibrationChargeCam();
    … …  
    5951
    6052  // Setters   
    61   void SetColor(    const PulserColor_t color )           {  fColor = color;         }
    6253  void SetNumPixelsExcluded(  const UInt_t n )            {  fNumExcludedPixels = n; }
    6354  void SetGeomCam(  const MGeomCam *geom)                 {  fGeomCam = geom;        }

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

    r3292 r3293  
    196196}
    197197
    198 void MHCalibrationChargeBlindPix::SetSinglePheFitOK   ( const Bool_t b=kTRUE)
     198void MHCalibrationChargeBlindPix::SetSinglePheFitOK (const Bool_t b)
    199199{
    200200    b ? SETBIT(fFlags,kSinglePheFitOK) : CLRBIT(fFlags,kSinglePheFitOK);
    201201}
    202202
    203 void MHCalibrationChargeBlindPix::SetPedestalFitOK( const Bool_t b=kTRUE)
     203void MHCalibrationChargeBlindPix::SetPedestalFitOK(const Bool_t b)
    204204{
    205205    b ? SETBIT(fFlags,kPedestalFitOK) : CLRBIT(fFlags,kPedestalFitOK);
Note: See TracChangeset for help on using the changeset viewer.