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

fixing typo, adding eventFilters, etc. see (MUSR-44 in the tracker)

Browse Source
This commit is contained in:
nemu
2009-04-20 06:50:06 +00:00
parent 5667d6bb5e
commit 01ee7c0196
11 changed files with 161 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/classes/Makefile.PMusr
View File

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

4
src/classes/PMsrHandler.cpp
View File

@ -1063,7 +1063,7 @@ int PMsrHandler::ParameterInUse(unsigned int paramNo)
* x x x x x -> 5 Parameters, e.g. after a MINOS fit
* without boundaries
* x x x x -> 4 Parameters, e.g. after MIGRAD fit
* without bounderies, or
* without boundaries, or
* when starting
* \endcode
*
@ -1161,7 +1161,7 @@ bool PMsrHandler::HandleFitParameterEntry(PMsrLines &lines)
}
}
// 7 values, i.e. No Name Value Neg_Error Pos_Error Lower_Bounderay Upper_Boundary
// 7 values, i.e. No Name Value Neg_Error Pos_Error Lower_Boundary Upper_Boundary
if (tokens->GetEntries() == 7) {
param.fNoOfParams = 7;

19
src/classes/PTheory.cpp
View File

@ -1872,6 +1872,25 @@ void PTheory::CalculateDynKTLF(const double *val, int tag) const
const double Tmax = 20.0; // 20 usec
unsigned int N = static_cast<unsigned int>(16.0*Tmax*val[0]);
// check if rate (Delta/a) is very high
if (fabs(val[1]) > 0.1) {
double tmin = 20.0;
switch (tag) {
case 0: // Gauss
tmin = sqrt(3.0)/val[1];
break;
case 1: // Lorentz
tmin = 2.0/val[1];
break;
default:
break;
}
unsigned int Nrate = static_cast<unsigned int>(25.0 * Tmax / tmin);
if (Nrate > N) {
N = Nrate;
}
}
if (N < 300) // if too view points, i.e. nu0 very small, take 300 points
N = 300;