Merge branch 'master' into root6

src/classes/PMsrHandler.cpp

@@ -6094,22 +6094,6 @@ Bool_t PMsrHandler::EstimateN0()
   return fStartupOptions->estimateN0;
 }
 
-//--------------------------------------------------------------------------
-// GetAlphaEstimateN0 (public)
-//--------------------------------------------------------------------------
-/**
- * <p>returns alpha to estimate N0
- */
-/*as
-Double_t PMsrHandler::GetAlphaEstimateN0()
-{
-  if (fStartupOptions == 0)
-    return 0.0;
-
-  return fStartupOptions->alphaEstimateN0;
-}
-*/
-
 //--------------------------------------------------------------------------
 // NeededPrecision (private)
 //--------------------------------------------------------------------------

src/include/PMsrHandler.h

@@ -107,7 +107,6 @@ class PMsrHandler
 
     virtual void GetGroupingString(Int_t runNo, TString detector, TString &groupingStr);
     virtual Bool_t EstimateN0();
-//as    virtual Double_t GetAlphaEstimateN0();
 
   private:
     Bool_t                 fFourierOnly; ///< flag indicating if Fourier transform only is wished. If yes, some part of the msr-file blocks are not needed.

src/include/PMusr.h

@@ -815,10 +815,10 @@ typedef struct {
 
 //-------------------------------------------------------------
 /**
- * <p>Holds the informations
+ * <p>Holds information given at startup
  */
 typedef struct {
-  Bool_t writeExpectedChisq; ///< if set to true, expected chisq per block will be written
+  Bool_t writeExpectedChisq; ///< if set to true, expected chisq and chisq per block will be written
   Bool_t estimateN0;         ///< if set to true, for single histogram fits N0 will be estimated
 } PStartupOptions;
 

src/musredit/musredit_startup.xml.in

@@ -15,6 +15,7 @@
     <chisq_per_run_block>n</chisq_per_run_block>
     <estimate_n0>y</estimate_n0>
     <musrview_show_fourier>n</musrview_show_fourier>
+    <musrview_show_avg>n</musrview_show_avg>
     <enable_musrt0>y</enable_musrt0>
   </general>
   <recent_files>

src/musredit_qt5/musredit_startup.xml.in

@@ -15,6 +15,7 @@
     <chisq_per_run_block>n</chisq_per_run_block>
     <estimate_n0>y</estimate_n0>
     <musrview_show_fourier>n</musrview_show_fourier>
+    <musrview_show_avg>n</musrview_show_avg>
     <enable_musrt0>y</enable_musrt0>
   </general>
   <recent_files>