Index: trunk/MagicSoft/Mars/NEWS =================================================================== --- trunk/MagicSoft/Mars/NEWS (revision 6030) +++ trunk/MagicSoft/Mars/NEWS (revision 6031) @@ -52,4 +52,8 @@ extracted with the signal extractor with randomization + - implemented data reduction in calibrated data by reducing the precision + of the stored floating point values (pedestal, rms and signal) to + roughly 0.5% + Index: trunk/MagicSoft/Mars/callisto.cc =================================================================== --- trunk/MagicSoft/Mars/callisto.cc (revision 6030) +++ trunk/MagicSoft/Mars/callisto.cc (revision 6031) @@ -293,5 +293,5 @@ job1.SetEnv(kConfig); job1.SetEnvDebug(kDebugEnv); - job1.SetDisplay(d);; + job1.SetDisplay(d); job1.SetOverwrite(kOverwrite); job1.SetPathData(kInpathD); @@ -387,5 +387,6 @@ job1.SetEnv(kConfig); job1.SetEnvDebug(kDebugEnv); - job1.SetDisplay(d);; + job1.SetDisplay(d); + job1.SetNoDisplay(); job1.SetOverwrite(kOverwrite); job1.SetPathData(kInpathD); @@ -415,5 +416,6 @@ job2.SetEnv(kConfig); job2.SetEnvDebug(kDebugEnv); - job2.SetDisplay(d);; + job2.SetDisplay(d); + job2.SetNoDisplay(); job2.SetOverwrite(kOverwrite); job2.SetPathData(kInpathD); @@ -448,5 +450,6 @@ job3.SetEnv(kConfig); job3.SetEnvDebug(kDebugEnv); - job3.SetDisplay(d);; + job3.SetDisplay(d); + job3.SetNoDisplay(); job3.SetOverwrite(kOverwrite); job3.SetPathData(kInpathD); Index: trunk/MagicSoft/Mars/callisto.rc =================================================================== --- trunk/MagicSoft/Mars/callisto.rc (revision 6030) +++ trunk/MagicSoft/Mars/callisto.rc (revision 6031) @@ -52,4 +52,5 @@ # ------------------------------------------------------------------------- MJPedestalC1.ExtractSignal: MExtractTimeAndChargeDigitalFilter +#MJPedestalC1.ExtractSignal: MExtractFixedWindowPeakSearch # ------------------------------------------------------------------------- @@ -68,5 +69,5 @@ # ------------------------------------------------------------------------- # Switch on relative time calibration -#MJCalibration.RelTimeCalibration: Yes +# MJCalibration.RelTimeCalibration: Yes # Switch on intensity calibration #MJCalibration.IntensityCalibration: Yes @@ -219,4 +220,7 @@ #MJPedestalY2.DataCheck: No #MJPedestalY3.DataCheck: No +#MJPedestalY1.Display: None +#MJPedestalY2.Display: None +#MJPedestalY3.Display: None #MJPedestalY1.UseData: Yes #MJPedestalY2.UseData: Yes Index: trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc (revision 6030) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc (revision 6031) @@ -68,4 +68,6 @@ fIsSaturated(kFALSE), fIsHGSaturated(kFALSE) { + MMath::TruncatePrecision(fPhot); + MMath::TruncatePrecision(fErrPhot); } @@ -78,5 +80,5 @@ // // Here: -// Index numbers are compared +// Index numbers are compared --> This allows sorting by index // Int_t MCerPhotPix::Compare(const TObject *o) const Index: trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h (revision 6030) +++ trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h (revision 6031) @@ -5,5 +5,5 @@ #include "MParContainer.h" #endif - +#include "MMath.h" class MCerPhotPix : public MParContainer { @@ -45,7 +45,7 @@ Bool_t IsPixelCore() const { return fIsCore; } - void SetNumPhotons(Float_t f) { fPhot = f; } - void SetErrorPhot(Float_t f) { fErrPhot = f; } - void Set(Float_t np, Float_t ep) { fPhot = np; fErrPhot = ep; } + void SetNumPhotons(Float_t f) { MMath::TruncatePrecision(f); fPhot = f; } + void SetErrorPhot(Float_t f) { MMath::TruncatePrecision(f); fErrPhot = f; } + void Set(Float_t np, Float_t ep) { MMath::TruncatePrecision(np); MMath::TruncatePrecision(ep); fPhot = np; fErrPhot = ep; } void SetPixelSaturated() { fIsSaturated = kTRUE; } Index: trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc =================================================================== --- trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc (revision 6030) +++ trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc (revision 6031) @@ -110,4 +110,6 @@ // (sqrt(N)/binwidth) needed for WOlfgangs proposed caluclation // of alpha(Li/Ma) +// - use the g/h-separation filters from the tasklists ("Cut1") as filters +// two // ////////////////////////////////////////////////////////////////////////////// Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 6030) +++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 6031) @@ -34,4 +34,6 @@ // but this is NOT recommended! // +// Resource file entries are case sensitive! +// ///////////////////////////////////////////////////////////////////////////// #include "MJCalibrateSignal.h" @@ -432,13 +434,13 @@ MHCamEvent evt1(2, "PedRmsFLG", "Pedestal RMS from Lo Gain;;\\sigma_{p} [fadc/sl]"); MHCamEvent evt2(0, "Extra'd", "Extracted Signal;;S [fadc/sl]"); - MHCamEvent evt3(4, "PedPhot", "Calibrated Pedestal;;P [\\gamma]"); + //MHCamEvent evt3(4, "PedPhot", "Calibrated Pedestal;;P [\\gamma]"); MHCamEvent evt4(5, "PedRMS", "Calibrated Pedestal RMS;;\\sigma_{p} [\\gamma]"); MHCamEvent evt5(0, "Interp'd", "Interpolated Signal;;S [\\gamma]"); - MHCamEvent evt6(2, "Unsuitable", "Unsuitable event ratio;;%"); + MHCamEvent evt6(2, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]"); MHCamEvent evt7(0, "Times", "Arrival Time;;T [slice]"); evt0.EnableVariance(); evt1.EnableVariance(); evt2.EnableVariance(); - evt3.EnableVariance(); + //evt3.EnableVariance(); evt4.EnableVariance(); evt5.EnableVariance(); @@ -448,5 +450,5 @@ MFillH fill1(&evt1, "MPedestalFromExtractor", "FillPedRmsFLG"); MFillH fill2(&evt2, "MExtractedSignalCam", "FillExtracted"); - MFillH fill3(&evt3, "MPedPhotFundamental", "FillPedPhot"); + //MFillH fill3(&evt3, "MPedPhotFundamental", "FillPedPhot"); MFillH fill4(&evt4, "MPedPhotFromExtractor", "FillPedRMS"); MFillH fill5(&evt5, "MCerPhotEvt", "FillInterpolated"); @@ -527,5 +529,5 @@ tlist2.AddToList(&treat); tlist2.AddToList(&fill6); - tlist2.AddToList(&fill3); + //tlist2.AddToList(&fill3); tlist2.AddToList(&fill4); tlist2.AddToList(&fill5); Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 6030) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 6031) @@ -78,5 +78,8 @@ //End_Html // -// Different arrival time extractors can be set directly with the command SetTimeExtractor(MExtractor *) +// Different arrival time extractors can be set directly with the command +// SetTimeExtractor(MExtractor *) +// +// Resource file entries are case sensitive! // // See also: MHCalibrationRelTimePix, MHCalibrationRelTimeCam, MHGausEvents Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 6030) +++ trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 6031) @@ -28,4 +28,6 @@ // MJPedestal // +// Resource file entries are case sensitive! +// ///////////////////////////////////////////////////////////////////////////// #include "MJPedestal.h" @@ -113,5 +115,5 @@ // MJPedestal::MJPedestal(const char *name, const char *title) - : fRuns(0), fExtractor(NULL), fDisplayType(kNormalDisplay), + : fRuns(0), fExtractor(NULL), fDisplayType(kDisplayNormal), fDataCheck(kFALSE), fExtractType(kUsePedRun), fExtractionType(kFundamental) { @@ -338,5 +340,5 @@ // Display data // - if (fDisplayType != kDataCheckDisplay && fExtractType != kUseHists && fExtractionType==kFundamental/*fExtractorResolution*/) + if (fDisplayType != kDisplayDataCheck && fExtractType != kUseHists && fExtractionType==kFundamental/*fExtractorResolution*/) { TCanvas &c3 = fDisplay->AddTab("Pedestals"); @@ -378,5 +380,5 @@ } - if (fDisplayType == kDataCheckDisplay) + if (fDisplayType == kDisplayDataCheck) { @@ -544,5 +546,5 @@ disp1.CamDraw(c3, 2, 2, 6); - TCanvas &c13 = fDisplay->AddTab(fExtractionType==kWithExtractor?"PedDiff":"DiffRndm"); + TCanvas &c13 = fDisplay->AddTab(fExtractionType==kWithExtractor?"DiffExtrd":"DiffRndm"); c13.Divide(2,3); @@ -691,6 +693,6 @@ // Prefix.DataCheck: Yes, No // -// Show data check display -// Prefix.DataCheckDisplay: Yes, No +// Setup display type +// Prefix.Display: normal , datacheck, none // // Use cosmic data instead of pedestal data (DatRuns) @@ -704,6 +706,15 @@ SetDataCheck(GetEnv("DataCheck", fDataCheck)); - if (HasEnv("DataCheckDisplay")) - fDisplayType = GetEnv("DataCheckDisplay", kFALSE) ? kDataCheckDisplay : kNormalDisplay; + if (HasEnv("Display")) + { + TString type = GetEnv("Display", "normal"); + type.ToLower(); + if (type==(TString)"normal") + fDisplayType = kDisplayNormal; + if (type==(TString)"datacheck") + fDisplayType = kDisplayDataCheck; + if (type==(TString)"none") + fDisplayType = kDisplayNone; + } if (HasEnv("UseData")) @@ -713,6 +724,4 @@ if (GetEnv("UseHists",kFALSE)) fExtractType = kUseHists; - - //fExtractorResolution = GetEnv("ExtractionType", fExtractorResolution); SetNoStorage(GetEnv("DisableOutput", IsNoStorage())); @@ -1047,5 +1056,6 @@ tlist.PrintStatistics(); - DisplayResult(plist); + if (fDisplayType!=kDisplayNone) + DisplayResult(plist); if (!WriteResult()) Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJPedestal.h (revision 6030) +++ trunk/MagicSoft/Mars/mjobs/MJPedestal.h (revision 6031) @@ -48,5 +48,5 @@ MBadPixelsCam fBadPixels; // Bad Pixels - enum Display_t { kDataCheckDisplay, kNormalDisplay}; // Possible Display types + enum Display_t { kDisplayNone, kDisplayNormal, kDisplayDataCheck }; // Possible Display types Display_t fDisplayType; // Chosen Display type @@ -98,7 +98,8 @@ void SetUseHists() { fExtractType = kUseHists; } void SetUsePedRun() { fExtractType = kUsePedRun; } - void SetDataCheck(const Bool_t b=kTRUE) { fDataCheck = b; b ? SetDataCheckDisplay() : SetNormalDisplay(); } - void SetDataCheckDisplay() { fDisplayType = kDataCheckDisplay; } - void SetNormalDisplay() { fDisplayType = kNormalDisplay; } + void SetDataCheck(const Bool_t b=kTRUE) { fDataCheck = b; } + void SetDataCheckDisplay() { fDisplayType = kDisplayDataCheck; } + void SetNormalDisplay() { fDisplayType = kDisplayNormal; } + void SetNoDisplay() { fDisplayType = kDisplayNone; } void SetExtractionFundamental() { fExtractionType=kFundamental; /*fPedestalCamOut.SetName("MPedestalFundamental");*/ } Index: trunk/MagicSoft/Mars/mjobs/MJStar.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJStar.cc (revision 6030) +++ trunk/MagicSoft/Mars/mjobs/MJStar.cc (revision 6031) @@ -26,4 +26,6 @@ // // MJStar +// +// Resource file entries are case sensitive! // ///////////////////////////////////////////////////////////////////////////// Index: trunk/MagicSoft/Mars/mpedestal/MPedPhotPix.h =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MPedPhotPix.h (revision 6030) +++ trunk/MagicSoft/Mars/mpedestal/MPedPhotPix.h (revision 6031) @@ -5,4 +5,5 @@ #include #endif +#include "MMath.h" class MPedPhotPix : public TObject @@ -24,6 +25,6 @@ //void SetMean(Float_t f) { fMean = f; } - void SetRms(Float_t f) { fRms = f; } - void Set(Float_t m, Float_t r, UInt_t n=1) { fMean = m; fRms = r; fNumEvents=n; } + void SetRms(Float_t f) {MMath::TruncatePrecision(f); fRms = f; } + void Set(Float_t m, Float_t r, UInt_t n=1) { MMath::TruncatePrecision(r); MMath::TruncatePrecision(m); fMean = m; fRms = r; fNumEvents=n; } Bool_t IsValid() const { return fRms>=0; } Index: trunk/MagicSoft/Mars/star.rc =================================================================== --- trunk/MagicSoft/Mars/star.rc (revision 6030) +++ trunk/MagicSoft/Mars/star.rc (revision 6031) @@ -41,5 +41,5 @@ # Configure MJStar # ------------------------------------------------------------------------- -#MJStar.MaxEvents: 1000 +#MJStar.MaxEvents: 10000 #MJStar.Overwrite: yes,no #MJStar. @@ -47,6 +47,6 @@ # ------------------------------------------------------------------------- # ------------------------------------------------------------------------- -MJStar.MImgCleanStd.CleanLevel1: 3.5 -MJStar.MImgCleanStd.CleanLevel2: 2 +MJStar.MImgCleanStd.CleanLevel1: 4.5 +MJStar.MImgCleanStd.CleanLevel2: 3.0 MJStar.MImgCleanStd.CleanMethod: Scaled