Changeset 8988 for trunk/MagicSoft/Mars

Timestamp:

06/30/08 10:37:00 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.cc (modified) (4 diffs)
• datacenter/macros/plotdb.C (modified) (2 diffs)
• mbadpixels/MBadPixelsPix.h (modified) (2 diffs)
• mbase/MMath.cc (modified) (2 diffs)
• mbase/MStatusDisplay.h (modified) (1 diff)
• mbase/MTime.h (modified) (1 diff)
• mhcalib/HCalibLinkDef.h (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (1 diff)
• mhcalib/MHCalibrationChargeCam.cc (modified) (4 diffs)
• mhcalib/Makefile (modified) (1 diff)
• mhflux/MHThreshold.cc (modified) (2 diffs)
• mhist/MHCamera.cc (modified) (6 diffs)
• mhist/MHCamera.h (modified) (3 diffs)
• mjobs/JobsLinkDef.h (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/Makefile (modified) (1 diff)
• mranforest/MRanForest.cc (modified) (2 diffs)
• mtools/MCalendar.h (modified) (1 diff)
• mtools/MagicJam.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
      - added ' around the where clause in UpdateInsert to allowe
        also for times etc
+
+   * callisto.cc:
+     - removed test-option (it was never used anyway and should
+       be reprogrammed properly)
+
+   * datacenter/macros/plotdb.C, mbase/MStatusDisplay.h, mbase/MTime.h:
+     - removed unused argument
+
+   * mbadpixels/MBadPixelsPix.h:
+     - added static functions to get names and numbers of unsuitable
+       and unreliable levels
+
+   * mbase/MMath.cc:
+     - made MedianDevImp working properly with a template
+
+   * mhcalib/HCalibLinkDef.h, mhcalib/Makefile:
+     - removed MHCalibrationTestCam
+     - removed MHCalibrationTestTimeCam
+
+   * mhcalib/MHCalibrationCam.cc:
+     - removed an obsolete TPad in Draw()
+     - removed some obsolete kCanDelete in Drwa()
+
+   * mhcalib/MHCalibrationChargeCam.cc:
+     - changed some colors to work properly also in root 5.20/00
+
+   * mhflux/MHThreshold.cc:
+     - made Smooth work with root 5.20/00 (to be checked)
+
+   * mhist/MHCamera.[h,cc]:
+     - fixed defaults in Profile and Projection function to match code
+     - fixed some comments
+     - replaced InheritsFrom arguments by TClass statics
+
+   * mjobs/JobsLinkDef.h:
+     - removed MJCalibTest
+
+   * mjobs/MJCalibrateSignal.cc, mjobs/Makefile:
+     - removed obsolete include of MParameterCalc
+
+   * mranforest/MRanForest.cc:
+     - added a cast in BinarySearch to make it work with the template
+       of root 5.20/00
+
+   * mtools/MCalendar.h:
+     - fixed *MENU option
+
+   * mtools/MagicJam.h:
+     - added the Smooth function of root 5.20/00 to be removed from
+       the context menu
 
 

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
 == <cvs> ==
+
+ ;general
+
+   * should work now with root 5.20/00
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -82 +82 @@
     gLog << "   --print-files             Print Files taken from Sequence" << endl;
     gLog << "   --print-found             Print Files found from Sequence" << endl;
-    gLog << "   --use-test                Apply calibration constants to same calibration" << endl;
-    gLog << "                             file (for testing, calibration mode only)" << endl;
+//    gLog << "   --use-test                Apply calibration constants to same calibration" << endl;
+//    gLog << "                             file (for testing, calibration mode only)" << endl;
     gLog << "   --movie                   Write a movie in addition to Mode-Y (this might " << endl;
     gLog << "                             stop the eventloop before all evts are processed)" << endl;
@@ -172 +172 @@
     const Bool_t  kPrintFiles = arg.HasOnlyAndRemove("--print-files");
     const Bool_t  kPrintFound = arg.HasOnlyAndRemove("--print-found");
-    const Bool_t  kUseTest    = arg.HasOnlyAndRemove("--use-test");
+//    const Bool_t  kUseTest    = arg.HasOnlyAndRemove("--use-test");
     const Bool_t  kMovie      = arg.HasOnlyAndRemove("--movie");
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
@@ -458 +458 @@
             return 1;
         }
-
+/*
         if (kUseTest)
         {
@@ -484 +484 @@
                 return 1;
             }
-        }
+        }*/
     }
 

trunk/MagicSoft/Mars/datacenter/macros/plotdb.C

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.47 2008-06-30 08:46:03 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.48 2008-06-30 09:36:34 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -386 +386 @@
             fDataSet = new MDataSet(filename);
     }
-    void SetPlotRange(Float_t min, Float_t max, Int_t n=5) { fPlotMin = min; fPlotMax = max; }
+    void SetPlotRange(Float_t min, Float_t max/*, Int_t n=5*/) { fPlotMin = min; fPlotMax = max; }
     void SetHistRange(Float_t min, Float_t max) { fHistMin = min; fHistMax = max; }
     void SetRequestRange(const char *from="", const char *to="") { fRequestFrom = from; fRequestTo = to; }

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -115 +115 @@
     }
 
+    static TString GetUnsuitableName(Int_t lvl)
+    {
+        switch (lvl)
+        {
+        case  1: return "Signal smaller 4.5 Pedestal RMS";
+        case  2: return "Low Gain Saturation";
+        case  3: return "High-Gain Histogram Overflow";
+        case  4: return "Low-Gain Histogram Overflow";
+        case  5: return "Presumably dead from Ped. Rms";
+        case  6: return "Deviating Number of Photo-electrons";
+        case  7: return "Deviation from median abs.arr-time rms";
+        case  8: return "Deviation from median rel.arr-time rms";
+        case  9: return "Too many Low-Gain Blackout Events";
+        case 10: return "Previously Excluded";
+        default: return "";
+        }
+    }
+
+    static Int_t GetNumUnsuitable() { return 10; }
+
     Int_t  GetUnreliableCalLevel() const   {
       if (!IsUnreliable() || IsUnsuitable())      return 0;
@@ -128 +148 @@
     }
 
+    static TString GetUnreliableName(Int_t lvl)
+    {
+        switch (lvl)
+        {
+        case 1: return "Signal Sigma smaller Pedestal RMS";
+        case 2: return "High Gain Signals could not be fitted";
+        case 3: return "Low  Gain Signals could not be fitted";
+        case 4: return "Relative Arr. Times could not be fitted";
+        case 5: return "High Gain Signals Oscillation";
+        case 6: return "Low  Gain Signals Oscillation";
+        case 7: return "Relative Arr. Times Oscillation";
+        case 8: return "Deviating global F-Factor";
+        default: return "";
+        }
+    }
+
+    static Int_t GetNumUnreliable() { return 8; }
+
     void Merge(const MBadPixelsPix &pix);
 

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.39 2008-06-18 20:39:48 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.40 2008-06-30 09:36:35 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -234 +234 @@
 
     // Define where to divide (floor because the highest possible is n-1)
-    const Int_t div = TMath::FloorNint(n*prob);
+    const Size div = TMath::FloorNint(n*prob);
 
     // Calculate result

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -194 +194 @@
      TObject *FindObject(const char *obj, const char *base) const { return FindObjectInCanvas(obj, base, 0); }
      TObject *FindObject(const char *obj) const { return FindObjectInCanvas(obj, obj, 0); }
-     TObject *FindObject(const TObject *o) const { return 0;  }
+     TObject *FindObject(const TObject *) const { return 0;  }
 
      void PrintContent(Option_t *o="") const;

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -83 +83 @@
     }
 
-    void Clear(const Option_t *o="") { fMjd=0; fTime=0; fNanoSec=0; }
+    void Clear(const Option_t *) { Clear(); }
+    void Clear() { fMjd=0; fTime=0; fNanoSec=0; }
 
     void Print(Option_t *t=NULL) const;

trunk/MagicSoft/Mars/mhcalib/HCalibLinkDef.h

@@ -13 +13 @@
 #pragma link C++ class MHCalibrationChargePINDiode+;
 #pragma link C++ class MHCalibrationRelTimeCam+;
-#pragma link C++ class MHCalibrationTestCam+;
-#pragma link C++ class MHCalibrationTestTimeCam+;
+//#pragma link C++ class MHCalibrationTestCam+;
+//#pragma link C++ class MHCalibrationTestTimeCam+;
 #pragma link C++ class MHCalibrationPulseTimeCam+;
 //#pragma link C++ class MHCalibrationHiLoCam+;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -1472 +1472 @@
 //
 void MHCalibrationCam::DrawAverageSigma(Bool_t sat, Bool_t inner,
-                                              Float_t sigma, Float_t sigmavar,
-                                              Float_t relsigma, Float_t relsigmavar) const 
-{
-  
-  if (sigma != 0 && sigmavar >= 0 && relsigmavar >= 0.)
-    {
-      
-      TPad *newpad = new TPad("newpad","transparent",0,0,1,1);
-      newpad->SetFillStyle(4000);
-      newpad->Draw();
-      newpad->cd();
-      
+                                        Float_t sigma, Float_t sigmavar,
+                                        Float_t relsigma, Float_t relsigmavar) const
+{
+  
+    if (sigma==0 || sigmavar<0 || relsigmavar<0)
+        return;
+
       TPaveText *text = new TPaveText(sat? 0.1 : 0.35,0.7,sat ? 0.4 : 0.7,1.0);
       text->SetTextSize(0.05);
-      const TString line1 = Form("%s%s%s",inner ? "Outer" : "Inner",
-                                 " Pixels ", sat ? "Low Gain" : "High Gain");
-      TText *txt1 = text->AddText(line1.Data());
-      const TString line2 = Form("#sigma per pix: %2.2f #pm %2.2f",sigma,TMath::Sqrt(sigmavar));
-      TText *txt2 = text->AddText(line2.Data());
-      const TString line3 = Form("Rel. #sigma per pix: %2.2f #pm %2.2f",relsigma,TMath::Sqrt(relsigmavar));
-      TText *txt3 = text->AddText(line3.Data());
+      text->SetBit(kCanDelete);
       text->Draw("");
-      
-      text->SetBit(kCanDelete);
-      txt1->SetBit(kCanDelete);
-      txt2->SetBit(kCanDelete);
-      txt3->SetBit(kCanDelete);
-      newpad->SetBit(kCanDelete);
-    }
+
+      const TString line1 = Form("%s Pixels %s Gain",
+                                 inner?"Outer" : "Inner", sat?"Low":"High");
+      const TString line2 = Form("#sigma per pix: %2.2f #pm %2.2f", sigma, TMath::Sqrt(sigmavar));
+      const TString line3 = Form("Rel. #sigma per pix: %2.2f #pm %2.2f", relsigma, TMath::Sqrt(relsigmavar));
+
+      text->AddText(line1.Data());
+      text->AddText(line2.Data());
+      text->AddText(line3.Data());
 }
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.61 2008-06-14 15:55:53 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.62 2008-06-30 09:36:36 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1286 +1286 @@
             break;
         case MCalibrationCam::kUV:
-            fit->SetLineColor(106);
+            fit->SetLineColor(51);
             break;
         case MCalibrationCam::kCT1:
-            fit->SetLineColor(006);
+            fit->SetLineColor(6);
             break;
         default:
@@ -1337 +1337 @@
 {
     TLine *line = new TLine(refline, 0, refline, hist->GetMaximum());
-    line->SetLineColor(106);
+    line->SetLineColor(51);
     line->SetLineStyle(2);
     line->SetLineWidth(3);
@@ -1343 +1343 @@
     line->Draw();
 
-    TLegend *leg = new TLegend(0.8,0.01,0.99,0.45);
+    TLegend *leg = new TLegend(0.8,0.01,0.99,0.15);
     leg->AddEntry(line, "10 Leds UV", "l");
     leg->SetBit(kCanDelete);

trunk/MagicSoft/Mars/mhcalib/Makefile

@@ -40 +40 @@
            MHCalibrationChargePINDiode.cc \
            MHCalibrationRelTimeCam.cc \
-           MHCalibrationTestCam.cc \
            MHCalibrationPulseTimeCam.cc \
-           MHCalibrationTestTimeCam.cc \
            MHGausEvents.cc 
 

trunk/MagicSoft/Mars/mhflux/MHThreshold.cc

@@ -116 +116 @@
     TH1D h(fHEnergy);
 
+#if ROOT_VERSION_CODE<ROOT_VERSION(5,20,00)
     Int_t min=1;
     while (min<h.GetNbinsX() && h.GetBinContent(min)==0)
@@ -127 +128 @@
 
     h.Smooth(1, min, max);
+#else
+    h.Smooth(1);
+#endif
 
     const Int_t bin  =  h.GetMaximumBin();

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.108 2008-06-14 14:32:15 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.109 2008-06-30 09:36:38 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -675 +675 @@
 // and added to gROOT such the gROOT->FindObject can find the histogram.
 //
-// If the standard name "_py" is given "_py" is appended to the name
+// If the standard name "_proj" is given "_proj" is appended to the name
 // of the MHCamera and the corresponding histogram is searched using
 // gROOT->FindObject and updated with the present projection.
@@ -718 +718 @@
     //check if histogram with identical name exist
     TObject *h1obj = gROOT->FindObject(pname);
-    if (h1obj && h1obj->InheritsFrom("TH1D")) {
+    if (h1obj && h1obj->InheritsFrom(TH1D::Class())) {
         h1 = (TH1D*)h1obj;
         h1->Reset();
@@ -812 +812 @@
     //check if histogram with identical name exist
     TObject *h1obj = gROOT->FindObject(pname);
-    if (h1obj && h1obj->InheritsFrom("TProfile")) {
+    if (h1obj && h1obj->InheritsFrom(TProfile::Class())) {
         h1 = (TProfile*)h1obj;
         h1->Reset();
@@ -859 +859 @@
 // and added to gROOT such the gROOT->FindObject can find the histogram.
 //
-// If the standard name "_azi" is given "_azi" is appended to the name
+// If the standard name "_az" is given "_az" is appended to the name
 // of the MHCamera and the corresponding histogram is searched using
 // gROOT->FindObject and updated with the present projection.
@@ -892 +892 @@
     //check if histogram with identical name exist
     TObject *h1obj = gROOT->FindObject(pname);
-    if (h1obj && h1obj->InheritsFrom("TProfile")) {
+    if (h1obj && h1obj->InheritsFrom(TProfile::Class())) {
         h1 = (TProfile*)h1obj;
         h1->Reset();

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -1 +1 @@
 /* ======================================================================== *\
-!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.64 2007-05-10 12:14:54 tbretz Exp $
+!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.65 2008-06-30 09:36:38 tbretz Exp $
 \* ======================================================================== */
 #ifndef MARS_MHCamera
@@ -284 +284 @@
     UInt_t   GetNumPixels() const;
 
-    TH1D    *Projection(const char *name="_py", const Int_t nbins=50) const
-      {
+    TH1D    *Projection(const char *name="_proj", const Int_t nbins=50) const
+    {
         return ProjectionS(TArrayI(), TArrayI(), name,nbins);
-      }
-    TH1D    *ProjectionS(Int_t sector, Int_t aidx, const char *name="_py", const Int_t nbins=50) const
+    }
+    TH1D    *ProjectionS(Int_t sector, Int_t aidx, const char *name="_proj", const Int_t nbins=50) const
     {
         return ProjectionS(TArrayI(1, &sector), TArrayI(1, &aidx), name, nbins);
     }
-    TH1D    *ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name="_py", const Int_t nbins=50) const;
+    TH1D    *ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name="_proj", const Int_t nbins=50) const;
 
     TProfile *RadialProfile(const char *name="_rad", Int_t nbins=25) const { return  RadialProfileS(TArrayI(), TArrayI(), name, nbins);}
@@ -301 +301 @@
     TProfile *RadialProfileS(const TArrayI &sector, const TArrayI &aidx, const char *name="_rad", const Int_t nbins=25) const;
 
-    TProfile *AzimuthProfile(const char *name="_azi", Int_t nbins=25) const { return  AzimuthProfileA(TArrayI(), name, nbins);  }
-    TProfile *AzimuthProfile(Int_t aidx, const char *name="_rad", const Int_t nbins=25) const
-      {
+    TProfile *AzimuthProfile(const char *name="_az", Int_t nbins=25) const { return  AzimuthProfileA(TArrayI(), name, nbins);  }
+    TProfile *AzimuthProfile(Int_t aidx, const char *name="_az", const Int_t nbins=25) const
+    {
         return AzimuthProfileA(TArrayI(1, &aidx), name, nbins);
-      }
-    TProfile *AzimuthProfileA(const TArrayI &aidx, const char *name="_rad", const Int_t nbins=25) const;
+    }
+    TProfile *AzimuthProfileA(const TArrayI &aidx, const char *name="_az", const Int_t nbins=25) const;
     
     void CamDraw(TCanvas &c, const Int_t x, const Int_t y, 

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MJob+;
 #pragma link C++ class MJCalib+;
-#pragma link C++ class MJCalibTest+;
+//#pragma link C++ class MJCalibTest+;
 #pragma link C++ class MJCalibration+;
 #pragma link C++ class MJCalibrateSignal+;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -235 +235 @@
 }
 
-#include "MParameterCalc.h" // FIXME
 Bool_t MJCalibrateSignal::Process(MPedestalCam &pedcamab, MPedestalCam &pedcambias,
                                   MPedestalCam &pedcamextr)

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -31 +31 @@
            MJPedestal.cc \
            MJCalib.cc \
-           MJCalibTest.cc \
            MJCalibration.cc \
            MJCalibrateSignal.cc \

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MRanForest.cc,v 1.28 2008-06-02 08:46:43 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MRanForest.cc,v 1.29 2008-06-30 09:36:39 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -241 +241 @@
             // If no match found, function gives nearest element smaller
             // than value.
-            int k=TMath::BinarySearch(ngrid, fGrid.GetArray(), fHadTrue[j]);
+            int k=TMath::BinarySearch(ngrid, fGrid.GetArray(), (Double_t)fHadTrue[j]);
 
             fClass[j]   = k;

trunk/MagicSoft/Mars/mtools/MCalendar.h

@@ -173 +173 @@
     void RemoveEnv(const char *VariableName) const;//*MENU
 
-    void SetMoonGraf(Int_t Align, Float_t Radius) { fMoonAlignGraf=Align; fMoonRadius=Radius; } //*MENU* *ARGS={Align>=fMoonAlignGraf,Radius=>fMoonRadius}
-    void SetMoonText(Int_t Align, Int_t Type, Int_t Continous) { fMoonAlignText=Align; fMoonTextType=Type; fMoonTextCont=Continous; } //*MENU* *ARGS={Align>=fMoonAlignText,Type=>fMoonTextType,Continous=>fMoonTextCont}
+    void SetMoonGraf(Int_t Align, Float_t Radius) { fMoonAlignGraf=Align; fMoonRadius=Radius; } //*MENU* *ARGS={Align=>fMoonAlignGraf,Radius=>fMoonRadius}
+    void SetMoonText(Int_t Align, Int_t Type, Int_t Continous) { fMoonAlignText=Align; fMoonTextType=Type; fMoonTextCont=Continous; } //*MENU* *ARGS={Align=>fMoonAlignText,Type=>fMoonTextType,Continous=>fMoonTextCont}
 
     // Calendar sheet interface

trunk/MagicSoft/Mars/mtools/MagicJam.h

@@ -34 +34 @@
     void  Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option="") { }
     void  Smooth(int, int, int) { }
+    void  Smooth(int, const Option_t *) { }
     void  SetPrettyPalette() {}
     void  SetDeepBlueSeaPalette() {}