Ignore:
Timestamp:
05/11/05 19:06:48 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mjobs
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r7005 r7013  
    222222  fTimeResolutionMin         =  0.;
    223223  fTimeResolutionMax         =  1.;
    224  
    225   fRefConvFADC2PheInner      = 0.14;       
    226   fRefConvFADC2PheOuter      = 0.4;       
    227   fRefConvFADC2PhotInner     = 0.8;
    228   fRefConvFADC2PhotOuter     = 3.8;
     224
     225  fRefFADC2PheInner          = 0.14;
     226  fRefFADC2PheOuter          = 0.4;
     227  fRefConvFADC2PheInner      = 0.14;
     228  fRefConvFADC2PheOuter      = 0.52;
    229229  fRefQEInner                = 0.18;           
    230230  fRefQEOuter                = 0.12;
    … …  
    330330    MHCamera disp4 (geomcam, "RSigmaPerCharge",   "Reduced Sigma per Charge");
    331331    MHCamera disp5 (geomcam, "NumPhes",           "Number Photo-electrons");
    332     MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Phes per Charge (before flat-field)");
     332    MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Phes per Charge (Before Flat-Field)");
    333333    MHCamera disp7 (geomcam, "TotalFFactor",      "Total F-Factor(F-Factor Method)");
    334334    MHCamera disp8 (geomcam, "CascadesQEFFactor", "Cascades QE (F-Factor Method)");
    … …  
    336336    MHCamera disp10(geomcam, "CascadesQEPINDiode","Cascades QE (PIN Diode Method)");
    337337    MHCamera disp11(geomcam, "CascadesQECombined","Cascades QE (Combined Method)");
    338     MHCamera disp12(geomcam, "FFactorValid",      "Pixels with valid F-Factor calibration");
    339     MHCamera disp13(geomcam, "BlindPixelValid",   "Pixels with valid BlindPixel calibration");
    340     MHCamera disp14(geomcam, "PINdiodeValid",     "Pixels with valid PINDiode calibration");
    341     MHCamera disp15(geomcam, "CombinedValid",     "Pixels with valid Combined calibration");
    342     MHCamera disp16(geomcam, "Saturation",        "Pixels with saturated Hi Gain");
     338    MHCamera disp12(geomcam, "FFactorValid",      "Pixels with Valid F-Factor Calibration");
     339    MHCamera disp13(geomcam, "BlindPixelValid",   "Pixels with valid BlindPixel Calibration");
     340    MHCamera disp14(geomcam, "PINdiodeValid",     "Pixels with Valid PINDiode Calibration");
     341    MHCamera disp15(geomcam, "CombinedValid",     "Pixels with Valid Combined Calibration");
     342    MHCamera disp16(geomcam, "Saturation",        "Pixels with Saturated Hi Gain");
    343343    MHCamera disp17(geomcam, "ConversionMeans",   "Conversion HiGain.vs.LoGain Means");
    344344    MHCamera disp18(geomcam, "ConversionSigmas",  "Conversion HiGain.vs.LoGain Sigmas");
    345     MHCamera disp19(geomcam, "HiGainPickup",      "Number Pickup events Hi Gain");
    346     MHCamera disp20(geomcam, "LoGainPickup",      "Number Pickup events Lo Gain");
    347     MHCamera disp21(geomcam, "HiGainBlackout",    "Number Blackout events Hi Gain");
    348     MHCamera disp22(geomcam, "LoGainBlackout",    "Number Blackout events Lo Gain");
    349     MHCamera disp23(geomcam, "Excluded",          "Pixels previously excluded");
    350     MHCamera disp24(geomcam, "UnSuitable",        "Pixels not suited for further analysis");
    351     MHCamera disp25(geomcam, "UnReliable",        "Pixels suitable, but not reliable for further analysis");
     345    MHCamera disp19(geomcam, "HiGainPickup",      "Number Pickup Events Hi Gain");
     346    MHCamera disp20(geomcam, "LoGainPickup",      "Number Pickup Events Lo Gain");
     347    MHCamera disp21(geomcam, "HiGainBlackout",    "Number Blackout Events Hi Gain");
     348    MHCamera disp22(geomcam, "LoGainBlackout",    "Number Blackout Events Lo Gain");
     349    MHCamera disp23(geomcam, "Excluded",          "Pixels Previously Excluded");
     350    MHCamera disp24(geomcam, "UnSuitable",        "Pixels NOT Suited for Further Analysis");
     351    MHCamera disp25(geomcam, "UnReliable",        "Pixels Suitable, but NOT Reliable for Further Analysis");
    352352    MHCamera disp26(geomcam, "HiGainOscillating", "Oscillating Pixels High Gain");
    353353    MHCamera disp27(geomcam, "LoGainOscillating", "Oscillating Pixels Low Gain");
    … …  
    357357    MHCamera disp31(geomcam, "SigmaTime",         "Sigma Rel. Arrival Times");
    358358    MHCamera disp32(geomcam, "TimeProb",          "Probability of Time Fit");
    359     MHCamera disp33(geomcam, "TimeNotFitValid",   "Pixels with not valid fit results");
     359    MHCamera disp33(geomcam, "TimeNotFitValid",   "Pixels with not valid Fit Results");
    360360    MHCamera disp34(geomcam, "TimeOscillating",   "Oscillating Pixels");
    361     MHCamera disp35(geomcam, "TotalConv",         "Conversion Factor to photons");
     361    MHCamera disp35(geomcam, "TotalConv",         "Conversion Factor to Photons");
    362362    MHCamera disp36(geomcam, "RMSperMean",        "Charge histogram RMS per Mean");
     363    MHCamera disp37(geomcam, "TotalConvPhe",      "Conversion Factor to equiv. Phe's");
    363364   
    364365    MCalibrationChargeCam  *cam    = NULL;
    … …  
    447448    // RMS and Mean
    448449    disp36.SetCamContent(*cam,32);
     450    disp36.SetCamError(*cam,33);
    449451
    450452    disp1.SetYTitle("Q [FADC cnts]");
    … …  
    484486    disp28.SetYTitle("Mean Abs. Time [FADC sl.]");
    485487    disp29.SetYTitle("RMS Abs. Time [FADC sl.]");
    486 
    487488    disp35.SetYTitle("Conv.Factor [Ph/FADC cnts]");
    488 
    489489    disp36.SetYTitle("Charge RMS/<Q> [1]");
     490    disp37.SetYTitle("Conv.Factor [Phe/FADC cnts]");
    490491
    491492    for (UInt_t i=0;i<geomcam.GetNumPixels();i++)
    … …  
    503504        disp35.Fill(i,convphe/quaeff);
    504505        disp35.SetUsed(i);
     506
     507        disp37.Fill(i,convphe/quaeff*MCalibrationQEPix::gkDefaultAverageQE);
     508        disp37.SetUsed(i);
    505509      }
    506510   
    … …  
    733737      gPad->SetBorderMode(0);
    734738      gPad->SetTicks();
    735       MHCamera *obj7=(MHCamera*)disp35.DrawCopy("hist");
     739      MHCamera *obj7=(MHCamera*)disp37.DrawCopy("hist");
    736740      //
    737741      // for the datacheck, fix the ranges!!
    738742      //
    739       obj7->SetMinimum(fConvFADC2PhotMin);
    740       obj7->SetMaximum(fConvFADC2PhotMax);
     743      obj7->SetMinimum(fConvFADC2PheMin);
     744      obj7->SetMaximum(fConvFADC2PheMax);
    741745      //
    742746      // Set the datacheck sizes:
    … …  
    855859      pave->SetTextSize(0.05);
    856860      pave->AddText("  ");
    857       TText *t1 = pave->AddText(Form("Signal smaller 3 Pedestal RMS:                 %3i pixels",
     861      TText *t1 = pave->AddText(Form("Signal smaller 4.5 Pedestal RMS:                 %3i pixels",
    858862                                       CountBadPixels(&disp24,1)));
    859863      t1->SetTextColor(gStyle->GetColorPalette(Int_t(1./max*numcol + 1.)));
    … …  
    887891      t11->SetTextColor(gStyle->GetColorPalette(Int_t(8./max*numcol + 1.)));
    888892      t11->SetTextAlign(12);
    889       TText *t12= pave->AddText(Form("Previously Excluded:                                    %3i pixels",
    890                                        CountBadPixels(&disp24,9)));
     893      TText *t12= pave->AddText(Form("Presumably dead from Ped. Rms:              %3i pixels",
     894                                       CountBadPixels(&disp24,9 )));
    891895      t12->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol + 1.)));
    892896      t12->SetTextAlign(12);
     897      TText *t13= pave->AddText(Form("Fluctuating Pulse Arrival Times:                 %3i pixels",
     898                                       CountBadPixels(&disp24,10)));
     899      t13->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol + 1.)));
     900      t13->SetTextAlign(12);
     901      TText *t14= pave->AddText(Form("Previously Excluded:                                   %3i pixels",
     902                                       CountBadPixels(&disp24,11)));
     903      t14->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol + 1.)));
     904      t14->SetTextAlign(12);
    893905      pave->Draw();
    894906
    … …  
    909921      // for the datacheck, fix the ranges!!
    910922      //
    911       const Double_t max2 = 8.;
     923      const Double_t max2 = 9.;
    912924      obj9->SetMinimum(0.);
    913925      obj9->SetMaximum(max2);
    … …  
    927939      TText *t3 = pave2->AddText(Form("Signal Sigma smaller Pedestal RMS:      %3i pixels",
    928940                                       CountBadPixels(&disp25,1)));
    929       t3->SetTextColor(gStyle->GetColorPalette(Int_t(1./max*numcol + 1.)));
     941      t3->SetTextColor(gStyle->GetColorPalette(Int_t(1./max2*numcol + 1.)));
    930942      t3->SetTextAlign(12);
    931943
    … …  
    12501262      break;
    12511263    case  1:
    1252       l1 = line.DrawLine(0, fRefConvFADC2PhotInner, x, fRefConvFADC2PhotInner);     
     1264      l1 = line.DrawLine(0, fRefConvFADC2PheInner, x, fRefConvFADC2PheInner);
    12531265      break;
    12541266    case  2:
    1255       l1 = line.DrawLine(0, fRefConvFADC2PheInner, x, fRefConvFADC2PheInner );
     1267      l1 = line.DrawLine(0, fRefFADC2PheInner, x, fRefFADC2PheInner );
    12561268      break;
    12571269    case  3:
    … …  
    12811293          break;
    12821294        case 1:
    1283           line.DrawLine(x2, fRefConvFADC2PhotOuter, 398, fRefConvFADC2PhotOuter );     
     1295          line.DrawLine(x2, fRefConvFADC2PheOuter, 398, fRefConvFADC2PheOuter );
    12841296          break;
    12851297        case 2:
    1286           line.DrawLine(x2, fRefConvFADC2PheOuter, 398, fRefConvFADC2PheOuter);
     1298          line.DrawLine(x2, fRefFADC2PheOuter, 398, fRefFADC2PheOuter);
    12871299          break;
    12881300        case 3:
    … …  
    14371449    fTimeResolutionMax      = refenv.GetValue("TimeResolutionMax",fTimeResolutionMax);
    14381450                                                               
     1451    fRefFADC2PheInner       = refenv.GetValue("RefFADC2PheInner",fRefFADC2PheInner);
     1452    fRefFADC2PheOuter       = refenv.GetValue("RefFADC2PheOuter",fRefFADC2PheOuter);
     1453    fRefConvFADC2PhotInner  = refenv.GetValue("RefConvFADC2PhotInner",fRefConvFADC2PhotInner);
     1454    fRefConvFADC2PhotOuter  = refenv.GetValue("RefConvFADC2PhotOuter",fRefConvFADC2PhotOuter);
    14391455    fRefConvFADC2PheInner   = refenv.GetValue("RefConvFADC2PheInner",fRefConvFADC2PheInner);
    14401456    fRefConvFADC2PheOuter   = refenv.GetValue("RefConvFADC2PheOuter",fRefConvFADC2PheOuter);
    1441     fRefConvFADC2PhotInner  = refenv.GetValue("RefConvFADC2PhotInner",fRefConvFADC2PhotInner);
    1442     fRefConvFADC2PhotOuter  = refenv.GetValue("RefConvFADC2PhotOuter",fRefConvFADC2PhotOuter);
    14431457    fRefQEInner             = refenv.GetValue("RefQEInner",fRefQEInner);
    14441458    fRefQEOuter             = refenv.GetValue("RefQEOuter",fRefQEOuter);

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.h

    r6979 r7013  
    7979  Double_t fTimeResolutionMax;             //! Histogram maximum for time resolutions
    8080                                           
    81   Float_t  fRefConvFADC2PheInner;          //! Reference value for the conversion factor to phes - inner
    82   Float_t  fRefConvFADC2PheOuter;          //! Reference value for the conversion factor to phes - outer
     81  Float_t  fRefFADC2PheInner;              //! Reference value for the ratio phes/charge - inner
     82  Float_t  fRefFADC2PheOuter;              //! Reference value for the ratio phes/charge - outer
    8383  Float_t  fRefConvFADC2PhotInner;         //! Reference value for the conversion factor to phs - inner
    8484  Float_t  fRefConvFADC2PhotOuter;         //! Reference value for the conversion factor to phs - outer
     85  Float_t  fRefConvFADC2PheInner;          //! Reference value for the conversion factor to phs - inner
     86  Float_t  fRefConvFADC2PheOuter;          //! Reference value for the conversion factor to phs - outer
    8587  Float_t  fRefQEInner;                    //! Reference value for the quantum eff. cascades - inner
    8688  Float_t  fRefQEOuter;                    //! Reference value for the quantum eff. cascades - outer

  • trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

    r7005 r7013  
    8383#include "MRawEvtData.h"
    8484#include "MGeomApply.h"
     85#include "MTriggerPatternDecode.h"
    8586#include "MBadPixelsMerge.h"
    8687#include "MFillH.h"
    … …  
    944945    // data file will be processed. In any case there are no interleaved
    945946    // calibration events in such data, so this is fine.
     947    MTriggerPatternDecode decode;
    946948    MFTriggerPattern fcalib("CalibFilter");
    947949    fcalib.SetDefault(kFALSE);
    … …  
    950952
    951953    if (fIsPulsePosCheck)
    952       {
     954    {
    953955        fillpul.SetFilter(&fcalib);
     956        tlist.AddToList(&decode);
     957        tlist.AddToList(&fcalib);
    954958        tlist.AddToList(&fillpul);
    955       }
     959    }
    956960
    957961    // ----------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mjobs/MJob.cc

    r6553 r7013  
    6060//
    6161MJob::MJob(const char *name, const char *title) : fEnv(0), fEnvDebug(0), fOverwrite(kFALSE), fMaxEvents(0)
    62  
    6362{
    6463    fName  = name  ? name  : "MJob";
    … …  
    300299    return WriteContainer(cont);
    301300}
     301
     302TString MJob::ExpandPath(TString fname)
     303{
     304    // empty
     305    if (fname.IsNull())
     306        return fname;
     307
     308    // Expand path using environment
     309    gSystem->ExpandPathName(fname);
     310
     311    // Absolute path
     312    if (fname[0]=='/')
     313        return fname;
     314
     315    // relative path to file and file could be found
     316    if (!gSystem->AccessPathName(fname, kFileExists))
     317        return fname;
     318
     319    // Now check gEnv and MARSSYS. gEnv can overwrite MARSSYS
     320    TString path(gEnv ? gEnv->GetValue("Mars.Path", "$MARSSYS") : "$MARSSYS");
     321
     322    // Expand path using environment
     323    gSystem->ExpandPathName(path);
     324
     325    // check if path ends with a slash
     326    if (!path.EndsWith("/"))
     327        path += "/";
     328
     329    // compile full qualified path
     330    path += fname;
     331
     332    // return new path
     333    return path;
     334}

  • trunk/MagicSoft/Mars/mjobs/MJob.h

    r6553 r7013  
    7575    MStatusDisplay *GetDisplay() { return fDisplay; }
    7676
     77    static TString ExpandPath(TString fname);
     78
    7779    ClassDef(MJob, 0) // Bas class for Jobs
    7880};

  • trunk/MagicSoft/Mars/mjobs/calibrationref.rc

    r6718 r7013  
    4242# Converstion factors:
    4343#
    44 RefConvFADC2PheInner:     0.14
    45 RefConvFADC2PheOuter:     0.4
     44RefFADC2PheInner:         0.14
     45RefFADC2PheOuter:         0.4
    4646RefConvFADC2PhotInner:    0.8
    4747RefConvFADC2PhotOuter:    3.8
     48RefConvFADC2PheInner:     0.14
     49RefConvFADC2PheOuter:     0.56
    4850#
    4951# Quantum Efficiencies:

  • trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc

    r6913 r7013  
    4242# Converstion factors:
    4343#
    44 RefConvFADC2PheInner:     0.3
    45 RefConvFADC2PheOuter:     0.6
     44RefFADC2PheInner:         0.3
     45RefFADC2PheOuter:         0.6
    4646RefConvFADC2PhotInner:    1.7
    4747RefConvFADC2PhotOuter:    6.55
     48RefConvFADC2PheInner:     0.31
     49RefConvFADC2PheOuter:     1.26
    4850#
    4951# Quantum Efficiencies:

  • trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc

    r6718 r7013  
    4242# Converstion factors:
    4343#
    44 RefConvFADC2PheInner:     0.13
    45 RefConvFADC2PheOuter:     0.33
     44RefFADC2PheInner:         0.13
     45RefFADC2PheOuter:         0.33
    4646RefConvFADC2PhotInner:    0.71.
    4747RefConvFADC2PhotOuter:    2.8
     48RefConvFADC2PheInner:     0.135
     49RefConvFADC2PheOuter:     0.53
    4850#
    4951# Quantum Efficiencies:
Note: See TracChangeset for help on using the changeset viewer.