Ignore:
Timestamp:
02/16/04 15:37:25 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mjobs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r3143 r3199  
    204204
    205205    // Create histograms to display
    206     MHCamera disp1  (geomcam, "Cal;Charge",         "Fitted Mean Charges");
    207     MHCamera disp2  (geomcam, "Cal;SigmaCharge",    "Sigma of Fitted Charges");
    208     MHCamera disp3  (geomcam, "Cal;FitProb",        "Probability of Fit");
    209     MHCamera disp4  (geomcam, "Cal;RSigma",         "Reduced Sigmas");
    210     MHCamera disp5  (geomcam, "Cal;RSigma/Charge",  "Reduced Sigma per Charge");
    211     MHCamera disp6  (geomcam, "Cal;FFactorPhe",     "Nr. of Phe's (F-Factor Method)");
    212     MHCamera disp7  (geomcam, "Cal;FFactorConv",    "Conversion Factor (F-Factor Method)");
    213     MHCamera disp8  (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)");
    214     MHCamera disp9  (geomcam, "Cal;BlindPixPh",     "Photon flux inside plexiglass (Blind Pixel Method)");
    215     MHCamera disp10 (geomcam, "Cal;BlindPixConv",   "Conversion Factor (Blind Pixel Method)");
    216     MHCamera disp11 (geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)");
    217     MHCamera disp12 (geomcam, "Cal;PINDiodePh",     "Photons flux outside plexiglass (PIN Diode Method)");
    218     MHCamera disp13 (geomcam, "Cal;PINDiodeConv",   "Conversion Factor (PIN Diode Method)");
    219     MHCamera disp14 (geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)");
    220     MHCamera disp15 (geomcam, "Cal;Excluded",       "Pixels previously excluded");
    221     MHCamera disp16 (geomcam, "Cal;NotFitted",      "Pixels that could not be fitted");
    222     MHCamera disp17 (geomcam, "Cal;NotFitValid",    "Pixels with not valid fit results");
    223     MHCamera disp18 (geomcam, "Cal;Oscillation",    "Oscillating Pixels");
    224     MHCamera disp19 (geomcam, "Cal;Saturation",     "Pixels with saturated Hi Gain");
    225 
     206    MHCamera disp1 (geomcam, "Cal;Charge",         "Fitted Mean Charges");
     207    MHCamera disp2 (geomcam, "Cal;SigmaCharge",    "Sigma of Fitted Charges");
     208    MHCamera disp3 (geomcam, "Cal;FitProb",        "Probability of Fit");
     209    MHCamera disp4 (geomcam, "Cal;RSigma",         "Reduced Sigmas");
     210    MHCamera disp5 (geomcam, "Cal;RSigma/Charge",  "Reduced Sigma per Charge");
     211    MHCamera disp6 (geomcam, "Cal;FFactorPhe",     "Nr. of Phe's (F-Factor Method)");
     212    MHCamera disp7 (geomcam, "Cal;FFactorConv",    "Conversion Factor (F-Factor Method)");
     213    MHCamera disp8 (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)");
     214    MHCamera disp9 (geomcam, "Cal;BlindPixPh",     "Photon flux inside plexiglass (Blind Pixel Method)");
     215    MHCamera disp10(geomcam, "Cal;BlindPixConv",   "Conversion Factor (Blind Pixel Method)");
     216    MHCamera disp11(geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)");
     217    MHCamera disp12(geomcam, "Cal;PINDiodePh",     "Photons flux outside plexiglass (PIN Diode Method)");
     218    MHCamera disp13(geomcam, "Cal;PINDiodeConv",   "Conversion Factor (PIN Diode Method)");
     219    MHCamera disp14(geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)");
     220    MHCamera disp15(geomcam, "Cal;Excluded",       "Pixels previously excluded");
     221    MHCamera disp16(geomcam, "Cal;NotFitted",      "Pixels that could not be fitted");
     222    MHCamera disp17(geomcam, "Cal;NotFitValid",    "Pixels with not valid fit results");
     223    MHCamera disp18(geomcam, "Cal;Oscillation",    "Oscillating Pixels");
     224    MHCamera disp19(geomcam, "Cal;Saturation",     "Pixels with saturated Hi Gain");
    226225
    227226    // Fitted charge means and sigmas
     
    272271    disp19.SetCamContent(fCalibrationCam,31);
    273272
    274 
    275     disp1.SetYTitle("Charge [FADC units]");
    276     disp2.SetYTitle("\\sigma_{Charge} [FADC units]");
    277     disp3.SetYTitle("P_{Charge} [1]");
    278 
    279     disp4.SetYTitle("\\sqrt{\\sigma^{2}_{Charge} - RMS^{2}_{Ped}} [FADC Counts]");
    280     disp5.SetYTitle("Reduced Sigma / Mean Charge [1]");
    281 
    282     disp6.SetYTitle("Nr. Photo-Electrons [1]");
    283     disp7.SetYTitle("Conversion Factor [PhE/FADC Count]");
    284     disp8.SetYTitle("\\sqrt{N_{PhE}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
    285 
    286     disp9.SetYTitle("Photon flux [ph/mm^2]");
    287     disp10.SetYTitle("Conversion Factor [Phot/FADC Count]");
    288     disp11.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
    289 
    290     disp12.SetYTitle("Photon flux [ph/mm^2]");
    291     disp13.SetYTitle("Conversion Factor [Phot/FADC Count]");
    292     disp14.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
     273    disp1.SetYTitle("Q [FADC units]");
     274    disp2.SetYTitle("\\sigma_{Q} [FADC units]");
     275    disp3.SetYTitle("P_{Q} [1]");
     276
     277    disp4.SetYTitle("\\sqrt{\\sigma^{2}_{Q} - RMS^{2}_{Ped}} [FADC Counts]");
     278    disp5.SetYTitle("Red.Sigma/<Q> [1]");
     279
     280    disp6.SetYTitle("PhE [#]");
     281    disp7.SetYTitle("Conv.Factor [PhE/FADC units]");
     282    disp8.SetYTitle("\\sqrt{N_{PhE}}*\\sigma_{Q}/\\mu_{Q} [1]");
     283
     284    disp9.SetYTitle("Phot.flux [ph/mm^{2}]");
     285    disp10.SetYTitle("Conv.Factor [Phot/FADC Count]");
     286    disp11.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Q}/\\mu_{Q} [1]");
     287
     288    disp12.SetYTitle("Phot.flux [ph/mm^{2}]");
     289    disp13.SetYTitle("Conv.Factor [Phot/FADC Count]");
     290    disp14.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Q}/\\mu_{Q} [1]");
    293291
    294292    disp15.SetYTitle("[1]");
     
    357355    c8.Divide(1,3);
    358356
    359     CamDraw(c8, 1, 4, disp19, 0);
    360 
     357    CamDraw(c8, 1, 1, disp19, 0);
    361358}
    362359
     
    495492    // when the calibration hardware-trigger is working)
    496493    //
    497     MFCosmics            cosmics;
    498     MContinue            cont(&cosmics);
     494    MFCosmics cosmics;
     495    MContinue cont(&cosmics);
    499496
    500497    //
  • trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

    r3069 r3199  
    298298    *fLog << endl;
    299299
     300    // Setup Lists
     301    MParList plist;
     302    plist.AddToList(&pedcam);
     303
     304    MTaskList tlist;
     305    plist.AddToList(&tlist);
     306
     307    // Setup Parameters
     308
     309    // Make sure, that at least an empty MBadPixelsCam is available
     310    // This is necessary for input which don't contain a MBadPixelsCam
     311    MBadPixelsCam badcam;
     312    plist.AddToList(&badcam);
     313
     314    // Setup Task-lists
    300315    MReadMarsFile read("Events");
    301316    read.DisableAutoScheme();
    302317    static_cast<MRead&>(read).AddFiles(*fRuns);
    303318
    304     // Setup Tasklist
    305     MParList plist;
    306     plist.AddToList(&pedcam);
    307 
    308     MTaskList tlist;
    309     plist.AddToList(&tlist);
    310 
    311319    MGeomApply      apply; // Only necessary to craete geometry
    312320    MBadPixelsMerge merge(&fBadPixels);
     
    320328    write.AddContainer("MExtractedSignalCam", "Events");
    321329    write.AddContainer("MTime",               "Events");
     330    // FIXME: CRAHSES! write.AddContainer("MPedestalCam",        "RunHeaders");
    322331    write.AddContainer("MRawRunHeader",       "RunHeaders");
    323     write.AddContainer("MPedestalCam",        "RunHeaders");
    324332    write.AddContainer("MBadPixelsCam",       "RunHeaders");
    325333
Note: See TracChangeset for help on using the changeset viewer.