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

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2021-03-01 09:35:16 +01:00
commit 8afc51f497
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,10 @@
<xs:complexType name="musrRoot"> <xs:complexType name="musrRoot">
<xs:sequence> <xs:sequence>
<xs:choice>
<xs:element ref="histos"/> <xs:element ref="histos"/>
<xs:element name="RunHeader" type="runHeaderFolder"/> <xs:element name="RunHeader" type="runHeaderFolder"/>
</xs:choice>
<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>
</xs:complexType> </xs:complexType>
@ -100,8 +102,8 @@
<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="Proposal_Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="Main Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/> <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"/>

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

@ -14,8 +14,10 @@
<xs:complexType name="musrRoot"> <xs:complexType name="musrRoot">
<xs:sequence> <xs:sequence>
<xs:choice>
<xs:element ref="histos"/> <xs:element ref="histos"/>
<xs:element name="RunHeader" type="runHeaderFolder"/> <xs:element name="RunHeader" type="runHeaderFolder"/>
</xs:choice>
<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>
</xs:complexType> </xs:complexType>
@ -101,8 +103,8 @@
<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="Proposal_Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
<xs:element name="Main Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/> <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"/>

4
src/musrRootValidation.cpp
View File

@ -8,7 +8,7 @@
***************************************************************************/ ***************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2007-2020 by Andreas Suter * * Copyright (C) 2007-2021 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -429,7 +429,7 @@ void PMusrRoot2Xml::CheckClass(TObject *obj, TString str, UInt_t offset)
offset += 2; offset += 2;
str = offsetStr + "<" + entryTag + ">"; str = offsetStr + "<" + entryTag + ">";
fXmlData.push_back(str.Data()); fXmlData.push_back(str.Data());
DumpEntry(dynamic_cast<TObjArray*>(obj), offset); DumpEntry(dynamic_cast<TObject*>(obj), offset);
str = offsetStr + "</" + entryTag + ">"; str = offsetStr + "</" + entryTag + ">";
fXmlData.push_back(str.Data()); fXmlData.push_back(str.Data());
} }