LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

changed compiler optimization flag, and added an additional function value check

Browse Source
This commit is contained in:
nemu 2009-04-09 14:00:25 +00:00
parent 33a6a88c79
commit ef87d3983e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/classes/Makefile.PMusr
View File

@ -42,7 +42,8 @@ endif
# -- Linux # -- Linux
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
CXX = g++ CXX = g++
CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC #CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC
CXXFLAGS = -O1 -Wall -Wno-trigraphs -fPIC
PMUSRPATH = ../include PMUSRPATH = ../include
MNPATH = $(ROOTSYS)/include MNPATH = $(ROOTSYS)/include
GSLPATH = /usr/include/gsl GSLPATH = /usr/include/gsl

2
src/classes/PRunAsymmetry.cpp
View File

@ -930,7 +930,7 @@ bool PRunAsymmetry::PrepareViewData(PRawRunData* runData, unsigned int histoNo[2
for (unsigned int i=0; i<size; i++) { for (unsigned int i=0; i<size; i++) {
time = startTime + (double)i*fTimeResolution; time = startTime + (double)i*fTimeResolution;
value = fTheory->Func(time, par, fFuncValues); value = fTheory->Func(time, par, fFuncValues);
if (value > 10.0) { // dirty hack needs to be fixed!! if (fabs(value) > 10.0) { // dirty hack needs to be fixed!!
value = 0.0; value = 0.0;
} }
fData.fTheory.push_back(value); fData.fTheory.push_back(value);

4
src/classes/PRunSingleHisto.cpp
View File

@ -668,7 +668,7 @@ cout << endl << ">> data start time = " << fData.fDataTimeStart;
for (unsigned int i=0; i<size; i++) { for (unsigned int i=0; i<size; i++) {
time = fData.fTheoryTimeStart + i*fTimeResolution; time = fData.fTheoryTimeStart + i*fTimeResolution;
theoryValue = fTheory->Func(time, par, fFuncValues); theoryValue = fTheory->Func(time, par, fFuncValues);
if (theoryValue > 10.0) { // dirty hack needs to be fixed!! if (fabs(theoryValue) > 10.0) { // dirty hack needs to be fixed!!
theoryValue = 0.0; theoryValue = 0.0;
} }
fData.fTheory.push_back(N0*TMath::Exp(-time/tau)*(1+theoryValue)+bkg); fData.fTheory.push_back(N0*TMath::Exp(-time/tau)*(1+theoryValue)+bkg);
@ -823,7 +823,7 @@ cout << endl << "--------------------------------";
for (unsigned int i=0; i<size; i++) { for (unsigned int i=0; i<size; i++) {
time = fData.fTheoryTimeStart + (double)i*fTimeResolution; time = fData.fTheoryTimeStart + (double)i*fTimeResolution;
theoryValue = fTheory->Func(time, par, fFuncValues); theoryValue = fTheory->Func(time, par, fFuncValues);
if (theoryValue > 10.0) { // dirty hack needs to be fixed!! if (fabs(theoryValue) > 10.0) { // dirty hack needs to be fixed!!
theoryValue = 0.0; theoryValue = 0.0;
} }
fData.fTheory.push_back(theoryValue); fData.fTheory.push_back(theoryValue);