Changeset 10281

Timestamp:

04/04/11 10:08:59 (14 years ago)

Author:

tbretz

Message:

 

Location:

trunk/Mars

Files:

• Changelog (modified) (2 diffs)
• mastro/MAstroCatalog.cc (modified) (3 diffs)
• mgeom/MGeomCam.cc (modified) (1 diff)
• mhflux/MHEnergyEst.cc (modified) (2 diffs)
• mhist/MHCamera.cc (modified) (3 diffs)
• mmain/MEventDisplay.cc (modified) (3 diffs)
• mpointing/MPointingDevCalc.cc (modified) (1 diff)
• mreport/MReportFileRead.cc (modified) (3 diffs)

trunk/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2011/04/04 Thomas Bretz
+
+   * mreport/MReportFileRead.cc:
+     - added a missing delete
+
+   * mhflux/MHEnergyEst.cc, mhist/MHCamera.cc:
+     - fixed some crashes with newer root versiony in which
+       GetFunction("gaus") after an unsuccessfull fit might return
+       NULL
+
+   * mastro/MAstroCatalog.cc:
+     - added the missing marker color for the dot
+
+   * mpointing/MPointingDevCalc.cc:
+     - added some comments
+
+   * mmain/MEventDisplay.cc:
+     - renamed some local variables to avoid using the same name twice
+
+   * mgeom/MGeomCam.cc:
+     - for convenience a margin of 0 in HitFrame is allowed to
+       switch off the detection also with 0
+
+   * mbase/MThread.h:
+     - added missing argument to call of fThread.Run()
+
+
 
  2011/03/10 Thomas Bretz
@@ -44 +72 @@
 
 
- 2011/02/21 Daniela Dorner
+ 2011/02/21 Thomas Bretz
 
    * mcalib/MCalibrateData.cc mcalib/MCalibrationBlindPix.cc

trunk/Mars/mastro/MAstroCatalog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.34 2009-10-26 14:31:17 tbretz Exp $
-! --------------------------------------------------------------------------
 !
 ! *
@@ -865 +863 @@
     // draw star on the camera display
     TMarker *tip=new TMarker(x, y, kDot);
+    tip->SetMarkerColor(col);
+
     TAttMarker::Copy(*tip);
 
@@ -1471 +1471 @@
 // Handle keyboard events.
 //
-void MAstroCatalog::ExecuteEventKbd(Int_t keycode, Int_t keysym)
+void MAstroCatalog::ExecuteEventKbd(Int_t /*keycode*/, Int_t keysym)
 {
     Double_t dra =0;

trunk/Mars/mgeom/MGeomCam.cc

@@ -432 +432 @@
 Bool_t MGeomCam::HitFrame(MQuaternion p, const MQuaternion &u, Double_t margin) const
 {
-    if (margin<=0)
+    if (margin<0)
         return HitFrame(p, u);
 

trunk/Mars/mhflux/MHEnergyEst.cc

@@ -254 +254 @@
     *fLog << " RMS   of Delta E/E: " << Form("%4.2f%%",  100*h->GetRMS()) << endl;
     *fLog << "Results from Histogram-Fit:" << endl;
-    *fLog << " Bias  of Delta E/E: " << Form("%+4.2f%%", 100*f->GetParameter(1)) << endl;
-    *fLog << " Sigma of Delta E/E: " << Form("%4.2f%%",  100*f->GetParameter(2)) << endl;
-    *fLog << " Res   of Delta E/E: " << Form("%4.2f%%",  100*TMath::Hypot(f->GetParameter(1), f->GetParameter(2))) << endl;
+    if (!f)
+        *fLog << " <fit did not succeed>" << endl;
+    else
+    {
+        *fLog << " Bias  of Delta E/E: " << Form("%+4.2f%%", 100*f->GetParameter(1)) << endl;
+        *fLog << " Sigma of Delta E/E: " << Form("%4.2f%%",  100*f->GetParameter(2)) << endl;
+        *fLog << " Res   of Delta E/E: " << Form("%4.2f%%",  100*TMath::Hypot(f->GetParameter(1), f->GetParameter(2))) << endl;
+    }
 
     delete h;
@@ -341 +346 @@
                 }
 
-                hx->Fit("gaus", "Q", "", -0.25, 1.0);
-                hx->GetFunction("gaus")->SetLineColor(kBlue);
-                hx->GetFunction("gaus")->SetLineWidth(2);
-                gPad=NULL;
-                gStyle->SetOptFit(101);
+                if (hx->GetEntries()>0)
+                {
+                    hx->Fit("gaus", "Q", "", -0.25, 1.0);
+                    if (hx->GetFunction("gaus"))
+                    {
+                        hx->GetFunction("gaus")->SetLineColor(kBlue);
+                        hx->GetFunction("gaus")->SetLineWidth(2);
+                        gPad=NULL;
+                        gStyle->SetOptFit(101);
+                    }
+                }
             }
         }

trunk/Mars/mhist/MHCamera.cc

@@ -2323 +2323 @@
     case 4:
         obj2->Fit("pol0", "Q");
-        obj2->GetFunction("pol0")->SetLineColor(kBlue);
+        if (obj2->GetFunction("pol0"))
+            obj2->GetFunction("pol0")->SetLineColor(kBlue);
         break;
 
@@ -2331 +2332 @@
     default:
         obj2->Fit("gaus", "Q");
-        obj2->GetFunction("gaus")->SetLineColor(kBlue);
+        if (obj2->GetFunction("gaus"))
+            obj2->GetFunction("gaus")->SetLineColor(kBlue);
         break;
     }
@@ -2402 +2404 @@
     obj2->SetBit(kCanDelete);
     obj2->Fit("pol0","Q","");
-    obj2->GetFunction("pol0")->SetLineWidth(1);
+    if (obj2->GetFunction("pol0"))
+        obj2->GetFunction("pol0")->SetLineWidth(1);
 /*
     if (GetGeomCam().InheritsFrom("MGeomCamMagic"))

trunk/Mars/mmain/MEventDisplay.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.70 2009-02-18 12:06:39 tbretz Exp $
-! --------------------------------------------------------------------------
 !
 ! *
@@ -361 +359 @@
         MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
 
-        MCalibrationPatternDecode *decode = new MCalibrationPatternDecode;
+        MCalibrationPatternDecode *patdecode = new MCalibrationPatternDecode;
 
         MPedestalSubtract *pedsub1  = new MPedestalSubtract("PedSubstract1");
@@ -385 +383 @@
         tlist->AddToList(pdnsb);
 
-        tlist->AddToList(decode);
+        tlist->AddToList(patdecode);
 
         tlist->AddToList(pedsub1);   // Produce arrays

trunk/Mars/mpointing/MPointingDevCalc.cc

@@ -301 +301 @@
 // model. However, M2 shows a slight offset.
 //
+// [2010-11-11 M. Garcz.]
+//
+// Last night, TPoints for M2 taken without target
+//
 // [2010-11-18 M. Garcz.]
 //

trunk/Mars/mreport/MReportFileRead.cc

@@ -114 +114 @@
 // --------------------------------------------------------------------------
 //
-// Add a new MReport* to the list (eg 'Drive' will add MReportDrive)
+// Add a new MReport* to the list. The name is the class name (eg MReportDrive)
 // For convinience the object is created as a MReportHelp object.
 //
@@ -122 +122 @@
 
     if (!help->GetReport())
+    {
+        delete help;
         return kFALSE;
+    }
 
     if (GetReport(help->GetName()))
@@ -203 +206 @@
             continue;
 
+        // Check for MReport{str(0,pos)}
         rep = GetReportHelp(str(0,pos));
+
+        // Remove this part from the string
         if (GetReport(rep))
             str.Remove(0, pos);