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

Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6

Browse Source
This commit is contained in:
suter_a 2019-04-26 20:35:32 +02:00
commit a5526d7f76
9 changed files with 1072 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/external/MusrRoot/MusrRoot.xsd vendored
View File

@ -7,7 +7,7 @@
It is currently the default standard for writting muSR data files at the It is currently the default standard for writting muSR data files at the
Paul Scherrer Institute. Paul Scherrer Institute.
Author: Andreas Suter, andreas.suter@psi.ch Author: Andreas Suter, andreas.suter@psi.ch
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
@ -100,24 +100,26 @@
<xs:element name="Generic_Validator_URL" type="TString"/> <xs:element name="Generic_Validator_URL" type="TString"/>
<xs:element name="Specific_Validator_URL" type="TString"/> <xs:element name="Specific_Validator_URL" type="TString"/>
<xs:element name="Generator" type="TString"/> <xs:element name="Generator" type="TString"/>
<xs:element name="Proposal Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="Main Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="File_Name" type="TString"/> <xs:element name="File_Name" type="TString"/>
<xs:element name="Run_Title" type="TString"/> <xs:element name="Run_Title" type="TString"/>
<xs:element name="Run_Number" type="Int_t"/> <xs:element name="Run_Number" type="Int_t"/>
<xs:element name="Run_Start_Time" type="TString"/> <xs:element name="Run_Start_Time" type="TString"/>
<xs:element name="Run_Stop_Time" type="TString"/> <xs:element name="Run_Stop_Time" type="TString"/>
<xs:element name="Run_Duration" type="TMusrRunPhysicalQuantity"/> <xs:element name="Run_Duration" type="TMusrRunPhysicalQuantity"/>
<xs:element name="Laboratory" type="TString"/> <xs:element name="Laboratory" type="TString"/>
<xs:element name="Instrument" type="TString"/> <xs:element name="Instrument" type="TString"/>
<xs:element name="Muon_Beam_Momentum" type="TMusrRunPhysicalQuantity"/> <xs:element name="Muon_Beam_Momentum" type="TMusrRunPhysicalQuantity"/>
<xs:element name="Muon_Species" type="TString"/> <xs:element name="Muon_Species" type="TString"/>
<xs:element name="Muon_Source" type="TString"/> <xs:element name="Muon_Source" type="TString"/>
<xs:element name="Setup" type="TString"/> <xs:element name="Setup" type="TString"/>
<xs:element name="Comment" type="TString"/> <xs:element name="Comment" type="TString"/>
<xs:element name="Sample_Name" type="TString"/> <xs:element name="Sample_Name" type="TString"/>
<xs:element name="Sample_Temperature" type="TMusrRunPhysicalQuantity"/> <xs:element name="Sample_Temperature" type="TMusrRunPhysicalQuantity"/>
<xs:element name="Sample_Magnetic_Field" type="TMusrRunPhysicalQuantity"/> <xs:element name="Sample_Magnetic_Field" type="TMusrRunPhysicalQuantity"/>
<xs:element name="No_of_Histos" type="Int_t"/> <xs:element name="No_of_Histos" type="Int_t"/>
<xs:element name="Time_Resolution" type="TMusrRunPhysicalQuantity"/> <xs:element name="Time_Resolution" type="TMusrRunPhysicalQuantity"/>
<xs:element name="RedGreen_Offsets" type="TIntVector"/> <xs:element name="RedGreen_Offsets" type="TIntVector"/>
<xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded"/> <!-- here can go any additional stuff you like --> <xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded"/> <!-- here can go any additional stuff you like -->
</xs:sequence> </xs:sequence>

36
src/external/MusrRoot/MusrRootLEM.xsd vendored
View File

@ -6,7 +6,7 @@
In the following it will be called MusrRootLEM. In the following it will be called MusrRootLEM.
It is an extension of MusrRoot.xsd and describes the additional LEM specific entries. It is an extension of MusrRoot.xsd and describes the additional LEM specific entries.
Author: Andreas Suter, andreas.suter@psi.ch Author: Andreas Suter, andreas.suter@psi.ch
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
@ -101,24 +101,26 @@
<xs:element name="Generic_Validator_URL" type="TString"/> <xs:element name="Generic_Validator_URL" type="TString"/>
<xs:element name="Specific_Validator_URL" type="TString"/> <xs:element name="Specific_Validator_URL" type="TString"/>
<xs:element name="Generator" type="TString"/> <xs:element name="Generator" type="TString"/>
<xs:element name="Proposal Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="Main Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="File_Name" type="TString"/> <xs:element name="File_Name" type="TString"/>
<xs:element name="Run_Title" type="TString"/> <xs:element name="Run_Title" type="TString"/>
<xs:element name="Run_Number" type="Int_t"/> <xs:element name="Run_Number" type="Int_t"/>
<xs:element name="Run_Start_Time" type="TString"/> <xs:element name="Run_Start_Time" type="TString"/>
<xs:element name="Run_Stop_Time" type="TString"/> <xs:element name="Run_Stop_Time" type="TString"/>
<xs:element name="Run_Duration" type="TMusrRunPhysicalQuantity"/> <xs:element name="Run_Duration" type="TMusrRunPhysicalQuantity"/>
<xs:element name="Laboratory" type="TString"/> <xs:element name="Laboratory" type="TString"/>
<xs:element name="Instrument" type="TString"/> <xs:element name="Instrument" type="TString"/>
<xs:element name="Muon_Beam_Momentum" type="TMusrRunPhysicalQuantity"/> <xs:element name="Muon_Beam_Momentum" type="TMusrRunPhysicalQuantity"/>
<xs:element name="Muon_Species" type="TString"/> <xs:element name="Muon_Species" type="TString"/>
<xs:element name="Muon_Source" type="TString"/> <xs:element name="Muon_Source" type="TString"/>
<xs:element name="Setup" type="TString"/> <xs:element name="Setup" type="TString"/>
<xs:element name="Comment" type="TString"/> <xs:element name="Comment" type="TString"/>
<xs:element name="Sample_Name" type="TString"/> <xs:element name="Sample_Name" type="TString"/>
<xs:element name="Sample_Temperature" type="TMusrRunPhysicalQuantity"/> <xs:element name="Sample_Temperature" type="TMusrRunPhysicalQuantity"/>
<xs:element name="Sample_Magnetic_Field" type="TMusrRunPhysicalQuantity"/> <xs:element name="Sample_Magnetic_Field" type="TMusrRunPhysicalQuantity"/>
<xs:element name="No_of_Histos" type="Int_t"/> <xs:element name="No_of_Histos" type="Int_t"/>
<xs:element name="Time_Resolution" type="TMusrRunPhysicalQuantity"/> <xs:element name="Time_Resolution" type="TMusrRunPhysicalQuantity"/>
<xs:element name="RedGreen_Offsets" type="TIntVector"/> <xs:element name="RedGreen_Offsets" type="TIntVector"/>
<xs:element name="Moderator" type="TString"/> <xs:element name="Moderator" type="TString"/>
<xs:element name="Moderator_HV" type="TMusrRunPhysicalQuantity"/> <xs:element name="Moderator_HV" type="TMusrRunPhysicalQuantity"/>

4
src/external/MusrRoot/TMusrRunHeader.cpp vendored
View File

@ -246,11 +246,13 @@ void TMusrRunHeader::Init(TString fileName)
TMusrRunPhysicalQuantity prop; TMusrRunPhysicalQuantity prop;
fFileName = fileName; fFileName = fileName;
fVersion = TString("$Id: TMusrRunHeader.cpp 5092 2012-03-13 07:47:00Z nemu $"); fVersion = TString("git-sha: dae9ef0ffba4");
Set("RunInfo/Version", fVersion); Set("RunInfo/Version", fVersion);
Set("RunInfo/Generic Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRoot.xsd"); Set("RunInfo/Generic Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRoot.xsd");
Set("RunInfo/Specific Validator URL", "n/a"); Set("RunInfo/Specific Validator URL", "n/a");
Set("RunInfo/Generator", "n/a"); Set("RunInfo/Generator", "n/a");
Set("RunInfo/Proposal Number", -1);
Set("RunInfo/Main Proposer", "n/a");
Set("RunInfo/File Name", "n/a"); Set("RunInfo/File Name", "n/a");
Set("RunInfo/Run Title", "n/a"); Set("RunInfo/Run Title", "n/a");
Set("RunInfo/Run Number", -1); Set("RunInfo/Run Number", -1);

BIN
src/external/MusrRoot/doc/MusrRootDefinition.pdf vendored Normal file
View File

Binary file not shown.

1031
src/external/MusrRoot/doc/MusrRootDefinition.tex vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
src/external/MusrRoot/doc/MusrRootRunHeaderCartoon.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 142 KiB

BIN
src/external/MusrRoot/doc/MusrRootValidationScheme.pdf vendored Normal file
View File

Binary file not shown.

BIN
src/external/MusrRoot/doc/PSI-Logo_narrow_blau.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 106 KiB

BIN
src/external/MusrRoot/doc/root-class-browser.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 KiB