Changeset 3265 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
02/23/04 06:30:30 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed

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

    r3255 r3265  
    133133   // hists
    134134    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     135    MFillH fillcam("MHCalibrationChargeCam"     , "MExtractedSignalCam");
    135136
    136137    //tasks
    … …  
    162163    //
    163164    tlist2.AddToList(&fillpin);
     165    tlist2.AddToList(&fillcam);
    164166    tlist2.AddToList(&calcalc);
    165167    //

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

    r3255 r3265  
    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 = "../20040215_16770_P_OffCrab4_E.root";
     26//const TString calfile = "../20040215_16771_C_OffCrab4_E.root";
    2727
    2828//const TString pedfile = "/mnt/users/mdoro/Mars/Data/20040201_14418_P_OffMrk421-1_E.root";
    … …  
    113113    // Look at one specific pixel, after all the histogram manipulations:
    114114    //
    115     hpedcam[9].DrawClone("fourierevents");
     115//    hpedcam[9].DrawClone("fourierevents");
    116116
    117117
    … …  
    223223    MCalibrationChargeCam   calcam;
    224224    MHCalibrationRelTimeCam timecam;
    225     //
     225    MHCalibrationChargeCam  chargecam;
     226    MHCalibrationChargePINDiode chargepin;
     227
     228   //
    226229    // Get the previously created MPedestalCam into the new Parameter List
    227230    //
    … …  
    231234    plist2.AddToList(&calcam);
    232235    plist2.AddToList(&timecam);
     236    plist2.AddToList(&chargecam);
     237    plist2.AddToList(&chargepin);
    233238    //
    234239    // Get the MAGIC geometry
    … …  
    255260    MFillH filltime("MHCalibrationRelTimeCam", "MArrivalTime");
    256261    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     262    MFillH fillcam("MHCalibrationChargeCam"     , "MExtractedSignalCam");
    257263
    258264    //
    … …  
    285291    // calcalc.ExcludePixelsFromAsciiFile("badpixels.dat");
    286292   
    287     //
    288     // In case, you want to skip the quality checks
    289     // (NOT RECOMMENDED!!!)
    290     //
    291     // calcalc.SkipQualityChecks();
    292 
    293293    //
    294294    // In case, we want to apply another fit function to the
    … …  
    321321    tlist2.AddToList(&filltime);
    322322    tlist2.AddToList(&fillpin);
     323    tlist2.AddToList(&fillcam);
    323324    //
    324325    tlist2.AddToList(&calcalc);
    … …  
    346347    // just one example how to get the plots of individual pixels
    347348    //
    348     calcam[564].DrawClone();
     349    chargecam[5].DrawClone("fourierevents");
    349350
    350351    // Create histograms to display
    … …  
    354355    MHCamera disp4  (geomcam, "Cal;RSigma",         "Reduced Sigmas");
    355356    MHCamera disp5  (geomcam, "Cal;RSigma/Charge",  "Reduced Sigma per Charge");
    356     MHCamera disp6  (geomcam, "Cal;FFactorPhe",     "Nr. of Phe's (F-Factor Method)");
     357    MHCamera disp6  (geomcam, "Cal;FFactorPh",      "Nr. of Photons (F-Factor Method)");
    357358    MHCamera disp7  (geomcam, "Cal;FFactorConv",    "Conversion Factor (F-Factor Method)");
    358359    MHCamera disp8  (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)");
    … …  
    366367    MHCamera disp16 (geomcam, "Cal;NotFitted",      "Pixels that could not be fitted");
    367368    MHCamera disp17 (geomcam, "Cal;NotFitValid",    "Pixels with not valid fit results");
    368     MHCamera disp18 (geomcam, "Cal;Oscillating",    "Oscillating Pixels");
    369     MHCamera disp19 (geomcam, "Cal;Saturation",     "Pixels with saturated Hi Gain");
    370 
    371     MHCamera disp20 (geomcam, "Cal;Ped",         "Pedestals");
    372     MHCamera disp21 (geomcam, "Cal;PedRms",      "Pedestal RMS");
    373 
    374     MHCamera disp22 (geomcam, "time;Time",        "Rel. Arrival Times");
    375     MHCamera disp23 (geomcam, "time;SigmaTime",   "Sigma of Rel. Arrival Times");
    376     MHCamera disp24 (geomcam, "time;TimeProb",    "Probability of Time Fit");
    377     MHCamera disp25 (geomcam, "time;NotFitValid", "Pixels with not valid fit results");
    378     MHCamera disp26 (geomcam, "time;Oscillating", "Oscillating Pixels");
    379 
    380     MHCamera disp27 (geomcam, "Cal;AbsTimeMean", "Abs. Arrival Times");
    381     MHCamera disp28 (geomcam, "Cal;AbsTimeRms",  "RMS of Arrival Times");
     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");
     376    MHCamera disp25 (geomcam, "Cal;PINdiodeFFactorValid",  "Pixels with valid PINDiode calibration");
     377
     378    MHCamera disp26 (geomcam, "Cal;Ped",         "Pedestals");
     379    MHCamera disp27 (geomcam, "Cal;PedRms",      "Pedestal RMS");
     380
     381    MHCamera disp28 (geomcam, "time;Time",        "Rel. Arrival Times");
     382    MHCamera disp29 (geomcam, "time;SigmaTime",   "Sigma of Rel. Arrival Times");
     383    MHCamera disp30 (geomcam, "time;TimeProb",    "Probability of Time Fit");
     384    MHCamera disp31 (geomcam, "time;NotFitValid", "Pixels with not valid fit results");
     385    MHCamera disp32 (geomcam, "time;Oscillating", "Oscillating Pixels");
     386
     387    MHCamera disp33 (geomcam, "Cal;AbsTimeMean", "Abs. Arrival Times");
     388    MHCamera disp34 (geomcam, "Cal;AbsTimeRms",  "RMS of Arrival Times");
    382389
    383390    // Fitted charge means and sigmas
    … …  
    425432    disp17.SetCamContent(calcam,29);
    426433    disp18.SetCamContent(calcam,30);
     434    disp19.SetCamContent(calcam,31);
     435    disp20.SetCamContent(calcam,32);
     436    disp21.SetCamContent(calcam,33);
    427437
    428438    // Lo Gain calibration
    429     disp19.SetCamContent(calcam,31);
    430 
     439    disp22.SetCamContent(calcam,34);
     440
     441    // Valid flags
     442    disp23.SetCamContent(calcam,35);
     443    disp24.SetCamContent(calcam,36);
     444    disp25.SetCamContent(calcam,37);
    431445
    432446    // Pedestals
    433     disp20.SetCamContent(calcam,35);
    434     disp20.SetCamError(  calcam,36);
    435     disp21.SetCamContent(calcam,37);
    436     disp21.SetCamError(  calcam,38);
    437 
    438 
     447    disp26.SetCamContent(calcam,38);
     448    disp26.SetCamError(  calcam,39);
     449    disp27.SetCamContent(calcam,40);
     450    disp27.SetCamError(  calcam,41);
     451
     452/*
    439453    // Relative Times
    440     disp22.SetCamContent(timecam,0);
    441     disp22.SetCamError(  timecam,1);
    442     disp23.SetCamContent(timecam,2);
    443     disp23.SetCamError(  timecam,3);
    444     disp24.SetCamContent(timecam,4);
    445     disp25.SetCamContent(timecam,5);
    446     disp26.SetCamContent(timecam,6);
    447 
     454    disp28.SetCamContent(timecam,0);
     455    disp28.SetCamError(  timecam,1);
     456    disp29.SetCamContent(timecam,2);
     457    disp29.SetCamError(  timecam,3);
     458    disp30.SetCamContent(timecam,4);
     459    disp31.SetCamContent(timecam,5);
     460    disp32.SetCamContent(timecam,6);
     461*/
    448462    // Absolute Times
    449     disp27.SetCamContent(calcam,39);
    450     disp27.SetCamError(  calcam,40);
    451     disp28.SetCamContent(calcam,41);
    452     disp28.SetCamError(  calcam,42);
    453 
     463    disp33.SetCamContent(calcam,42);
     464    disp33.SetCamError(  calcam,43);
     465    disp34.SetCamContent(calcam,43);
    454466
    455467    disp1.SetYTitle("Charge [FADC units]");
    … …  
    460472    disp5.SetYTitle("Reduced Sigma / Mean Charge [1]");
    461473
    462     disp6.SetYTitle("Nr. Photo-Electrons [1]");
    463     disp7.SetYTitle("Conversion Factor [PhE/FADC Count]");
     474    disp6.SetYTitle("Nr. Photons [1]");
     475    disp7.SetYTitle("Conversion Factor [Ph/FADC Count]");
    464476    disp8.SetYTitle("\\sqrt{N_{PhE}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
    465477
    … …  
    477489    disp18.SetYTitle("[1]");
    478490    disp19.SetYTitle("[1]");
    479 
    480     disp20.SetYTitle("Ped [FADC Counts ]");
    481     disp21.SetYTitle("RMS_{Ped} [FADC Counts ]");
    482 
    483     disp22.SetYTitle("Time Offset [ns]");
    484     disp23.SetYTitle("Timing resolution [ns]");
    485     disp24.SetYTitle("P_{Time} [1]");
    486 
     491    disp20.SetYTitle("[1]");
     492    disp21.SetYTitle("[1]");
     493    disp22.SetYTitle("[1]");
     494    disp23.SetYTitle("[1]");
     495    disp24.SetYTitle("[1]");
    487496    disp25.SetYTitle("[1]");
    488     disp26.SetYTitle("[1]");
    489 
    490     disp27.SetYTitle("Mean Abs. Time [FADC slice]");
    491     disp28.SetYTitle("RMS Abs. Time [FADC slices]");
     497
     498    disp26.SetYTitle("Ped [FADC Counts ]");
     499    disp27.SetYTitle("RMS_{Ped} [FADC Counts ]");
     500
     501    disp28.SetYTitle("Time Offset [ns]");
     502    disp29.SetYTitle("Timing resolution [ns]");
     503    disp30.SetYTitle("P_{Time} [1]");
     504
     505    disp31.SetYTitle("[1]");
     506    disp32.SetYTitle("[1]");
     507
     508    disp33.SetYTitle("Mean Abs. Time [FADC slice]");
     509    disp34.SetYTitle("RMS Abs. Time [FADC slices]");
    492510
    493511    gStyle->SetOptStat(1111);
    … …  
    540558    // Defects
    541559    TCanvas &c7 = display->AddTab("Defects");
    542     c7.Divide(4,2);
    543 
    544     CamDraw(c7, disp15,calcam,1,4, 0);
    545     CamDraw(c7, disp16,calcam,2,4, 0);
    546     CamDraw(c7, disp17,calcam,3,4, 0);
    547     CamDraw(c7, disp18,calcam,4,4,0);
    548 
    549     // Lo Gain Calibration
    550     TCanvas &c8 = display->AddTab("LowGain");
    551     c8.Divide(1,3);
    552 
    553     CamDraw(c8, disp19,calcam,1,4,0);
     560    c7.Divide(7,2);
     561
     562    CamDraw(c7, disp15,calcam,1,7, 0);
     563    CamDraw(c7, disp16,calcam,2,7, 0);
     564    CamDraw(c7, disp17,calcam,3,7, 0);
     565    CamDraw(c7, disp18,calcam,4,7, 0);
     566    CamDraw(c7, disp19,calcam,5,7, 0);
     567    CamDraw(c7, disp20,calcam,6,7, 0);
     568    CamDraw(c7, disp21,calcam,7,7, 0);
     569
     570    // Valid flags
     571    TCanvas &c8 = display->AddTab("Validity");
     572    c8.Divide(4,2);
     573
     574    CamDraw(c8, disp22,calcam,1,4,0);
     575    CamDraw(c8, disp23,calcam,2,4,0);
     576    CamDraw(c8, disp24,calcam,3,4,0);
     577    CamDraw(c8, disp25,calcam,4,4,0);
    554578
    555579
    … …  
    558582    c9.Divide(2,3);
    559583
    560     CamDraw(c9,disp20,calcam,1,2,1);
    561     CamDraw(c9,disp21,calcam,2,2,2);
    562 
     584    CamDraw(c9,disp26,calcam,1,2,1);
     585    CamDraw(c9,disp27,calcam,2,2,2);
     586
     587/*
    563588    // Rel. Times
    564589    TCanvas &c10 = display->AddTab("Fitted Rel. Times");
    565590    c10.Divide(3,3);
    566591
    567     CamDraw(c10,disp22,calcam,1,3,2);
    568     CamDraw(c10,disp23,calcam,2,3,2);
    569     CamDraw(c10,disp24,calcam,3,3,4);
     592    CamDraw(c10,disp28,calcam,1,3,2);
     593    CamDraw(c10,disp29,calcam,2,3,2);
     594    CamDraw(c10,disp30,calcam,3,3,4);
    570595
    571596    // Time Defects
    … …  
    573598    c11.Divide(2,2);
    574599
    575     CamDraw(c11, disp25,calcam,1,2, 0);
    576     CamDraw(c11, disp26,calcam,2,2, 0);
    577 
     600    CamDraw(c11, disp31,calcam,1,2, 0);
     601    CamDraw(c11, disp32,calcam,2,2, 0);
     602*/
    578603    // Abs. Times
    579604    TCanvas &c12 = display->AddTab("Abs. Times");
    580605    c12.Divide(2,3);
    581606
    582     CamDraw(c12,disp27,calcam,1,2,2);
    583     CamDraw(c12,disp28,calcam,2,2,2);
     607    CamDraw(c12,disp33,calcam,1,2,2);
     608    CamDraw(c12,disp34,calcam,2,2,2);
     609
    584610}
    585611

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

    r3255 r3265  
    3535#include "MEvtLoop.h"
    3636#include "MCalibrationChargeCam.h"
     37#include "MHCalibrationChargeCam.h"
     38#include "MCalibrationChargePINDiode.h"
     39#include "MHCalibrationChargePINDiode.h"
     40#include "MCalibrationChargeCalc.h"
    3741#include "MExtractedSignalCam.h"
    3842#include "MExtractSignal.h"
    39 #include "MCalibrationChargeCalc.h"
     43#include "MExtractedSignalPINDiode.h"
     44#include "MExtractPINDiode.h"
     45#include "MExtractedSignalBlindPixel.h"
     46#include "MExtractBlindPixel.h"
    4047#include "MCerPhotEvt.h"
    4148#include "MCalibrate.h"
    … …  
    111118  MCalibrationChargeCam calcam;
    112119  MExtractedSignalCam   sigcam;
    113  
     120
     121  MHCalibrationChargeCam  chargecam;
     122  MHCalibrationChargePINDiode chargepin;
     123  calcam.SetColor(MCalibrationChargeCam::kECT1);
     124  pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
     125  //
    114126  plist2.AddToList(&geomcam);
    115127  plist2.AddToList(&pedcam);
    116128  plist2.AddToList(&calcam);
    117129  plist2.AddToList(&sigcam);
    118  
     130  plist2.AddToList(&chargecam);
     131  plist2.AddToList(&chargepin); 
     132
    119133  //tasks
    120134  MReadMarsFile read2("Events", calname);
    … …  
    127141 
    128142  MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     143  MFillH fillcam("MHCalibrationChargeCam"     , "MExtractedSignalCam");
    129144  //
    130145  // Apply a filter against cosmics
    … …  
    146161  //
    147162  tlist2.AddToList(&fillpin);
     163  tlist2.AddToList(&fillcam);
    148164  tlist2.AddToList(&calcalc);
    149165 

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

    r3255 r3265  
    3939//   MMcFadcHeader
    4040//   MRawRunHeader
    41 //  [MCalibrationChargeCam] (if it existed previously)
     41//  [MCalibrationCam] (if it existed previously)
    4242//
    4343//  Output Containers:
    4444//   MPedPhotCam
    45 //  [MCalibrationChargeCam] (if it did not exist previously)
     45//  [MCalibrationCam] (if it did not exist previously)
    4646//
    4747/////////////////////////////////////////////////////////////////////////////
    … …  
    5353#include "MLogManip.h"
    5454
    55 #include "MCalibrationPix.h"
     55#include "MCalibrationChargePix.h"
    5656#include "MCalibrationChargeCam.h"
    5757#include "MExtractedSignalCam.h"
    … …  
    148148// Check for the runtype.
    149149// Search for MGeomCam and MMcFadcHeader.
    150 // Fill the MCalibrationChargeCam object.
     150// Fill the MCalibrationCam object.
    151151//
    152152Bool_t MMcCalibrationUpdate::ReInit(MParList *pList)
    … …  
    219219    for (int i=0; i<num; i++)
    220220    {
    221         MCalibrationPix &calpix = (*fCalCam)[i];
     221        MCalibrationChargePix &calpix = (*fCalCam)[i];
    222222
    223223        calpix.SetBlindPixelMethodValid();
    … …  
    284284        MPedPhotPix &pedpix = (*fPedPhotCam)[i];
    285285
    286         MCalibrationPix &calpix = (*fCalCam)[i];
     286        MCalibrationChargePix &calpix = (*fCalCam)[i];
    287287        Float_t adc2phot = calpix.GetMeanConversionBlindPixelMethod();
    288288        Float_t hi2lo    = calpix.GetConversionHiLo();

  • trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h

    r3254 r3265  
    4343
    4444#endif
     45
     46
     47
     48
     49
     50

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

    r3257 r3265  
    88#pragma link C++ class MCalibrateData+;
    99
    10 #pragma link C++ class MCalibrationPix+;
     10#pragma link C++ class MCalibrationChargePix+;
    1111#pragma link C++ class MCalibrationBlindPix+;
    1212#pragma link C++ class MCalibrationChargeCam+;
    … …  
    1515
    1616#pragma link C++ class MHCalibrationBlindPixel+;
    17 #pragma link C++ class MHCalibrationPixel+;
    1817#pragma link C++ class MHCalibrationChargePix+;
    1918#pragma link C++ class MHCalibrationChargeHiGainPix+;

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

    r3249 r3265  
    5252
    5353#include "MCalibrationChargeCam.h"
    54 #include "MCalibrationPix.h"
     54#include "MCalibrationChargePix.h"
    5555
    5656#include "MExtractedSignalCam.h"
    … …  
    193193      if(fCalibrationMode!=kNone)
    194194        {
    195           MCalibrationPix &pix = (*fCalibrations)[pixidx];       
     195          MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
    196196         
    197197          if (!pix.IsChargeValid())

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

    r3249 r3265  
    6161
    6262#include "MCalibrationChargeCam.h"
    63 #include "MCalibrationPix.h"
     63#include "MCalibrationChargePix.h"
    6464
    6565#include "MExtractedSignalCam.h"
    … …  
    234234  if(fCalibrationMode!=kNone)
    235235  {
    236     MCalibrationPix &pix = (*fCalibrations)[pixidx];       
     236    MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
    237237         
    238238    if (!pix.IsChargeValid())

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

    r3249 r3265  
    4747#include "MParList.h"
    4848
    49 #include "MCalibrationPix.h"
     49#include "MCalibrationChargePix.h"
    5050#include "MCalibrationChargeCam.h"
    5151
    … …  
    246246    for (int i=0; i<num; i++)
    247247    {
    248         MCalibrationPix &calpix = (*fCalCam)[i];
     248        MCalibrationChargePix &calpix = (*fCalCam)[i];
    249249
    250250        const Float_t factor = fADC2Phot*calpix.GetMeanConversionBlindPixelMethod();

  • trunk/MagicSoft/Mars/mcalib/Makefile

    r3257 r3265  
    4040           MCalibrateData.cc \
    4141           MCalibrationChargeCalc.cc \
    42            MCalibrationPix.cc  \
     42           MCalibrationChargePix.cc  \
    4343           MCalibrationBlindPix.cc  \
    4444           MCalibrationChargePINDiode.cc  \
    4545           MCalibrationChargeCam.cc \
    4646           MHCalibrationBlindPixel.cc \
    47            MHCalibrationPixel.cc \
    4847           MHCalibrationChargePix.cc \
    4948           MHCalibrationChargeHiGainPix.cc \
Note: See TracChangeset for help on using the changeset viewer.