Changeset 6031 for trunk


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

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/NEWS

    r5841 r6031  
    5252       extracted with the signal extractor with randomization
    5353
     54    - implemented data reduction in calibrated data by reducing the precision
     55      of the stored floating point values (pedestal, rms and signal) to
     56      roughly 0.5%
     57
    5458
    5559

  • trunk/MagicSoft/Mars/callisto.cc

    r5956 r6031  
    293293        job1.SetEnv(kConfig);
    294294        job1.SetEnvDebug(kDebugEnv);
    295         job1.SetDisplay(d);;
     295        job1.SetDisplay(d);
    296296        job1.SetOverwrite(kOverwrite);
    297297        job1.SetPathData(kInpathD);
    … …  
    387387        job1.SetEnv(kConfig);
    388388        job1.SetEnvDebug(kDebugEnv);
    389         job1.SetDisplay(d);;
     389        job1.SetDisplay(d);
     390        job1.SetNoDisplay();
    390391        job1.SetOverwrite(kOverwrite);
    391392        job1.SetPathData(kInpathD);
    … …  
    415416        job2.SetEnv(kConfig);
    416417        job2.SetEnvDebug(kDebugEnv);
    417         job2.SetDisplay(d);;
     418        job2.SetDisplay(d);
     419        job2.SetNoDisplay();
    418420        job2.SetOverwrite(kOverwrite);
    419421        job2.SetPathData(kInpathD);
    … …  
    448450        job3.SetEnv(kConfig);
    449451        job3.SetEnvDebug(kDebugEnv);
    450         job3.SetDisplay(d);;
     452        job3.SetDisplay(d);
     453        job3.SetNoDisplay();
    451454        job3.SetOverwrite(kOverwrite);
    452455        job3.SetPathData(kInpathD);

  • trunk/MagicSoft/Mars/callisto.rc

    r6012 r6031  
    5252# -------------------------------------------------------------------------
    5353MJPedestalC1.ExtractSignal: MExtractTimeAndChargeDigitalFilter
     54#MJPedestalC1.ExtractSignal: MExtractFixedWindowPeakSearch
    5455
    5556# -------------------------------------------------------------------------
    … …  
    6869# -------------------------------------------------------------------------
    6970# Switch on relative time calibration
    70 #MJCalibration.RelTimeCalibration: Yes
     71# MJCalibration.RelTimeCalibration: Yes
    7172# Switch on intensity calibration
    7273#MJCalibration.IntensityCalibration: Yes
    … …  
    219220#MJPedestalY2.DataCheck: No
    220221#MJPedestalY3.DataCheck: No
     222#MJPedestalY1.Display: None
     223#MJPedestalY2.Display: None
     224#MJPedestalY3.Display: None
    221225#MJPedestalY1.UseData: Yes
    222226#MJPedestalY2.UseData: Yes

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

    r4702 r6031  
    6868    fIsSaturated(kFALSE), fIsHGSaturated(kFALSE)
    6969{
     70    MMath::TruncatePrecision(fPhot);
     71    MMath::TruncatePrecision(fErrPhot);
    7072}
    7173
    … …  
    7880//
    7981// Here:
    80 //  Index numbers are compared
     82//  Index numbers are compared --> This allows sorting by index
    8183//
    8284Int_t MCerPhotPix::Compare(const TObject *o) const

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

    r5690 r6031  
    55#include "MParContainer.h"
    66#endif
    7 
     7#include "MMath.h"
    88class MCerPhotPix : public MParContainer
    99{
    … …  
    4545    Bool_t  IsPixelCore() const         { return fIsCore;  }
    4646
    47     void    SetNumPhotons(Float_t f)    { fPhot    = f; }
    48     void    SetErrorPhot(Float_t f)     { fErrPhot = f; }
    49     void    Set(Float_t np, Float_t ep) { fPhot = np; fErrPhot = ep; }
     47    void    SetNumPhotons(Float_t f)    { MMath::TruncatePrecision(f); fPhot     = f; }
     48    void    SetErrorPhot(Float_t f)     { MMath::TruncatePrecision(f); fErrPhot = f; }
     49    void    Set(Float_t np, Float_t ep) { MMath::TruncatePrecision(np); MMath::TruncatePrecision(ep);  fPhot = np; fErrPhot = ep; }
    5050
    5151    void    SetPixelSaturated()         { fIsSaturated = kTRUE; }

  • trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc

    r5971 r6031  
    110110//    (sqrt(N)/binwidth) needed for WOlfgangs proposed caluclation
    111111//    of alpha(Li/Ma)
     112//  - use the g/h-separation filters from the tasklists ("Cut1") as filters
     113//    two
    112114//
    113115//////////////////////////////////////////////////////////////////////////////

  • 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/////////////////////////////////////////////////////////////////////////////

  • trunk/MagicSoft/Mars/mpedestal/MPedPhotPix.h

    r4384 r6031  
    55#include <TObject.h>
    66#endif
     7#include "MMath.h"
    78
    89class MPedPhotPix : public TObject
    … …  
    2425
    2526    //void SetMean(Float_t f) { fMean = f; }
    26     void SetRms(Float_t f)  { fRms  = f; }
    27     void Set(Float_t m, Float_t r, UInt_t n=1) { fMean = m; fRms = r; fNumEvents=n; }
     27    void SetRms(Float_t f)  {MMath::TruncatePrecision(f); fRms  = f; }
     28    void Set(Float_t m, Float_t r, UInt_t n=1) { MMath::TruncatePrecision(r); MMath::TruncatePrecision(m); fMean = m; fRms = r; fNumEvents=n; }
    2829
    2930    Bool_t IsValid() const { return fRms>=0; }

  • trunk/MagicSoft/Mars/star.rc

    r5067 r6031  
    4141# Configure MJStar
    4242# -------------------------------------------------------------------------
    43 #MJStar.MaxEvents: 1000
     43#MJStar.MaxEvents: 10000
    4444#MJStar.Overwrite: yes,no
    4545#MJStar.
    … …  
    4747# -------------------------------------------------------------------------
    4848# -------------------------------------------------------------------------
    49 MJStar.MImgCleanStd.CleanLevel1: 3.5
    50 MJStar.MImgCleanStd.CleanLevel2: 2
     49MJStar.MImgCleanStd.CleanLevel1: 4.5
     50MJStar.MImgCleanStd.CleanLevel2: 3.0
    5151MJStar.MImgCleanStd.CleanMethod: Scaled
    5252
Note: See TracChangeset for help on using the changeset viewer.