Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3991)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3992)
@@ -18,4 +18,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/05/06: Markus Gaug
+  
+   * macros/pedestalstudies.C
+     - updated to the latest version of MPedCalcPedRun
+
 
  2004/05/05: Markus Gaug
Index: trunk/MagicSoft/Mars/macros/pedestalstudies.C
===================================================================
--- trunk/MagicSoft/Mars/macros/pedestalstudies.C	(revision 3991)
+++ trunk/MagicSoft/Mars/macros/pedestalstudies.C	(revision 3992)
@@ -16,7 +16,7 @@
 !
 !
-!   Author(s): Markus Gaug, 11/2003 <mailto:markus@ifae.es>
+!   Author(s): Markus Gaug, 04/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -26,12 +26,6 @@
 // pedestalstudies.C
 //
-// macro to observe the pedestals and pedestalRMS with the number of FADC 
+// macro to study the pedestal and pedestalRMS with the number of FADC 
 // slices summed up. 
-//
-// In order to use this macro, you have to uncomment the following 
-// line in MPedCalcPedRun (line 214):
-//
-// fNumHiGainSamples = runheader->GetNumSamplesHiGain() & ~1;
-//
 //
 /////////////////////////////////////////////////////////////////////////////////
@@ -104,11 +98,11 @@
       // Set the extraction range higher:
       //		
-      //sigcalc.SetRange(1,14,1,14);
+      MExtractFixedWindow sigcalc;
+      sigcalc.SetRange(0,samples-1,0,1);
+  
       MPedCalcPedRun pedcalc;
-      pedcalc.SetNumHiGainSamples((Byte_t)samples);
-      
-      MExtractSignal  sigcalc;
-      sigcalc.SetRange(0,samples-1,0,samples-1);
-  
+      pedcalc.SetRange(0,samples-1,0,0);
+      pedcalc.SetWindowSize((Int_t)sigcalc.GetNumHiGainSamples());
+
       //
       // Additionally to calculating the pedestals, 
@@ -217,4 +211,5 @@
     }
 
+  /*
   TF1 *logg = new TF1("logg","[1]+TMath::Log(x-[0])",1.,30.,2);
   logg->SetParameters(1.,3.5);
@@ -222,4 +217,5 @@
   logg->SetParLimits(1,-1.,7.);
   logg->SetLineColor(kRed);
+  */
 
   TCanvas *canvas = new TCanvas("PedstudInner","Pedestal Studies Inner Pixels",600,900);
@@ -234,7 +230,7 @@
   gmeaninn->GetXaxis()->SetTitle("Nr. added FADC slices");
   gmeaninn->GetYaxis()->SetTitle("Calculated Mean per slice");
-  gmeaninn->Fit("pol0");
-  gmeaninn->GetFunction("pol0")->SetLineColor(kGreen);
-  //  gmeaninn->Fit(logg);
+  //  gmeaninn->Fit("pol0");
+  //  gmeaninn->GetFunction("pol0")->SetLineColor(kGreen);
+  //  //  gmeaninn->Fit(logg);
 
   canvas->cd(2);
@@ -247,6 +243,6 @@
   gmuinn->GetXaxis()->SetTitle("Nr. added FADC slices");
   gmuinn->GetYaxis()->SetTitle("Fitted Mean per Slice");
-  gmuinn->Fit("pol0");
-  gmuinn->GetFunction("pol0")->SetLineColor(kGreen);
+  //  gmuinn->Fit("pol0");
+  //  gmuinn->GetFunction("pol0")->SetLineColor(kGreen);
   //gmuinn->Fit(logg);
 
@@ -261,7 +257,7 @@
   grmsinn->GetXaxis()->SetTitle("Nr. added FADC slices");
   grmsinn->GetYaxis()->SetTitle("Calculated Rms per Slice");
-  //grmsinn->Fit("pol2");
-  //grmsinn->GetFunction("pol2")->SetLineColor(kRed);
-  grmsinn->Fit(logg);
+  //  //grmsinn->Fit("pol2");
+  //  //grmsinn->GetFunction("pol2")->SetLineColor(kRed);
+  //  grmsinn->Fit(logg);
 
   canvas->cd(4);
@@ -274,7 +270,7 @@
   gsigmainn->GetXaxis()->SetTitle("Nr. added FADC slices");
   gsigmainn->GetYaxis()->SetTitle("Fitted Sigma per Slice");
-  //  gsigmainn->Fit("pol2");
-  //  gsigmainn->GetFunction("pol2")->SetLineColor(kRed);
-  gsigmainn->Fit(logg);
+  //  //  gsigmainn->Fit("pol2");
+  //  //  gsigmainn->GetFunction("pol2")->SetLineColor(kRed);
+  //  gsigmainn->Fit(logg);
 
   canvas->cd(5);
@@ -287,7 +283,7 @@
   gmeandiffinn->GetXaxis()->SetTitle("Nr. added FADC slices");
   gmeandiffinn->GetYaxis()->SetTitle("Rel. Difference Mean per Slice");
-  //gmeandiffinn->Fit("pol2");
-  //gmeandiffinn->GetFunction("pol2")->SetLineColor(kBlue);
-  gmeandiffinn->Fit(logg);
+  //  //gmeandiffinn->Fit("pol2");
+  //  //gmeandiffinn->GetFunction("pol2")->SetLineColor(kBlue);
+  //  gmeandiffinn->Fit(logg);
 
 
@@ -301,14 +297,13 @@
   grmsdiffinn->GetXaxis()->SetTitle("Nr. added FADC slices");
   grmsdiffinn->GetYaxis()->SetTitle("Rel. Difference Sigma per Slice-RMS");
-  //grmsdiffinn->Fit("pol2");
-  //grmsdiffinn->GetFunction("pol2")->SetLineColor(kBlue);
-  grmsdiffinn->Fit(logg);
-
+  //  //grmsdiffinn->Fit("pol2");
+  //  //grmsdiffinn->GetFunction("pol2")->SetLineColor(kBlue);
+  //  grmsdiffinn->Fit(logg);
+
+  canvas->SaveAs("PedestalStudyInner.root");
+  canvas->SaveAs("PedestalStudyInner.ps");
 
   TCanvas *canvas2 = new TCanvas("PedstudOut","Pedestal Studies Outer Pixels",600,900);
   canvas2->Divide(2,3);
-  canvas2->cd(1);
-
-
   canvas2->cd(1);
 
@@ -320,6 +315,6 @@
   gmeanout->GetXaxis()->SetTitle("Nr. added FADC slices");
   gmeanout->GetYaxis()->SetTitle("Calculated Mean per Slice");
-  gmeanout->Fit("pol0");
-  gmeanout->GetFunction("pol0")->SetLineColor(kGreen);
+  //  gmeanout->Fit("pol0");
+  //  gmeanout->GetFunction("pol0")->SetLineColor(kGreen);
   //gmeanout->Fit(logg);
 
@@ -333,6 +328,6 @@
   gmuout->GetXaxis()->SetTitle("Nr. added FADC slices");
   gmuout->GetYaxis()->SetTitle("Fitted Mean per Slice");
-  gmuout->Fit("pol0");
-  gmuout->GetFunction("pol0")->SetLineColor(kGreen);
+  //  gmuout->Fit("pol0");
+  //  gmuout->GetFunction("pol0")->SetLineColor(kGreen);
   //gmuout->Fit(logg);
 
@@ -346,7 +341,7 @@
   grmsout->GetXaxis()->SetTitle("Nr. added FADC slices");
   grmsout->GetYaxis()->SetTitle("Calculated Rms per Slice");
-  //grmsout->Fit("pol2");
-  //grmsout->GetFunction("pol2")->SetLineColor(kRed);
-  grmsout->Fit(logg);
+  //  //grmsout->Fit("pol2");
+  //  //grmsout->GetFunction("pol2")->SetLineColor(kRed);
+  //  grmsout->Fit(logg);
 
   canvas2->cd(4);
@@ -359,7 +354,7 @@
   gsigmaout->GetXaxis()->SetTitle("Nr. added FADC slices");
   gsigmaout->GetYaxis()->SetTitle("Fitted Sigma per Slice");
-  //gsigmaout->Fit("pol2");
-  //gsigmaout->GetFunction("pol2")->SetLineColor(kRed);
-  gsigmaout->Fit(logg);
+  //  //gsigmaout->Fit("pol2");
+  //  //gsigmaout->GetFunction("pol2")->SetLineColor(kRed);
+  //  gsigmaout->Fit(logg);
 
 
@@ -373,7 +368,7 @@
   gmeandiffout->GetXaxis()->SetTitle("Nr. added FADC slices");
   gmeandiffout->GetYaxis()->SetTitle("Rel. Difference Mean per Slice");
-  //gmeandiffout->Fit("pol2");
-  //gmeandiffout->GetFunction("pol2")->SetLineColor(kBlue);
-  gmeandiffout->Fit(logg);
+  //  //gmeandiffout->Fit("pol2");
+  //w  //gmeandiffout->GetFunction("pol2")->SetLineColor(kBlue);
+  //  gmeandiffout->Fit(logg);
 
   canvas2->cd(6);
@@ -386,7 +381,11 @@
   grmsdiffout->GetXaxis()->SetTitle("Nr. added FADC slices");
   grmsdiffout->GetYaxis()->SetTitle("Rel. Difference Sigma per Slice-RMS");
-  //grmsdiffout->Fit("pol2");
-  //grmsdiffout->GetFunction("pol2")->SetLineColor(kBlue);
-  grmsdiffout->Fit(logg);
+  //  //grmsdiffout->Fit("pol2");
+  //  //grmsdiffout->GetFunction("pol2")->SetLineColor(kBlue);
+  //  grmsdiffout->Fit(logg);
+
+
+  canvas2->SaveAs("PedestalStudyOuter.root");
+  canvas2->SaveAs("PedestalStudyOuter.ps");