From c61641efe30b9053b15edd92ad9cc4413e4a0c13 Mon Sep 17 00:00:00 2001
From: prokscha <thomas.prokscha@psi.ch>
Date: Fri, 20 Jan 2017 11:56:12 +0100
Subject: [PATCH] Adopted PSimulateMuTransition to root6

---
 .../Makefile.PSimulateMuTransition            |  2 ++
 .../PSimulateMuTransitionLinkDef.h            |  3 +-
 src/tests/MuTransition/runMuSimulation.C      | 33 ++++++++++++-------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/tests/MuTransition/Makefile.PSimulateMuTransition b/src/tests/MuTransition/Makefile.PSimulateMuTransition
index f6e8fc0e..ef5a1fe8 100644
--- a/src/tests/MuTransition/Makefile.PSimulateMuTransition
+++ b/src/tests/MuTransition/Makefile.PSimulateMuTransition
@@ -97,4 +97,6 @@ install: all
 ifeq ($(OS),LINUX)
 	cp -pv $(SHLIB) $(ROOTSYS)/lib
 	cp -pv PSimulateMuTransition.h $(ROOTSYS)/include
+# for root6
+	cp -pv PSimulateMuTransitionDict_rdict.pcm $(ROOTSYS)/lib
 endif
diff --git a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h
index 1538a7ee..0224031c 100644
--- a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h
+++ b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h
@@ -28,7 +28,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifdef __CINT__
+// changed for root6
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
diff --git a/src/tests/MuTransition/runMuSimulation.C b/src/tests/MuTransition/runMuSimulation.C
index 80e0e589..bb2b3606 100644
--- a/src/tests/MuTransition/runMuSimulation.C
+++ b/src/tests/MuTransition/runMuSimulation.C
@@ -27,20 +27,28 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+// 
+// either do
+// root> .L runMuSimulation.C
+// root> runMuSimulation()
+// 
+// or
+// root> .x runMuSimulation.C
+//
+
+#include "TMusrRunHeader.h"
+#include "PSimulateMuTransition.h"
 
-#include "/apps/cern/root-git/include/TMusrRunHeader.h"
 #define NDECAYHISTS 2
 
+
 void runMuSimulation()
 {
-  // load library
-  gSystem->Load("$ROOTSYS/lib/libPSimulateMuTransition");
+// load libraries during root startup, defined in rootlogon.C 
   
-  // load TMusrRunHeader class if not already done during root startup
-  if (!TClass::GetDict("TMusrRunHeader")) {
-    gROOT->LoadMacro("$(ROOTSYS)/lib/libTMusrRunHeader.so");
-  }
- 
+//   gSystem->Load("$ROOTSYS/lib/libPSimulateMuTransition");
+//   gSystem->Load("$ROOTSYS/lib/libTMusrRunHeader.so");
+
   char    titleStr[256];
   TFolder *histosFolder;
   TFolder *decayAnaModule, *scAnaModule;
@@ -57,7 +65,7 @@ void runMuSimulation()
   Double_t spinFlipRate = 0.01; //if spinFlipRate > 0.001 only spin-flip processes will be simulated
   Double_t capRate      = 0.0001;//*sqrt(T/200.); //assume that capture rate varies as sqrt(T), capRate = sigma*v*p , v ~ sqrt(T)  
   Double_t ionRate;  //assume Arrhenius behaviour ionRate = preFac*exp(-EA/kT)
-  ionRate           = 0.0001; //2.9e7 * exp(-EA/(0.08625*T)); // Ge: 2.9*10^7MHz "attempt" frequency; 1K = 0.08625 meV 
+  ionRate           = 0.1; //2.9e7 * exp(-EA/(0.08625*T)); // Ge: 2.9*10^7MHz "attempt" frequency; 1K = 0.08625 meV 
   Double_t B        = 106.5; //field in G
   Double_t Bvar     = 0.;   //field variance
   Double_t Freq12   = 40.433;  //Mu freq of the 12 transition
@@ -222,7 +230,10 @@ void runMuSimulation()
   gRunHeader->Write();
   fout->Close();
   cout << "Histograms written to " << histogramFileName.Data() << endl;
-  delete fout;
 
-  delete [] histo;
+//   delete fout;
+//   delete header;
+//   delete histo[0];
+//   delete histo[1];
+//   delete gRunHeader;
 }