Skip to content

Commit

Permalink
Update Version
Browse files Browse the repository at this point in the history
  • Loading branch information
Nosferatu Arucard committed May 30, 2019
1 parent 66da126 commit 3eb50c5
Show file tree
Hide file tree
Showing 18 changed files with 507 additions and 482 deletions.
Binary file removed doc/ERYA Bulk Technical Reference.odt
View file
Binary file not shown.
Binary file removed doc/ERYA Bulk Tutorial.odt
View file
Binary file not shown.
115 changes: 55 additions & 60 deletions src/Database.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<title></title>
<meta name="generator" content="LibreOffice 6.1.5.1 (Linux)"/>
<meta name="generator" content="LibreOffice 6.1.5.2 (Linux)"/>
<meta name="created" content="2016-03-11T00:50:17.012769788"/>
<meta name="changed" content="2019-02-28T17:05:06.642043627"/>
<meta name="changed" content="2019-05-24T15:56:07.485889605"/>
<meta name="created" content="00:00:00">
<meta name="created" content="00:00:00">
<meta name="created" content="00:00:00">
<meta name="created" content="00:00:00">
<style type="text/css">
@page { size: 21cm 29.7cm; margin: 2.01cm }
p { margin-bottom: 0.25cm; line-height: 120%; background: transparent }
p { margin-bottom: 0.25cm; background: transparent; line-height: 120%; background: transparent }
a:link { color: #000080; so-language: zxx; text-decoration: underline }
a:visited { color: #800000; so-language: zxx; text-decoration: underline }
</style>
Expand All @@ -27,19 +27,25 @@
main purpose utility to manage and handle a database of elements
required for ERYA to operate correctly, which is to give the
necessary parameters to handle yield calculations.</font></p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">Since
the application follows the IBANDL recommendations, the default
physical units are the</span></span></font> <font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">atomic
and isotopic masses in atomic mass units (amu), where</span></span></font>
<font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">is
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">ERYA’s
Database follows the </span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">IBANDL
</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">conventions
on</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">
physical units, </span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">which
means</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">
</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">that</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">
the</span></span></font> <font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">atomic
and isotopic masses </span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">are
placed in</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">
atomic mass units (amu), where</span></span></font> <font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">is
also equal to the molar mass in grams per mole; the abundances are
dimensionless; and the</span></span></font> <font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">cross-section
data are internally stored in milibarn per keV.</span></span></font></p>
dimensionless; and the</span></span></font> total <font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">cross-section
data are </span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">stored</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">
in milibarn per keV </span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">units</span></span></font><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">.</span></span></font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">The default installation of
ERYA may already bundled a ready-to-use database that can be edited
using the buttons located on the bottom window, and can be replaced
or converted as your will.</font></p>
<font size="3" style="font-size: 12pt">ERYA should bundle a
ready-to-use database that can be edited using the buttons located on
the bottom window, and can be replaced or converted as your will.</font></p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><br/>

</p>
Expand Down Expand Up @@ -126,72 +132,61 @@

</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">ERYA support the following
database formats: one native with <b>epd</b> extension, using the XML
format where store, in particular, the cross-section data in
milibarn-keV, the energy in keV and the isotope mass in atomic mass
unit (grams per mol).</font></p>
<font size="3" style="font-size: 12pt">ERYA Databases are stored on a
file with <b>epd</b> extension, using the XML document format where
store, in particular, the cross-section data in milibarn-keV, the
energy in keV and the isotope mass in atomic mass unit (grams per
mol).</font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">And another, mainly for
recovery purposes, to import databases created by the LabView
software. </font>
</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<br/>
<font size="3" style="font-size: 12pt">An ancient text format are
also supported for recovery purposes, but are officially deprecated,
and should use the XML standard instead.</font></p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><br/>

</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<br/>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><br/>

</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; line-height: 100%">
<font size="3" style="font-size: 12pt"><b>LabView Database Import
(Legacy and Deprecated Feature)</b></font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<br/>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><br/>

</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">ERYA supports, much to legacy
feature, the binary and text form of <b>LabView ERYA </b><b>database
</b>format.</font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">One of the supported LabView
ERYA Database formats are called the <b>Source Database File, </b>which
is a standard text file that the LabView Runtime of ERYA compile to
their native binary format. </font>
</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">Since it was a standard ASCII
file, ERYA can export and import this kind of Database, but it is
strictly discouraged to use as backup file, and use the XML standard
instead.</font></p>
<font size="3" style="font-size: 12pt">ERYA supports the import of
the <b>LabView ERYA database </b>binary format, mainly dedicated for
the former uses of this previous software, to convert the data.</font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<br/>

</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">It is also possible to import
to ERYA the <b>Binary Database File,</b> which is the binary file
compiled by LabView ERYA itself. </font>
</p>
<font size="3" style="font-size: 12pt">To use this feature, click
“Load”, and select the “Legacy (txt)” file format on the file
dialog, and finally select the file to process.</font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">ERYA detects during this event
if the <b>LabView ERYA database </b>file are a plain Text Database or
a Binary Database file, and applies automatically the correct
importation routines.</font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">ERYA detects during the “Load”
button event, if the <b>LabView ERYA </b><b>database </b>file are a
Source or a Binary Database file, and apply the correct file filter
without additional user interaction.</font></p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"> <span lang="en-US">It
is not possible to export any ERYA-Bulk Database to binary form (It
will export to a text file, instead), and it will never be
implemented such feature.</span></p>
<font size="3" style="font-size: 12pt">Once successfully loaded,
their contents are displayed on the Database Manager, and the user
can make any operations, before save to a file.</font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; line-height: 100%">
Notice that is not possible to export any ERYA-Bulk Database to
binary form, and it will never be implemented such feature. Instead,
the user can store the Database to XML or text file formats, where
the first option are the recommendable one.</p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><br/>

</p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"> <span lang="en-US">Use
the LabView Import feature only as a convenient tool to import
databases created by the LabView ERYA, and convert to the native ERYA
databases files.</span></p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"> <span lang="en-US">Some
<p lang="en-US" align="left" style="margin-bottom: 0cm; line-height: 100%">
<b>Tip: </b>Use the LabView Import feature only as a convenient tool
to import databases created by the LabView ERYA, and convert to the
native ERYA databases files.</p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><span lang="en-US">Some
technical details are available <a href="Legacy.html">here</a>.</span></p>
</body>
</html>
18 changes: 9 additions & 9 deletions src/Detector.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<title></title>
<meta name="generator" content="LibreOffice 6.1.5.1 (Linux)"/>
<meta name="generator" content="LibreOffice 6.1.5.2 (Linux)"/>
<meta name="created" content="2016-03-10T20:27:27.902047081"/>
<meta name="changed" content="2019-02-28T17:43:22.407099414"/>
<meta name="changed" content="2019-05-24T16:09:34.558204901"/>
<meta name="created" content="00:00:00">
<meta name="created" content="00:00:00">
<meta name="created" content="00:00:00">
Expand Down Expand Up @@ -34,7 +34,7 @@
<font size="3" style="font-size: 12pt">The minimum requirement is to
export, or type an array of data that should contain a pair of values
that models the efficiency in function of energy. (The program will
assume the energy is in keV, and the efficiency as a dimensionless
assume the energy is in keV, and the efficiency is a dimensionless
value between zero and one).</font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">The main rule is if you have
Expand Down Expand Up @@ -80,19 +80,19 @@
input-box. </font>
</p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">A typical custom-function for
<font size="3" style="font-size: 12pt">A typical custom-function for
Detector’s Efficiency have the following format, like in this
example:</font></p>
<p lang="en-US" align="center" style="margin-bottom: 0cm; line-height: 100%">
<font size="3" style="font-size: 12pt"><b>fxvar = E, fyvar = F :
a3=-3.E4, a2=-276, a1=10, a0=1.5E-4 : F = a0 + a1/E + a2/E^2 + a3/E^3</b></font></p>
<p lang="en-US" align="center" style="margin-bottom: 0cm; line-height: 100%">
<br/>
<p align="center" style="margin-bottom: 0cm; line-height: 100%"><br/>

</p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"> <font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">When
ERYA detects a valid algebraic function, will ignore any table data,
and use exclusively the direct function evaluation.</span></span></font></p>
<p lang="en-US" align="left" style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
<font size="3" style="font-size: 12pt">When ERYA detects a valid
algebraic function, will ignore any table data, and use exclusively
the direct function evaluation.</font></p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><font size="3" style="font-size: 12pt"><span lang="en-US"><span style="font-weight: normal">Further
information about writing a custom function can be accessed <a href="Macro.html">here</a>.</span></span></font></p>
<p align="left" style="margin-bottom: 0cm; line-height: 100%"><br/>
Expand Down
12 changes: 6 additions & 6 deletions src/ERYAPIXE.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
labelElementCalibrationParameter->SetFont(TableFont);
sizerButtons->Add( labelElementCalibrationParameter, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

labelStoichiometricGuess = new wxStaticText( scrollButtons, wxID_ANY, wxT("Stoichiometric\nInitial Guess"), wxDefaultPosition, wxDefaultSize, 0 );
labelStoichiometricGuess = new wxStaticText( scrollButtons, wxID_ANY, wxT("Composition\nInitial Guess"), wxDefaultPosition, wxDefaultSize, 0 );
labelStoichiometricGuess->Wrap( -1 );
labelStoichiometricGuess->SetFont(TableFont);
sizerButtons->Add( labelStoichiometricGuess, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
Expand All @@ -166,12 +166,12 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
labelYieldFitted->SetFont(TableFont);
sizerButtons->Add( labelYieldFitted, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

labelStoichiometricFitted = new wxStaticText( scrollButtons, wxID_ANY, wxT("Fitted\nStoichiometry"), wxDefaultPosition, wxDefaultSize, 0 );
labelStoichiometricFitted = new wxStaticText( scrollButtons, wxID_ANY, wxT("Fitted\nComposition"), wxDefaultPosition, wxDefaultSize, 0 );
labelStoichiometricFitted->Wrap( -1 );
labelStoichiometricFitted->SetFont(TableFont);
sizerButtons->Add( labelStoichiometricFitted, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

labelStoichiometricMass = new wxStaticText( scrollButtons, wxID_ANY, wxT("Stoichiometric\nFitted Mass"), wxDefaultPosition, wxDefaultSize, 0 );
labelStoichiometricMass = new wxStaticText( scrollButtons, wxID_ANY, wxT("Composition\nFitted Mass"), wxDefaultPosition, wxDefaultSize, 0 );
labelStoichiometricMass->Wrap( -1 );
labelStoichiometricMass->SetFont(TableFont);
sizerButtons->Add( labelStoichiometricMass, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
Expand Down Expand Up @@ -264,7 +264,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
tabYieldEnergy->SetSizer( sizerYieldEnergy );
tabYieldEnergy->Layout();
sizerYieldEnergy->Fit( tabYieldEnergy );
tabbedOutput->AddPage( tabYieldEnergy, wxT("Stoichiometry"), false );
tabbedOutput->AddPage( tabYieldEnergy, wxT("Composition"), false );
tabFittingError = new wxPanel( tabbedOutput, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* sizerFittingError;
sizerFittingError = new wxBoxSizer( wxVERTICAL );
Expand Down Expand Up @@ -312,7 +312,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
tabLogProfiling->SetSizer( sizerLogProfiling );
tabLogProfiling->Layout();
sizerLogProfiling->Fit( tabLogProfiling );
tabbedOutput->AddPage( tabLogProfiling, wxT("Energy Profiling"), false );
tabbedOutput->AddPage( tabLogProfiling, wxT("Energy Table"), false );

sizerMainFrame->Add( tabbedOutput, 1, wxEXPAND | wxALL, 5 );

Expand Down Expand Up @@ -362,7 +362,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
textStepSize = new wxTextCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, 0 );
sizerMainButtons->Add( textStepSize, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );

labelDetectorAngle = new wxStaticText( this, wxID_ANY, wxT("Profiling Step\n (keV)"), wxDefaultPosition, wxDefaultSize, 0 );
labelDetectorAngle = new wxStaticText( this, wxID_ANY, wxT("Table Step\n (keV)"), wxDefaultPosition, wxDefaultSize, 0 );
labelDetectorAngle->SetFont(TableFont);
labelDetectorAngle->SetForegroundColour(wxColour(64,64,128,wxALPHA_OPAQUE));
labelDetectorAngle->Wrap( -1 );
Expand Down
Loading

0 comments on commit 3eb50c5

Please sign in to comment.