Skip to content

Commit 0542b34

Browse files
committed
Update example text for DRF formula, a little.
1 parent 7974509 commit 0542b34

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/DrfSelect.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,14 +2565,17 @@ DrfSelect::DrfSelect( std::shared_ptr<DetectorPeakResponse> currentDet,
25652565
//--- 4) Manual
25662566
//-------------------------------------
25672567

2568-
const char * const fcn = "exp(-343.63 + 269.10*log(x) -83.80*log(x)^2 "
2569-
"+ 13.00*log(x)^3 -1.01*log(x)^4 + 0.03*log(x)^5)";
2568+
//const char * const fcn = "exp(-343.63 + 269.10*log(x) -83.80*log(x)^2 "
2569+
//"+ 13.00*log(x)^3 -1.01*log(x)^4 + 0.03*log(x)^5)";
2570+
2571+
const char * const fcn = "Example: exp(-9.8 - 8.1*log(x) + 4.62E-02*log(x)^2 + ...)\n"
2572+
"Or equivalently: -9.8 -8.1 4.62E-02 ...";
2573+
25702574
const char *const manualdetname = "User Defined Detector";
25712575
const char *const diamtxt = "2.2 cm";
2572-
const char *txt = "Manually define the efficiency of the detector,"
2573-
" given the energy x. The efficiency values should stay"
2574-
" within 0.0~1.0 for the energy range of interest."
2575-
" Click the question mark icon for more info.";
2576+
const char *txt = "Detector efficiency defined by a mathematical formula, given the energy x;"
2577+
" or you can enter the coefficients for the standard equation form."
2578+
" Click the question mark icon for more info.";
25762579

25772580
WContainerWidget *formulaDiv = new WContainerWidget();
25782581
WText *selfDefineLabel = new WText( txt, formulaDiv );
@@ -2609,7 +2612,7 @@ DrfSelect::DrfSelect( std::shared_ptr<DetectorPeakResponse> currentDet,
26092612

26102613
m_detectorManualFunctionText->setRows(3);
26112614
m_detectorManualFunctionText->setStyleClass("DrfSelectFunctionalFormText");
2612-
m_detectorManualFunctionText->setText(fcn);
2615+
//m_detectorManualFunctionText->setText(fcn);
26132616
m_detectorManualFunctionText->setEmptyText(fcn);
26142617
m_detectorManualFunctionText->setInline(false);
26152618
m_detectorManualFunctionText->keyWentUp().connect(boost::bind(&DrfSelect::verifyManualDefinition, this));
@@ -2650,7 +2653,7 @@ DrfSelect::DrfSelect( std::shared_ptr<DetectorPeakResponse> currentDet,
26502653
m_detectorManualDiameterText = new WLineEdit( cell );
26512654
label->setBuddy( m_detectorManualDiameterText );
26522655
m_detectorManualDiameterText->setValidator( distValidator );
2653-
m_detectorManualDiameterText->setText( diamtxt );
2656+
//m_detectorManualDiameterText->setText( diamtxt );
26542657
m_detectorManualDiameterText->setEmptyText( diamtxt );
26552658
m_detectorManualDiameterText->setValidator( distValidator );
26562659
m_detectorManualDiameterText->blurred().connect(boost::bind(&DrfSelect::verifyManualDefinition, this));

0 commit comments

Comments
 (0)