Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7373)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7374)
@@ -43,4 +43,7 @@
    * mpointing/MPointingDevCalc.cc:
      - reset counter in PreProcess
+
+   * resources/calibration.rc:
+     - new file
 
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 7373)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 7374)
@@ -13,4 +13,7 @@
 
    - merpp: made aware of new format 20050829-0
+
+   - callisto: New scale factors from muon analysis, stored in new 
+     resource file resources/calibration.rc
 
    - callisto: MBadPixelsCalc now raises an error instead of simply stopping
Index: /trunk/MagicSoft/Mars/callisto.rc
===================================================================
--- /trunk/MagicSoft/Mars/callisto.rc	(revision 7373)
+++ /trunk/MagicSoft/Mars/callisto.rc	(revision 7374)
@@ -399,5 +399,6 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.9633911368
+#MJCalibrateSignal.MCalibrateData.ScaleFactor: 1
+MJCalibrateSignal.MCalibrateData.FileNameScale: resources/calibration.rc
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01
Index: /trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc
===================================================================
--- /trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc	(revision 7373)
+++ /trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc	(revision 7374)
@@ -410,5 +410,5 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.919117647
+MJCalibrateSignal.MCalibrateData.ScaleFactor: 0.85182358
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01
Index: /trunk/MagicSoft/Mars/callisto_MarApr05.rc
===================================================================
--- /trunk/MagicSoft/Mars/callisto_MarApr05.rc	(revision 7373)
+++ /trunk/MagicSoft/Mars/callisto_MarApr05.rc	(revision 7374)
@@ -399,5 +399,6 @@
 #MJCalibrateSignal.MCalibColorSet.ExpicitColor: green,blue,uv,ct1
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
-MJCalibrateSignal.MCalibrateData.ScaleFactor: 1.01419878296146
+#MJCalibrateSignal.MCalibrateData.ScaleFactor: 1
+MJCalibrateSignal.MCalibrateData.FileNameScale: resources/calibration.rc
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
 #MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01
Index: /trunk/MagicSoft/Mars/datacenter/macros/fillstar.C
===================================================================
--- /trunk/MagicSoft/Mars/datacenter/macros/fillstar.C	(revision 7373)
+++ /trunk/MagicSoft/Mars/datacenter/macros/fillstar.C	(revision 7374)
@@ -114,5 +114,5 @@
 
     Float_t mw    = hmuon->GetMeanWidth();
-    Float_t psf   = -194.031674+404.077598*mw-192.532597*mw*mw;
+    Float_t psf   = 51.505292 - 31.147126*mw;
     psf = TMath::Nint(psf*10)/10.;
     TString PSF = Form("%5.1f", psf);
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 7373)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 7374)
@@ -429,21 +429,47 @@
     // output information or warnings:
     //
-    switch(fSignalType)
+    switch (fSignalType)
     {
     case kPhe:
-      *fLog << inf << "Calibrating in units of equivalent (outer/inner=4) photo-electrons." << endl;
-      break;
+        *fLog << inf << "Calibrating in units of equivalent (outer/inner=4) photo-electrons." << endl;
+        break;
     case kPhot:
-      *fLog << inf << "Calibrating in units of photons." << endl;
-      break;
+        *fLog << inf << "Calibrating in units of photons." << endl;
+        break;
     }
 
     if (header->IsMonteCarloRun())
     {
-        *fLog << "Additional scale factor: 1 (MonteCarloRun)" << endl;
+        *fLog << inf << "Additional scale factor forced to: 1 (MonteCarloRun)" << endl;
         fScaleFactor = 1;
     }
     else
-        *fLog << "Additional scale factor: " << fScaleFactor << endl;
+    {
+        if (!fFileNameScale.IsNull())
+        {
+            if (gSystem->AccessPathName(fFileNameScale, kFileExists))
+            {
+                *fLog << err << "ERROR - Configuration file '" << fFileNameScale << "' doesn't exist... abort." << endl;
+                return kFALSE;
+            }
+
+            const Int_t   p   = header->GetRunStart().GetMagicPeriod();
+            const TString per = Form("%2d", p);
+
+            TEnv rc(fFileNameScale);
+            const Double_t scale = rc.GetValue(per, -1.);
+
+            if (scale<=0)
+            {
+                *fLog << err << "ERROR - No valid entry for scale factor found for period " << p << " in " << fFileNameScale << "... abort." << endl;
+                return kFALSE;
+            }
+
+            *fLog << inf << "New additional scale factor for period " << p << ": " << scale << endl;
+            fScaleFactor = scale;
+        }
+        else
+            *fLog << inf << "Additional scale factor set to: " << fScaleFactor << endl;
+    }
 
     const Int_t npixels = fGeomCam->GetNumPixels();
@@ -931,4 +957,10 @@
     }
 
+    if (IsEnvDefined(env, prefix, "FileNameScale", print))
+    {
+        fFileNameScale = GetEnvValue(env, prefix, "FileNameScale", fFileNameScale);
+        rc = kTRUE;
+    }
+
     return rc;
 }
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 7373)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 7374)
@@ -79,5 +79,7 @@
   Float_t  fRenormFactor;                // Possible renormalization factor for signals (-> phes)
   Float_t  fScaleFactor;                 // Possible scale factor for signals
-  
+
+  TString  fFileNameScale;               // File name for list of scale factors
+
   TList   fNamesPedestal;                // Names of input and output pedestal conatainer
   TList   fPedestalCams;                 //! List of pointers to input MPedestalCam
@@ -106,5 +108,5 @@
   void   EnablePedestalType(PedestalType_t i)     { fPedestalFlag |=  i;      }
 
-  Int_t  GetSize() const { return fCalibConsts.GetSize(); }
+  //Int_t  GetSize() const { return fCalibConsts.GetSize(); }
 
   void   Print(Option_t *o="") const;
Index: /trunk/MagicSoft/Mars/mjobs/MJStar.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 7373)
+++ /trunk/MagicSoft/Mars/mjobs/MJStar.cc	(revision 7374)
@@ -399,9 +399,10 @@
     histdc.SetTitle("Mean of all DC Currents;;<I> [nA]");
     histdc.SetMinimum(0);
-    histdc.SetMaximum(3);
+    histdc.SetMaximum(10);
     histrms.SetNameTime("MTimeCurrents");
     histrms.SetTitle("Mean pedestal rms of all pixels;;<\\sigma_{p}> [phe]");
+    histrms.SetType(5);
     histrms.SetMinimum(0);
-    histrms.SetMaximum(0.2);
+    histrms.SetMaximum(10);
 
     /*
@@ -413,6 +414,8 @@
     MFillH filldc(&histdc,   "MCameraDC",                 "FillDC");
     MFillH fillrms(&histrms, "MPedPhotFromExtractorRndm", "FillPedRms");
+    //MFillH filltst("MHTest", "MTime", "FillTest");
     filldc.SetNameTab("Currents");
     fillrms.SetNameTab("MeanRms");
+    //filltst.SetNameTab("Test");
 
     MFillH fillw("MHWeather", "MTimeCC", "FillWeather");
@@ -424,4 +427,5 @@
     tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
     tlist.AddToList(&pcalc,  ismc ? "Events" : "Drive");
+    //tlist.AddToList(&filltst, "Events");
     tlist.AddToList(&tlist2, "Events");
     if (!ismc)
@@ -432,5 +436,5 @@
         tlist.AddToList(&filldc,  "Currents");
         tlist.AddToList(&fillrms, "Currents");
-    }
+   }
     tlist.AddToList(&write);
 
Index: /trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc
===================================================================
--- /trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc	(revision 7373)
+++ /trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc	(revision 7374)
@@ -214,5 +214,5 @@
     txt.SetTextColor(kBlue);
 
-    TF1 ref("RefShape100%", "-254+1640*x-565*x*x", fgIntegralLoLim, fgIntegralUpLim);
+    TF1 ref("RefShape100%", "-131+1333*x-385*x*x", fgIntegralLoLim, fgIntegralUpLim);
     // old: 573*x + 430
     ref.SetLineColor(kBlue);
Index: /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc	(revision 7373)
+++ /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc	(revision 7374)
@@ -128,4 +128,6 @@
     fRunType  = MRawRunHeader::kRTNone;
 
+    fSkip.Reset();
+
     return fDeviation ? kTRUE : kFALSE;
 }
Index: /trunk/MagicSoft/Mars/resources/calibration.rc
===================================================================
--- /trunk/MagicSoft/Mars/resources/calibration.rc	(revision 7374)
+++ /trunk/MagicSoft/Mars/resources/calibration.rc	(revision 7374)
@@ -0,0 +1,26 @@
+20: 0.922788
+
+21: 0.963391
+22: 0.963391
+
+# Spline Data
+#23: 0.904593
+#24: 0.840913
+#25: 0.859792
+
+27: 0.978956
+28: 0.989462
+
+29: 0.907148
+30: 0.918390
+
+31: 0.915771
+32: 0.915771
+33: 0.915771
+34: 0.915771
+35: 0.915771
+36: 0.915771
+37: 0.915771
+38: 0.915771
+39: 0.915771
+40: 0.915771