New version of GNU make for ROOT version 6 (using rootcling instead of rootcint) created.

Some text variables changed from char[] to TString to suppress warnings.

AculData/AculCalibCsI.h

@@ -44,8 +44,8 @@ private:
 	Int_t nCuts;				//number of cuts
 	TClonesArray cutsCol;
 
-	TH1I *hfull[NOCALFILES][16];
-	TH1I *hcut[NOCALFILES][16];
+	TH1I *hfull[NOCALFILES][16];	//!
+	TH1I *hcut[NOCALFILES][16];		//!
 
 	Int_t peakMin[NOCALFILES][16];
 	Int_t peakMax[NOCALFILES][16];

AculData/AculCalibration.h

@@ -74,7 +74,7 @@ private:
 
 	//these variables are the main for the class
 	TArrayD fA;		//calibration parameter, f(x) = fA*x + fB
-	TArrayD fB;		//calibration parameter, f(x) = fA*x + fB
+	TArrayD fB;		//calibration parameter, f(x) = fA*x + fB
 
 	TArrayD fPeak;	//v teto promenne je ulozena momentalni hodnota piku v kanalech, zejmena v jedne fci, mozno udelat ji jako lokalni, bude navratovou hodnotou fce PeaksFitting, predelat delku pole
 
@@ -83,7 +83,7 @@ private:
 	TString fParFileName;
 
 	//it is very doubtful that we need this class variable
-	TFile		*fCalInformation;
+	TFile		*fCalInformation;
 
 	
 
@@ -144,7 +144,7 @@ public:
 	Bool_t	CalculateCalibParameters(const char* inputfile, const char* block,
 			const char* treename, Int_t lowerchannel = 0,
 			Int_t upperchannel = 4095, Int_t nEBins = 1000, Int_t lowersubaddress = 0,
-			Int_t uppersubaddress = ADDRESSNUMBER-1); //calculate calibration parameters for given block in given file
+			Int_t uppersubaddress = ADDRESSNUMBER-1); //calculate calibration parameters for given block in given file
 
 	//function is not completely ready to use
 	//
@@ -176,13 +176,13 @@ public:
 
 	void CalibrateRawSpectra(const char* inputfile, const char* block, const char* treename, Int_t lowerchannel = 0, Int_t upperchannel = 4095, Int_t nEBins = 1000, Int_t lowersubaddress = 0, Int_t uppersubaddress = ADDRESSNUMBER-1);
 
-	void FindEnergyPeaks(TCanvas *c1, const char* ifile, const char* outfile); 
+	void FindEnergyPeaks(TCanvas *c1, const char* ifile, const char* outfile); 
 	// Outputs calibrated energies for each channel in txt file 
 	//
 	// 
-	//  
-
-	void FindAverageEnergies(const char* ifile, const char* outfile);
+	//  
+
+	void FindAverageEnergies(const char* ifile, const char* outfile);
 	// Outputs average values of calibrated energies for the whole detector in txt file
 	//
 	// 

AculData/AculData.mk

@@ -2,7 +2,7 @@
 # AculData input with some variables
 ################################################################################
 
-ACULDATALIBS := -lCore -lCint -lRIO -lTree -lNet -lThread -lHist -lMatrix -lMathCore -lGpad -lGraf -lSpectrum #-lTELoss
+ACULDATALIBS := -lCore -lRIO -lTree -lNet -lThread -lHist -lMatrix -lMathCore -lGpad -lGraf -lSpectrum #-lTELoss
 
 # Add inputs and outputs from these tool invocations to the build variables 
 ACULDATA_HEADERS += \
@@ -13,14 +13,14 @@ $(ACULDATA)/linkdef.h
 ACULDATACPP_SRCS += \
 $(ACULDATA)/AculCalibration.cpp \
 $(ACULDATA)/AculCalibCsI.cpp \
-$(ACULDATA)/AculDataCint.cpp
+$(ACULDATA)/AculDataDict.cpp
 
 ACULDATAOBJS += \
 $(ACULDATA)/AculCalibration.o \
 $(ACULDATA)/AculCalibCsI.o \
-$(ACULDATA)/AculDataCint.o
+$(ACULDATA)/AculDataDict.o
 
 ACULDATACPP_DEPS += \
 $(ACULDATA)/AculCalibration.d \
 $(ACULDATA)/AculCalibCsI.d \
-$(ACULDATA)/AculDataCint.d
+$(ACULDATA)/AculDataDict.d
\ No newline at end of file

TELoss/TELoss.mk

@@ -2,19 +2,24 @@
 # TELoss input with some variables
 ################################################################################
 
-TELOSSLIBS := -lCore -lCint -lMathCore -lMatrix -lHist -lgfortran
+# TELOSSLIBS := -lCore -lCint -lMathCore -lMatrix -lHist -lgfortran
+TELOSSLIBS := -lCore -lMathCore -lMatrix -lHist -lgfortran
 
 # Add inputs and outputs from these tool invocations to the build variables 
 
+TELOSS_HEADERS += \
+$(TELOSS)/TELoss.h \
+$(TELOSS)/linkdef.h
+
 TELOSSCPP_SRCS += \
 $(TELOSS)/TELoss.cpp \
-$(TELOSS)/TELossCint.cpp
+$(TELOSS)/TELossDict.cpp
 
 TELOSSOBJS += \
 $(TELOSS)/ELOSS.o \
 $(TELOSS)/TELoss.o \
-$(TELOSS)/TELossCint.o
+$(TELOSS)/TELossDict.o
 
 TELOSSCPP_DEPS += \
 $(TELOSS)/TELoss.d \
-$(TELOSS)/TELossCint.d
+$(TELOSS)/TELossDict.d

load.cxx

 {
-	gSystem->Load("~/workspace/Utilities/libAculData.so");
+	gSystem->Load("libTELoss.so");
+	gSystem->Load("libAculData.so");
 
 }

makefile

@@ -41,23 +41,30 @@ htmldoc: libAculData.so
 
 clean:
 	-$(RM) $(ACULDATAOBJS) $(ACULDATACPP_DEPS) 
-	-$(RM) $(ACULDATA)/AculDataCint.* libAculData.so
+	-$(RM) $(ACULDATA)/AculDataDict.* *.pcm $(ACULDATA)/*.pcm
+	 -$(RM) libAculData.so
 	-@echo ' '
 	-$(RM) $(TELOSSOBJS) $(TELOSSCPP_DEPS)
-	-$(RM) $(TELOSS)/TELossCint.* libTELoss.so
+	-$(RM) $(TELOSS)/TELossDict.* *.pcm $(TELOSS)/*.pcm
+	-$(RM) libTELoss.so
 	-@echo ' '
 	-$(RM) htmldoc
 	-@echo ' '
 
-# Those *Cint* files below need special treating:
-$(ACULDATA)/AculDataCint.cpp:
-	-@echo 'Pre-building AculDataCint.cpp and AculDataCint.h files'
-	-rootcint -f $(ACULDATA)/AculDataCint.cpp -c -p $(ACULDATA_HEADERS)
+# Those *Dictionary* files below need special treating:
+$(ACULDATA)/AculDataDict.cpp:
+	-@echo 'Pre-building AculDataDict.cpp and AculDataCint.h files'
+	-rootcling -f $(ACULDATA)/AculDataDict.cpp -p $(ACULDATA_HEADERS)
+	-@echo 'Creating: link to AculDataDict_rdict.pcm'
+	-ln -s $(ACULDATA)/AculDataDict_rdict.pcm .
 	-@echo ' '
 	
-$(TELOSS)/TELossCint.cpp:
-	-@echo 'Pre-building TELossCint.cpp and TELossCint.h files'
-	-rootcint -f $(TELOSS)/TELossCint.cpp -c -p $(TELOSS)/TELoss.h $(TELOSS)/linkdef.h
+$(TELOSS)/TELossDict.cpp:
+	-@echo 'Pre-building TELossDict.cpp and TELossDict_rdict.pcm files'
+	@echo 
+	-rootcling -f $@ -c $(CXXFLAGS) -p $(TELOSS_HEADERS)
+	-@echo 'Creating: link to TELossDict_rdict.pcm'
+	-ln -s $(TELOSS)/TELossDict_rdict.pcm .
 	-@echo ' '	
 
 #*.so files
@@ -83,7 +90,6 @@ libTELoss.so: $(TELOSSOBJS)
 	@echo 'Building file: $@'
 	@echo 'Invoking: $(CC) Compiler'
 	$(CC) -I$(ROOTINCS) -O0 -g3 -Wall -c -fmessage-length=0 -fPIC $(ROOTCFLAGS) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-#	$(CC) -I$(ROOTINCS) -O2 -Wall -mmmx -msse -msse2 -msse3 -mfpmath=sse,387 -march=nocona -mtune=nocona -c -fmessage-length=0 -fPIC -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
 	@echo 'Finished building: $@'
 	@echo ' '