Macros need to compile in ROOT6

cms-sw · Apr 13, 2015 · f93745b · f93745b
1 parent e2555d8
commit f93745b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/RecoParticleFlow/PFClusterTools/test/src/init.C b/RecoParticleFlow/PFClusterTools/test/src/init.C
@@ -1,8 +1,8 @@
+{
 /*
  * A Root macro to initialise testing of the functionality of the PFClusterTools package
  * 
  */
-{
 	gSystem->Load("libRecoParticleFlowPFClusterTools.so");
 	std::cout << "Loaded libraries." << std::endl;
 	using namespace std;

diff --git a/RecoParticleFlow/PFClusterTools/test/src/testConversion.C b/RecoParticleFlow/PFClusterTools/test/src/testConversion.C
@@ -7,22 +7,22 @@
 	using namespace pftools;
 
 	TFile* testConversion = new TFile("TestConversion.root", "recreate");
-	testConversion.mkdir("extraction");
-	testConversion.cd("extraction");
+	testConversion->mkdir("extraction");
+	testConversion->cd("extraction");
 	TTree* tree = new TTree("Extraction", "");
 	Calibratable* c = new Calibratable();
 	tree->Branch("Calibratable", "pftools::Calibratable", &c, 32000, 2);
 
 	std::cout << "Initialised objects etc.\n";
-	TRandom2 rand;
+	TRandom2 rand2;
 	for (unsigned u(0); u < 1000; ++u) {
 		double eta, phi, energy, ecalFrac, gaussSamp;
 
-		eta = rand.Uniform(0, 1.5);
-		phi = rand.Uniform(0, 3.14);
-		energy = rand.Uniform(2, 20);
-		ecalFrac = rand.Uniform(0, 1.0);
-		gaussSamp = rand.Gaus(1, 0.3);
+		eta = rand2.Uniform(0, 1.5);
+		phi = rand2.Uniform(0, 3.14);
+		energy = rand2.Uniform(2, 20);
+		ecalFrac = rand2.Uniform(0, 1.0);
+		gaussSamp = rand2.Gaus(1, 0.3);
 		//gaussSamp = 1.0;
 
 		c->reset();

diff --git a/RecoParticleFlow/PFClusterTools/test/src/testWrappers.C b/RecoParticleFlow/PFClusterTools/test/src/testWrappers.C
@@ -1,8 +1,8 @@
+{
 /*
  * A Root macro to initialise testing of the functionality of the PFClusterTools package
  * 
  */
-{
 	gSystem->Load("libRecoParticleFlowPFClusterTools.so");
 
 	TFile f("TestWrappers.root", "recreate");

diff --git a/RecoTracker/TrackProducer/test/analyze_tracks.C b/RecoTracker/TrackProducer/test/analyze_tracks.C
@@ -7,11 +7,11 @@ TTree * tree = (TTree *) gROOT->FindObject("Events");
 TFile outFile("graphsParTest2.root","recreate");
 float intervals[] = {0,0.5,1.0,1.5,2.0,2.5};
 int bins = 5;
-char * ptinterval  = "4.99<P_{T}<5.01";
-char * etainterval = "|#eta|<2.5";
-char * rs  = "recoTracks_rsWithMaterialTracks__RsWithMaterial";
-char * ctf = "recoTracks_ctfWithMaterialTracks__FinalFits";
-char * sim = "SimTracks_SimG4Object__Test";
+const char * ptinterval  = "4.99<P_{T}<5.01";
+const char * etainterval = "|#eta|<2.5";
+const char * rs  = "recoTracks_rsWithMaterialTracks__RsWithMaterial";
+const char * ctf = "recoTracks_ctfWithMaterialTracks__FinalFits";
+const char * sim = "SimTracks_SimG4Object__Test";
 ////////////////////////////////////////
 vector<float> tot;
 vector<float> ptrmsRS;