Ignore:
Timestamp:
01/27/05 09:43:34 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mjobs
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r5957 r6031  
    3434// but this is NOT recommended!
    3535//
     36// Resource file entries are case sensitive!
     37//
    3638/////////////////////////////////////////////////////////////////////////////
    3739#include "MJCalibrateSignal.h"
    … …  
    432434    MHCamEvent evt1(2, "PedRmsFLG",   "Pedestal RMS from Lo Gain;;\\sigma_{p} [fadc/sl]");
    433435    MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [fadc/sl]");
    434     MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
     436    //MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
    435437    MHCamEvent evt4(5, "PedRMS",      "Calibrated Pedestal RMS;;\\sigma_{p} [\\gamma]");
    436438    MHCamEvent evt5(0, "Interp'd",    "Interpolated Signal;;S [\\gamma]");
    437     MHCamEvent evt6(2, "Unsuitable",  "Unsuitable event ratio;;%");
     439    MHCamEvent evt6(2, "Unsuitable",  "Fraction of unsuitable events per Pixel;;[1]");
    438440    MHCamEvent evt7(0, "Times",       "Arrival Time;;T [slice]");
    439441    evt0.EnableVariance();
    440442    evt1.EnableVariance();
    441443    evt2.EnableVariance();
    442     evt3.EnableVariance();
     444    //evt3.EnableVariance();
    443445    evt4.EnableVariance();
    444446    evt5.EnableVariance();
    … …  
    448450    MFillH fill1(&evt1, "MPedestalFromExtractor", "FillPedRmsFLG");
    449451    MFillH fill2(&evt2, "MExtractedSignalCam",    "FillExtracted");
    450     MFillH fill3(&evt3, "MPedPhotFundamental",    "FillPedPhot");
     452    //MFillH fill3(&evt3, "MPedPhotFundamental",    "FillPedPhot");
    451453    MFillH fill4(&evt4, "MPedPhotFromExtractor",  "FillPedRMS");
    452454    MFillH fill5(&evt5, "MCerPhotEvt",            "FillInterpolated");
    … …  
    527529    tlist2.AddToList(&treat);
    528530    tlist2.AddToList(&fill6);
    529     tlist2.AddToList(&fill3);
     531    //tlist2.AddToList(&fill3);
    530532    tlist2.AddToList(&fill4);
    531533    tlist2.AddToList(&fill5);

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

    r6004 r6031  
    7878//End_Html
    7979//
    80 // Different arrival time extractors can be set directly with the command SetTimeExtractor(MExtractor *)
     80// Different arrival time extractors can be set directly with the command
     81// SetTimeExtractor(MExtractor *)
     82//
     83// Resource file entries are case sensitive!
    8184//
    8285// See also: MHCalibrationRelTimePix, MHCalibrationRelTimeCam, MHGausEvents

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

    r5957 r6031  
    2828//  MJPedestal
    2929//
     30// Resource file entries are case sensitive!
     31//
    3032/////////////////////////////////////////////////////////////////////////////
    3133#include "MJPedestal.h"
    … …  
    113115//
    114116MJPedestal::MJPedestal(const char *name, const char *title)
    115     : fRuns(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
     117    : fRuns(0), fExtractor(NULL), fDisplayType(kDisplayNormal),
    116118      fDataCheck(kFALSE), fExtractType(kUsePedRun), fExtractionType(kFundamental)
    117119{
    … …  
    338340    // Display data
    339341    //
    340     if (fDisplayType != kDataCheckDisplay && fExtractType != kUseHists && fExtractionType==kFundamental/*fExtractorResolution*/)
     342    if (fDisplayType != kDisplayDataCheck && fExtractType != kUseHists && fExtractionType==kFundamental/*fExtractorResolution*/)
    341343      {
    342344        TCanvas &c3 = fDisplay->AddTab("Pedestals");
    … …  
    378380      }
    379381
    380     if (fDisplayType == kDataCheckDisplay)
     382    if (fDisplayType == kDisplayDataCheck)
    381383      {
    382384
    … …  
    544546          disp1.CamDraw(c3, 2, 2, 6);
    545547
    546           TCanvas &c13 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedDiff":"DiffRndm");
     548          TCanvas &c13 = fDisplay->AddTab(fExtractionType==kWithExtractor?"DiffExtrd":"DiffRndm");
    547549          c13.Divide(2,3);
    548550
    … …  
    691693//   Prefix.DataCheck:        Yes, No <default>
    692694//
    693 // Show data check display
    694 //   Prefix.DataCheckDisplay: Yes, No <default>
     695// Setup display type
     696//   Prefix.Display:          normal <default>, datacheck, none
    695697//
    696698// Use cosmic data instead of pedestal data (DatRuns)
    … …  
    704706    SetDataCheck(GetEnv("DataCheck", fDataCheck));
    705707
    706     if (HasEnv("DataCheckDisplay"))
    707         fDisplayType = GetEnv("DataCheckDisplay", kFALSE) ? kDataCheckDisplay : kNormalDisplay;
     708    if (HasEnv("Display"))
     709    {
     710        TString type = GetEnv("Display", "normal");
     711        type.ToLower();
     712        if (type==(TString)"normal")
     713            fDisplayType = kDisplayNormal;
     714        if (type==(TString)"datacheck")
     715            fDisplayType = kDisplayDataCheck;
     716        if (type==(TString)"none")
     717            fDisplayType = kDisplayNone;
     718    }
    708719
    709720    if (HasEnv("UseData"))
    … …  
    713724        if (GetEnv("UseHists",kFALSE))
    714725            fExtractType = kUseHists;
    715 
    716     //fExtractorResolution = GetEnv("ExtractionType", fExtractorResolution);
    717726
    718727    SetNoStorage(GetEnv("DisableOutput", IsNoStorage()));
    … …  
    10471056    tlist.PrintStatistics();
    10481057
    1049     DisplayResult(plist);
     1058    if (fDisplayType!=kDisplayNone)
     1059        DisplayResult(plist);
    10501060
    10511061    if (!WriteResult())

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

    r5938 r6031  
    4848    MBadPixelsCam fBadPixels;                            // Bad Pixels
    4949
    50     enum Display_t { kDataCheckDisplay, kNormalDisplay}; // Possible Display types
     50    enum Display_t { kDisplayNone, kDisplayNormal, kDisplayDataCheck }; // Possible Display types
    5151    Display_t fDisplayType;                              // Chosen Display type
    5252
    … …  
    9898    void SetUseHists()                          { fExtractType = kUseHists;  }
    9999    void SetUsePedRun()                         { fExtractType = kUsePedRun; }
    100     void SetDataCheck(const Bool_t b=kTRUE)     { fDataCheck = b; b ? SetDataCheckDisplay() : SetNormalDisplay(); }
    101     void SetDataCheckDisplay()                  { fDisplayType = kDataCheckDisplay; }
    102     void SetNormalDisplay()                     { fDisplayType = kNormalDisplay;    }
     100    void SetDataCheck(const Bool_t b=kTRUE)     { fDataCheck   = b; }
     101    void SetDataCheckDisplay()                  { fDisplayType = kDisplayDataCheck; }
     102    void SetNormalDisplay()                     { fDisplayType = kDisplayNormal;    }
     103    void SetNoDisplay()                         { fDisplayType = kDisplayNone; }
    103104
    104105    void SetExtractionFundamental()       { fExtractionType=kFundamental;       /*fPedestalCamOut.SetName("MPedestalFundamental");*/   }

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

    r5810 r6031  
    2626//
    2727//  MJStar
     28//
     29// Resource file entries are case sensitive!
    2830//
    2931/////////////////////////////////////////////////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.