Changeset 9414 for trunk/MagicSoft

Timestamp:

03/30/09 09:07:40 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• manalysis/MMcCalibrationUpdate.cc (modified) (2 diffs)
• mgeom/MGeomCamSquare.cc (modified) (1 diff)
• mhbase/MH.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
      - added an additional sanity check
 
+   * mhbase/MH.cc:
+     - added "temp" to palette
 
 

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
 == <cvs> ==
+
+ ;general:
+
+   * Added a new palette "temp" to MH::SetPalette which should resample
+     a temperature
 
  ;showplot:

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -135 +135 @@
     if (!run)
     {
-        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
+        *fLog << warn << dbginf << "WARNING - cannot check file type, MRawRunHeader not found." << endl;
         return kTRUE;
     }
@@ -143 +143 @@
     //
     fGeom = 0;
-    if (run->IsMonteCarloRun())
+    if (!run->IsMonteCarloRun())
     {
         *fLog << inf << "This is no MC file... skipping." << endl;

trunk/MagicSoft/Mars/mgeom/MGeomCamSquare.cc

@@ -89 +89 @@
     for (Short_t x=0; x<nx; x++)
         for (Short_t y=0; y<ny; y++)
-            SetAt(x*ny+y, MGeomRectangle((0.5*nx-x)*diameter, (0.5*ny-y)*diameter, diameter));
+            SetAt(x*ny+y, MGeomRectangle((0.5*nx-x-0.5)*diameter, (0.5*ny-y-0.5)*diameter, diameter));
 }

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.48 2009-03-23 13:13:42 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.49 2009-03-30 08:06:41 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1700 +1700 @@
         double b[5] = {0.2, 0.7, 0.0, 0.3, 0.9 };
         CreateGradientColorTable(5, s, r, g, b, ncol);
+        found=kTRUE;
+    }
+    if (paletteName.Contains("temp"))
+    {
+        Double_t s[7] = { 0.00, 0.30, 0.45, 0.75, 0.88, 0.95, 1.00 };
+        Double_t r[7] = { 0.00, 0.00, 0.30, 0.60, 1.00, 1.00, 1.00 };
+        Double_t g[7] = { 0.00, 0.00, 0.00, 0.00, 0.20, 1.00, 1.00 };
+        Double_t b[7] = { 0.10, 0.60, 0.30, 0.00, 0.20, 0.00, 1.00 };
+        CreateGradientColorTable(7, s, r, g, b, ncol);
         found=kTRUE;
     }