Skip to content

Commit 475b5a9

Browse files
authored
Merge pull request #41 from nadrino/feature/banffFit
Feature/banff fit
2 parents 368b38a + 48cce9c commit 475b5a9

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
44
project(gundam)
55
set (gundam_VERSION_MAJOR 1)
66
set (gundam_VERSION_MINOR 2)
7-
set (gundam_VERSION_REVISION 3)
8-
set (gundam_VERSION_TAG "f") # f means forward -> include commits after a given release
7+
set (gundam_VERSION_REVISION 4)
8+
set (gundam_VERSION_TAG "") # f means forward -> include commits after a given release
99
set (gundam_VERSION_STRING "${gundam_VERSION_MAJOR}.${gundam_VERSION_MINOR}.${gundam_VERSION_REVISION}${gundam_VERSION_TAG}")
1010

1111
option(CMAKE_CXX_EXTENSIONS "Enable GNU extensions to C++ langauge (-std=gnu++14)." OFF)

src/FitParameters/include/NormalizationDial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class NormalizationDial : public Dial {
2121
void fillResponseCache() override;
2222

2323
private:
24-
double _priorValue_{std::nan("unset")};
24+
// double _priorValue_{std::nan("unset")};
2525

2626
};
2727

src/FitParameters/src/NormalizationDial.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@ void NormalizationDial::reset() {
2727

2828
void NormalizationDial::initialize() {
2929
Dial::initialize();
30-
LogThrowIf(_associatedParameterReference_ == nullptr, "Par reference not set.")
31-
_priorValue_ = ( (FitParameter*) _associatedParameterReference_ )->getPriorValue();
3230
_isInitialized_ = true;
3331
}
3432

3533
double NormalizationDial::evalResponse(double parameterValue_){
36-
return parameterValue_ * _priorValue_; // NO CACHE NEEDED ?
34+
return parameterValue_; // NO CACHE NEEDED ?
3735
}
3836

0 commit comments

Comments
 (0)