Commit d0bbe594 authored by Vratislav Chudoba's avatar Vratislav Chudoba

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.
parent 3a55bcf8
......@@ -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];
......
......@@ -393,7 +393,7 @@ Bool_t AculCalibration::SetCalibrationParameters(const char* calparfile)
char cA[40], cB[40], cC[40], cD[40];
//open file with calibration parameters
ifstream calFileR;
std::ifstream calFileR;
calFileR.open(calparfile);
......@@ -439,10 +439,10 @@ void AculCalibration::ShowRawSpectra(const char* filename, const Int_t block, TC
// xaxismax: maximal channel, which will be displayed
// subaddress:
Char_t address[40];
Char_t histName[40];
Char_t fillCommand[40];
Char_t fillCondition[40];
TString address;
TString histName;
TString command;
TString condition;
if (!rawCanvas) {
......@@ -453,11 +453,8 @@ void AculCalibration::ShowRawSpectra(const char* filename, const Int_t block, TC
rawCanvas->Clear();
// cout << "hovno" << endl;
rawCanvas->SetFillColor(10);
// cout << "hovno" << endl;
TFile *fr = new TFile(filename);
if (fr->IsOpen() == 0) {
cout << endl << "File " << filename << " was not opened and won't be processed" << endl << endl;
......@@ -465,23 +462,21 @@ void AculCalibration::ShowRawSpectra(const char* filename, const Int_t block, TC
}
TH1I *hRead = 0;
TTree *tr = (TTree*)fr->Get("RAW");
// cout << "hovno" << endl;
if (subaddress > 15) {
rawCanvas->Divide(4, 4);
rawCanvas->SetFillColor(10);
// cout << "hovno" << endl;
for (Int_t i = 0; i < 16; i++) {
cout << i << endl;
rawCanvas->cd(i+1);
hRead = new TH1I("name", "title", 4096, 0, 4095);
sprintf(address, "C3[%d][%d]", block, i);
sprintf(histName, "H3[%d][%d]", block, i);
address.Form("C3[%d][%d]", block, i);
histName.Form("H3[%d][%d]", block, i);
hRead->SetName(histName);
sprintf(fillCommand, "%s >> %s", address, hRead->GetName());
sprintf(fillCondition, "%s > 0", address);
tr->Draw(fillCommand, fillCondition, "");
command.Form("%s >> %s", address.Data(), hRead->GetName());
// sprintf(fillCondition, "%s > 0", address);
condition.Form("%s > 0", address.Data());
tr->Draw(command, condition, "");
if (hRead) {
hRead->SetDirectory(0);
// cout << hRead->GetEntries() << endl;
......@@ -496,13 +491,14 @@ void AculCalibration::ShowRawSpectra(const char* filename, const Int_t block, TC
else {
fr->cd();
hRead = new TH1I("name", "title", 4096, 0, 4095);
sprintf(address, "C3[%d][%d]", block, subaddress);
sprintf(histName, "H3[%d][%d]", block, subaddress);
address.Form("C3[%d][%d]", block, subaddress);
histName.Form("H3[%d][%d]", block, subaddress);
hRead->SetName(histName);
sprintf(fillCommand, "%s >> %s", address, hRead->GetName());
sprintf(fillCondition, "%s > 0", address);
command.Form("%s >> %s", address.Data(), hRead->GetName());
// sprintf(fillCondition, "%s > 0", address);
condition.Form("%s > 0", address.Data());
// cout << fillCommand << setw(20) << fillCondition << endl;
tr->Draw(fillCommand, fillCondition, "goff");
tr->Draw(command, condition, "goff");
if (hRead) {
hRead->SetDirectory(0);
// if (fHRawList) {
......@@ -621,11 +617,16 @@ void AculCalibration::FillRawSpectraFile(const char* rawdatafile, const char* bl
return;
}
char address[40];
char histName[40];
char histTitle[40];
char fillCommand[40];
char fillCondition[40];
// char address[40];
// char histName[40];
// char histTitle[40];
// char fillCommand[40];
// char fillCondition[40];
TString address;
TString histName;
TString histTitle;
TString command;
TString condition;
fw.cd();
TH1I *hRead = 0;
......@@ -633,14 +634,16 @@ void AculCalibration::FillRawSpectraFile(const char* rawdatafile, const char* bl
for (Int_t i = 0; i < 16; i++) { //zkontrolovat hranice
cout << i << endl; //predelat na info
hRead = new TH1I("name", "title", 4096, 0, 4095);
sprintf(address, "%s[%d]", block, i);
sprintf(histName, "%s[%d]", block, i);
sprintf(histTitle, "%s : %s", rawdatafile, histName);
address.Form("%s[%d]", block, i);
histName.Form("%s[%d]", block, i);
histTitle.Form("%s : %s", rawdatafile, histName.Data());
hRead->SetName(histName);
hRead->SetTitle(histTitle);
sprintf(fillCommand, "%s >> %s", address, hRead->GetName());
sprintf(fillCondition, "%s > 0", address);
tr->Draw(fillCommand, fillCondition, "goff"); //prozkoumat goff
// sprintf(fillCommand, "%s >> %s", address, hRead->GetName());
command.Form("%s >> %s", address.Data(), hRead->GetName());
// sprintf(fillCondition, "%s > 0", address);
condition.Form("%s > 0", address.Data());
tr->Draw(command, condition, "goff"); //prozkoumat goff
hRead->Write();
}//for
......@@ -679,7 +682,7 @@ Bool_t AculCalibration::CalculateCalibParameters(const char* inputfile, const ch
else { oFileName.Form("%s[%d-%d].cal", block, lowersubaddress, uppersubaddress); }
}//if
ofstream outcalfile;
std::ofstream outcalfile;
outcalfile.open(oFileName.Data());
if (!outcalfile.is_open()) {
Error("CalculateCalibParameters", "Output file %s was not opened", oFileName.Data());
......@@ -1087,7 +1090,7 @@ void AculCalibration::FindEnergyPeaks(TCanvas *c1, const char* ifile, const char
//creation of output text file with positions of peaks in MeV
TString workFile = outfile;
ofstream ofile;
std::ofstream ofile;
ofile.open(workFile.Data());
if (!ofile.is_open()) {
Error("PeaksFitting", "Output file %s was not opened", workFile.Data());
......@@ -1128,7 +1131,7 @@ void AculCalibration::FindAverageEnergies(const char* ifile, const char* outfile
//creation of output text file with average values of peak energies in MeV
TString workFile = outfile;
ofstream ofile;
std::ofstream ofile;
ofile.open(workFile.Data());
if (!ofile.is_open()) {
Error("PeaksFitting", "Output file %s was not opened", workFile.Data());
......@@ -1380,7 +1383,7 @@ void AculCalibration::SetInputParameters() {
Char_t identificator[100];
ifstream fipr;
std::ifstream fipr;
fipr.open(fParFileName.Data());
if (!fipr.is_open()) {
Error("AculCalibration::SetInputsParameters", "File with input parameters \"%s\" was not opened.", fParFileName.Data());
......
......@@ -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
\ No newline at end of file
$(ACULDATA)/AculDataDict.d
\ No newline at end of file
......@@ -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
{
gSystem->Load("~/workspace/Utilities/libAculData.so");
gSystem->Load("libTELoss.so");
gSystem->Load("libAculData.so");
}
......@@ -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 ' '
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment