Changeset 261 for 1dwg


Ignore:
Timestamp:
Oct 31, 2012 3:08:34 PM (7 years ago)
Author:
prjemian
Message:

refs #20, refs #27

Location:
1dwg/trunk
Files:
30 edited

Legend:

Unmodified
Added
Removed
  • 1dwg/trunk/1998spheres.xml

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4         xmlns="cansas1d/1.1" 
     4                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <!--  
  • 1dwg/trunk/CHANGES.txt

    r236 r261  
    55=============== 
    66 
    7 2012-08-16  tagged version canSAS1d/1.1 
     72012-08-16  tagged version canSAS1d/1.1  (2012-10-31 need to retag) 
    88         
    99        * TRAC #17: wontfix: clean up rules 
    1010        * TRAC #18: added timestamp attribute to SASdata and SAStransmission_spectrum 
    11         * TRAC #20: no change in format of namespace this time, wait for multi-D standard 
     11        * TRAC #20: slight change in format of namespace string and URL 
    1212        * TRAC #21: added {any} element at end of SASdata and SAStransmission_spectrum 
    1313        * TRAC #22: added SAStransmission_spectrum 
     14        * TRAC #27: rebrand from smallangles.net to cansas.org 
     15         
     16        * slight changes in documentation of units (Angstrom and Celsius) 
    1417 
    15182009-05-12  tagged version canSAS1d/1.0 
  • 1dwg/trunk/GLASSYC_C4G8G9_no_TL.xml

    r237 r261  
    33<!-- NOTE: This file contains SAS data sets but no transmission spectra --> 
    44<!-- compare with: GLASSYC_C4G8G9_w_TL.xml --> 
    5  <SASroot version="1.1" 
    6           xmlns="cansas1d/1.1" 
    7           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    8           xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
     5<SASroot version="1.1" 
     6                xmlns="urn:cansas1d:1.1" 
     7                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     8                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     9                > 
    910 <SASentry name="Workspace_2"> 
    1011 <Title> C4_SANS                  </Title> 
  • 1dwg/trunk/GLASSYC_C4G8G9_w_TL.xml

    r237 r261  
    44<!-- compare with: GLASSYC_C4G8G9_no_TL.xml --> 
    55<SASroot version="1.1" 
    6           xmlns="cansas1d/1.1" 
    7           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    8           xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
     6                xmlns="urn:cansas1d:1.1" 
     7                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     8                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     9                > 
    910 <SASentry name="Workspace_2"> 
    1011 <Title> C4_SANS                  </Title> 
  • 1dwg/trunk/W1W2.XML

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4                 xmlns="cansas1d/1.1" 
     4                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry name="W1"> 
  • 1dwg/trunk/bimodal-test1.xml

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4         xmlns="cansas1d/1.1" 
     4                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/cansas1d-template.xml

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4         xmlns="cansas1d/1.1" 
    5     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6     xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    7     > 
     4                xmlns="urn:cansas1d:1.1" 
     5                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     7                > 
    88        <!-- 
    99           file: cansas1d-template.xml 
     
    1313                   When shown in the template below, the "unit" attribute is required. 
    1414                   If in doubt, try validating against the XML Schema as described in 
    15                    http://www.smallangles.net/wgwiki/index.php/cansas1d_documentation#Validation_of_XML_against_the_Schema 
     15                   http://www.cansas.org/wgwiki/index.php/cansas1d_documentation#Validation_of_XML_against_the_Schema 
    1616         --> 
    1717        <SASentry name="this name is optional"> 
  • 1dwg/trunk/cansas1d.xml

    r257 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4         xmlns="cansas1d/1.1" 
    5     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6     xsi:schemaLocation="cansas1d/1.1 
    7         http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    8     > 
     4                xmlns="urn:cansas1d:1.1" 
     5                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     7                > 
    98        <SASentry> 
    109                <Title></Title> 
  • 1dwg/trunk/cansas1d.xsd

    r236 r261  
    44        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
    55        xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"  jaxb:version="2.0" 
    6         targetNamespace="cansas1d/1.1" xmlns:tns="cansas1d/1.1" 
     6        targetNamespace="urn:cansas1d:1.1" xmlns:tns="urn:cansas1d:1.1" 
    77        elementFormDefault="qualified"> 
    88 
     
    6767         
    6868        <complexType name="SASdataType"> 
    69                 <sequence minOccurs="1" maxOccurs="1">  <!-- http://svn.smallangles.net/trac/canSAS/ticket/21 --> 
     69                <sequence minOccurs="1" maxOccurs="1">  <!-- http://svn.cansas.org/trac/canSAS/ticket/21 --> 
    7070                        <sequence> 
    7171                                <element name="Idata" minOccurs="1" maxOccurs="unbounded" type="tns:IdataType" /> 
  • 1dwg/trunk/cansasxml-extended-html.xsl

    r245 r261  
    1919        xsltproc cansasxml-html.xsl datafile.xml > datafile.html 
    2020        (or include it as indicated at the documentation site 
    21         http://www.smallangles.net/wgwiki/index.php/cansas1d_documentation) 
     21        http://www.cansas.org/wgwiki/index.php/cansas1d_documentation) 
    2222--> 
    2323 
    2424<xsl:stylesheet version="1.1" 
    2525        xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
    26         xmlns:cs="cansas1d/1.1" 
     26        xmlns:cs="urn:cansas1d:1.1" 
    2727        xmlns:fn="http://www.w3.org/2005/02/xpath-functions" 
    2828        > 
  • 1dwg/trunk/cansasxml-html.xsl

    r236 r261  
    1111 
    1212Purpose: 
    13         This stylesheet is used to translate cansas1d/1.0 
     13        This stylesheet is used to translate cansas1d/1.1 
    1414        XML data files into a display form for viewing 
    1515        in a web browser such as Firefox or Internet Explorer. 
     
    1818        xsltproc cansasxml-html.xsl datafile.xml > datafile.html 
    1919        (or include it as indicated at the documentation site 
    20         http://www.smallangles.net/wgwiki/index.php/cansas1d_documentation) 
     20        http://www.cansas.org/wgwiki/index.php/cansas1d_documentation) 
    2121--> 
    2222 
    23 <xsl:stylesheet version="1.0" 
     23<xsl:stylesheet version="1.1" 
    2424        xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
    25         xmlns:cs="cansas1d/1.0" 
     25        xmlns:cs="urn:cansas1d:1.1" 
    2626        xmlns:fn="http://www.w3.org/2005/02/xpath-functions" 
    2727        xmlns:ues="urn:efficiency:spectrum" 
  • 1dwg/trunk/cs_af1410.xml

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4   xmlns="cansas1d/1.1" 
    5  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6  xsi:schemaLocation="cansas1d/1.1   http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
     4                xmlns="urn:cansas1d:1.1" 
     5                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     7                > 
    78  <SASentry name="AF1410:10"> 
    89    <Title>AF1410-10 (AF1410 steel aged 10 h)</Title> 
  • 1dwg/trunk/cs_collagen.xml

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4         xmlns="cansas1d/1.1" 
     4                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/cs_collagen_full.xml

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4         xmlns="cansas1d/1.1" 
     4                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/doc/source/binding-fortran.rst

    r257 r261  
    4747that will read cansas1d/1.0 XML files. 
    4848 
    49 http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/fortran/SASXML_G77.F  
     49http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/fortran/SASXML_G77.F  
  • 1dwg/trunk/doc/source/binding-igorpro.rst

    r251 r261  
    3737 
    3838**file** 
    39         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
     39        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
    4040 
    4141**author** 
     
    5454**URL** 
    5555        *TRAC* 
    56                 http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
     56                http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
    5757        *SVN* 
    58                 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/IgorPro/cansasXML.ipf 
     58                http://svn.cansas.org/svn/canSAS/1dwg/trunk/IgorPro/cansasXML.ipf 
    5959 
    6060.. index:: ! IgorPro package; XMLutils XOP 
     
    123123        .. code-block:: text 
    124124         
    125                 svn checkout http://svn.smallangles.net/svn/canSAS/1dwg/trunk cansas-1dwg 
     125                svn checkout http://svn.cansas.org/svn/canSAS/1dwg/trunk cansas-1dwg 
    126126 
    127127This will download lots of extra files. The file of interest is in the 
     
    147147#. Download *cansasXML.ipf*. Either checkout from subversion (see above) or, with 
    148148        a web browser, copy *cansasXML.ipf* from the on-line subversion repository. 
    149         (http://svn.smallangles.net/svn/canSAS/1dwg/trunk/IgorPro/cansasXML.ipf) 
     149        (http://svn.cansas.org/svn/canSAS/1dwg/trunk/IgorPro/cansasXML.ipf) 
    150150#. Copy *cansasXML.ipf* file to *...WavemetricsIgor Pro FolderUser Procedures* 
    151151        (or file system equivalent) 
  • 1dwg/trunk/doc/source/binding-java-jaxb.rst

    r257 r261  
    1212from Sun (see below for more on JAXB) using the *cansas1d.xsd* :index:`XML Schema`. 
    1313Resources (JAR files and documentation) for the Java binding may be found in 
    14 the canSAS subversion repository: http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.0/java 
     14the canSAS subversion repository: http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java 
    1515 
    1616Subversion repository 
    17         http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.0/java 
     17        http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java 
    1818         
    1919        canSAS subversion repository tagged release directory for the Java binding. 
     
    2121 
    2222*cansas1d-1.0.jar* 
    23         http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0.jar 
     23        http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0.jar 
    2424         
    2525        JAR file to add to your CLASSPATH in order to use this binding. 
    2626 
    2727*cansas1d-1.0-javadoc.jar* 
    28         http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0-javadoc.jar 
     28        http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0-javadoc.jar 
    2929         
    3030        Use this JAR file if you want to add the  
     
    3636 
    3737*cansas1d-1.0-sources.jar* 
    38         http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0-sources.jar 
     38        http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0-sources.jar 
    3939         
    4040        JAR file of the source code.    
     
    4545 
    4646*cansas1d-1.0.pdf* 
    47         http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0.pdf 
     47        http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0.pdf 
    4848 
    4949        PDF file of the javadoc source code documentation. 
     
    5151 
    5252source code (for developers) 
    53         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse 
     53        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse 
    5454         
    5555        canSAS Development project subversion repository for the Java binding.   
     
    6363to show how to read a cansas1d/1.1 XML file using the Java API.  
    6464 
    65 http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse/src/main/java/org/scatteringsw/reader/Example_canSAS_Reader.java 
     65http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse/src/main/java/org/scatteringsw/reader/Example_canSAS_Reader.java 
    6666 
    6767In short, these are the important two lines: 
     
    103103directory (above). By default, it shows the two samples in the 
    104104*1998spheres.xml* example file. 
    105 (http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/1998spheres.xml) 
     105(http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/1998spheres.xml) 
    106106 
    107107.. note:: The reader will have to get the directory paths  
     
    145145 
    146146Since the source code is rather lengthy, download it from: 
    147 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/doc/src/GetSASdata.java 
     147http://svn.cansas.org/svn/canSAS/1dwg/trunk/doc/src/GetSASdata.java 
    148148 
    149149.. 
  • 1dwg/trunk/doc/source/casestudy_af1410.rst

    r248 r261  
    1212 
    1313data file: *cs_af1410.xml* 
    14         http://svn.smallangles.net/svn/canSAS/1dwg/trunk/examples/af1410/cs_af1410.xml 
     14        http://svn.cansas.org/svn/canSAS/1dwg/trunk/examples/af1410/cs_af1410.xml 
    1515 
    1616The data file contains multiple :ref:`SASentry` elements that pertain to different samples 
  • 1dwg/trunk/doc/source/casestudy_collagen.rst

    r257 r261  
    3838                raw data file 
    3939                 
    40                 http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/examples/collagen/COLLAGEN.ASC 
     40                http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/COLLAGEN.ASC 
    4141 
    4242                .. rubric:: The header lines from *collagen.asc*: 
     
    5353                raw data file 
    5454                 
    55                 http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/examples/collagen/collagen.saxs 
     55                http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/collagen.saxs 
    5656         
    5757                .. rubric:: The header lines from *collagen.saxs*: 
     
    7979It is easiest to copy a template rather than start from an empty file. Copy the 
    8080:download:`cansas1d.xml <../../cansas1d.xml>` file  
    81 (http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xml) 
     81(http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xml) 
    8282into your working directory and rename it to  
    8383*collagen.xml*. 
     
    154154can be viewed through the TRAC repository: 
    155155 
    156         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cs_collagen_full.xml 
     156        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cs_collagen_full.xml 
    157157 
    158158Validate the file 
     
    169169All files are available at: 
    170170 
    171         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/examples/collagen/ 
     171        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/ 
  • 1dwg/trunk/doc/source/downloads.rst

    r251 r261  
    1313        Use this command to checkout the tagged release:: 
    1414 
    15                 svn checkout http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.0 cansas1dwg-1.0 
     15                svn checkout http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0 cansas1dwg-1.0 
    1616 
    1717Version 1.1 
     
    1919        Tickets closed: 17, 18, 20, 21, 22. 
    2020         
    21         See http://svn.smallangles.net/trac/canSAS/report/6?sort=ticket&asc=1 
     21        See http://svn.cansas.org/trac/canSAS/report/6?sort=ticket&asc=1 
    2222         
    2323        :: 
    2424         
    25                 svn checkout http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.1 cansas1dwg-1.1 
     25                svn checkout http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.1 cansas1dwg-1.1 
  • 1dwg/trunk/doc/source/element_SASdata.rst

    r257 r261  
    122122        then *Qdev* is not permitted to be used. 
    123123.. [#shadow] The *Shadowfactor* is used in data files from NIST/NCNR  
    124         instruments.  Contact NIST/NCNR for more information. 
     124        instruments.  See: J.G. Barker & J.S. Pedersen (1995) J. Appl. Cryst. 28, 105-114. 
  • 1dwg/trunk/doc/source/element_XML_header.rst

    r255 r261  
    2121        <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl"> 
    2222        <SASroot version="1.1" 
    23            xmlns="cansas1d/1.1" 
    24            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    25            xsi:schemaLocation="cansas1d/1.1  
    26            http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
     23                        xmlns="urn:cansas1d:1.1" 
     24                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     25                        xsi:schemaLocation="urn:cansas1d:1.1  
     26                                            http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
    2727 
    2828 
     
    6262       tags for this XML file.  This attribute has two  
    6363       strings within the quotations, separated by white  
    64        space.  The first string is the XML namespace,  
    65        repeated from above.  The second string is the name 
     64       space (a newline is acceptable).   
     65       The first string is the XML namespace,  
     66       repeated from above.  The second string is a suggested name 
    6667       of the XML Schema file.  Some XML support libraries  
    6768       will follow the URL shown here to retrieve the 
    68        XML Schema from the canSAS server but this behavior  
    69        is not guaranteed by the XML standard. 
     69       XML Schema from the canSAS server.  Since this behavior  
     70       is not guaranteed by the XML standard, don't count on it. 
    7071====== ======================================================== 
  • 1dwg/trunk/doc/source/examples.rst

    r249 r261  
    3636single data point has been shown to more clearly show the other structure. 
    3737The data file is actually an excerpt from the *bimodal-test1.xml* 
    38 (http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml) 
     38(http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml) 
    3939example file in the main distribution. 
    4040 
     
    6363 
    6464The example data file *cansas1d.xml*  
    65 (http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xml) 
     65(http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xml) 
    6666shows examples 
    6767of most of the elements of the cansas1d/1.1 standard.  Only a single data  
  • 1dwg/trunk/doc/source/index.rst

    r257 r261  
    1616Nomadic Small-Angle Scatterers) forum of users, software  
    1717developers, and facility staff was to discuss better sharing of SAS  
    18 data analysis software. The canSAS (http://www.smallangles.net/canSAS) identified that a  
     18data analysis software. The canSAS (http://www.cansas.org/canSAS) identified that a  
    1919significant need within the SAS community can be satisfied by a  
    2020robust, self-describing, text-based, standard format to communicate  
  • 1dwg/trunk/doc/source/overview.rst

    r257 r261  
    1414forum of users, software developers, and facility staff was to discuss 
    1515better sharing of SAS data analysis software. The canSAS forum  
    16 (http://www.smallangles.net/canSAS) 
     16(http://www.cansas.org/canSAS) 
    1717identified that a significant need within the SAS 
    1818community can be satisfied by a robust, self-describing, text-based, standard format to 
     
    6464are below. More discussion can be found on the 
    6565canSAS 1D Data Formats Working Group page  
    66 (http://www.smallangles.net/wgwiki/index.php/1D_Data_Formats_Working_Group)  
     66(http://www.cansas.org/wgwiki/index.php/1D_Data_Formats_Working_Group)  
    6767and its discussion page.   
    68 (http://www.smallangles.net/wgwiki/index.php/Talk:1D_Data_Formats_Working_Group) 
     68(http://www.cansas.org/wgwiki/index.php/Talk:1D_Data_Formats_Working_Group) 
    6969 
    7070        .. figure:: ../../graphics/10-minimum.png 
     
    9393                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    9494                xsi:schemaLocation="cansas1d/1.1 
    95                     http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     95                    http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    9696                > 
    9797 
     
    157157        successfully :ref:`validate <validate>` against the established XML Schema. 
    158158          
    159         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
     159        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
    160160#. :math:`Q=(4 \pi / \lambda) \sin(\theta)` 
    161161        where :math:`\lambda` is the wavelength of the radiation, 
     
    177177        ============   =================================================== 
    178178        um             micrometres 
    179         C              celsius 
    180         A              Angstroms 
     179        C              Celsius 
     180        A              Angstrom 
    181181        percent        % 
    182182        fraction       fraction 
     
    244244.. index:: ! xmlWriter 
    245245 
    246 The canSAS/xmlWriter (http://www.smallangles.net/canSAS/xmlWriter/) 
     246The canSAS/xmlWriter (http://www.cansas.org/canSAS/xmlWriter/) 
    247247is a WWW form 
    248248to translate three-column ASCII text data into the cansas1d/1.1 XML 
     
    273273 
    274274The *cansas1d.xsd* :index:`XML Schema`  
    275 (http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
     275(http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
    276276defines the rules for the XML file format and is used to 
    277277validate any XML file for adherence to the format. 
     
    280280                (view source code highlighted by bug tracking system) 
    281281                 
    282                 http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
     282                http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
    283283 
    284284        SVN  
    285285                (view raw source code from version control system) 
    286286                 
    287                 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd 
     287                http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd 
    288288 
    289289XML stylesheets 
     
    294294or to convert into another file format. The 
    295295default canSAS stylesheet *cansasxml-html.xsl* 
    296 (http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansasxml-html.xsl) 
     296(http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansasxml-html.xsl) 
    297297should be copied into each folder with canSAS XML data 
    298298file(s). It can be used to display the data in a supporting WWW browser 
     
    345345 
    346346**Basic example**  
    347         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xml 
     347        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xml 
    348348         
    349349    Note that, for clarity, only one row of data is 
     
    355355 
    356356**Bimodal test data** 
    357         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml 
     357        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml 
    358358 
    359359    Simulated SAS data (with added noise) calculated from model bimodal size  
     
    364364 
    365365**Glassy Carbon Round Robin** 
    366         http://www.smallangles.net/wgwiki/index.php/Glassy_Carbon_Round_Robin 
     366        http://www.cansas.org/wgwiki/index.php/Glassy_Carbon_Round_Robin 
    367367 
    368368    Samples of a commercial glassy carbon 
     
    387387        sample), the files can be viewed from the TRAC site (no description yet). 
    388388         
    389         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/examples/af1410/ 
     389        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/af1410/ 
    390390 
    391391.. index:: XML file; cansas1d-template.xml 
    392392 
    393393**Test all the cansas1d/1.1 rules** 
    394         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d-template.xml 
     394        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d-template.xml 
    395395         
    396396    The *cansas1d-template.xml* data file is used to test all the rules in the XML 
     
    424424        ISIS LOQ SANS instrument:  
    425425         
    426         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/W1W2.XML 
     426        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/W1W2.XML 
    427427 
    428428.. index:: XML file; cs_af1410.xml 
     
    431431        AF1410 steel SANS contrast variation study from NIST: 
    432432         
    433         http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/examples/af1410/cs_af1410.xml 
     433        http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/af1410/cs_af1410.xml 
    434434         
    435435    SANS study using magnetic 
     
    453453 
    454454There is an example that demonstrates the use of a foreign namespace: 
    455 http://svn.smallangles.net/trac/canSAS/browser/1dwg/data/Glassy%20Carbon/ISIS/GLASSYC_C4G8G9_withTL.xml 
     455http://svn.cansas.org/trac/canSAS/browser/1dwg/data/Glassy%20Carbon/ISIS/GLASSYC_C4G8G9_withTL.xml 
    456456 
    457457This example uses a foreign namespace to record the transmission spectrum related to 
     
    465465 
    466466Also refer to canSAS TRAC ticket #47 
    467 (http://svn.smallangles.net/trac/canSAS/changeset/47) 
     467(http://svn.cansas.org/trac/canSAS/changeset/47) 
    468468for an example of arranging the content in  
    469469*SASprocessnote* to avoid the use of foreign namespace 
     
    503503**Microsoft Excel** 
    504504        Support for Microsoft Excel is provided through the default canSAS stylesheet, 
    505         *cansasxml-html.xsl* (http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansasxml-html.xsl). 
     505        *cansasxml-html.xsl* (http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansasxml-html.xsl). 
    506506        The ISIS **LOQ** instrument (http://www.isis.stfc.ac.uk/instruments/loq/loq2470.html) 
    507507        has provided an excellent description of how to import data from the cansas1d/1.1 format into Excel. 
     
    517517        See the :ref:`PHP.binding` section. 
    518518         
    519         The *canSAS/xmlWriter* (http://www.smallangles.net/canSAS/xmlWriter/) 
     519        The *canSAS/xmlWriter* (http://www.cansas.org/canSAS/xmlWriter/) 
    520520        is implemented in PHP (http://www.php.net) and writes a cansas1d/1.1 data  
    521521        file given three-column ASCII data as input.  The code uses 
     
    529529        logging information is inserted into an XML file. 
    530530         
    531         PHP source: http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/php/xmlWriter/index.php 
     531        PHP source: http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/php/xmlWriter/index.php 
    532532 
    533533.. index:: 
     
    551551 
    552552TRAC (bug reporting) 
    553         http://svn.smallangles.net/trac/canSAS/browser/1dwg/tags/v1.1 
     553        http://svn.cansas.org/trac/canSAS/browser/1dwg/tags/v1.1 
    554554 
    555555SVN (*subversion* revision control system) 
    556         http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.1 
     556        http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.1 
  • 1dwg/trunk/doc/source/preface.rst

    r257 r261  
    3232established at the canSAS-V workshop, NIST, Gaithersburg, Maryland,  
    3333USA from October 29th to 31st 2007, which produced revision 1.0. 
    34 A second workshop was held July 28th to 31st at Uppsala University,  
     34A further workshop was held July 28th to 31st, 2012 at Uppsala University,  
    3535Uppsala, Sweden which produced revision 1.1. 
    3636The format derives many of its foundations 
     
    4343 
    4444Home: 
    45         http://www.smallangles.net/wgwiki/index.php/1D_Data_Formats_Working_Group 
     45        http://www.cansas.org/wgwiki/index.php/1D_Data_Formats_Working_Group 
    4646Discussion: 
    47         http://www.smallangles.net/wgwiki/index.php/Talk:1D_Data_Formats_Working_Group 
     47        http://www.cansas.org/wgwiki/index.php/Talk:1D_Data_Formats_Working_Group 
    4848 
    4949----------------- 
     
    5656However, should the information in this document and the  
    5757cansas1d/1.1 SAS XML Schema differ,  
    58 (http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd)  
     58(http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd)  
    5959the XML Schema will be deemed to have the most correct description of the standard. 
  • 1dwg/trunk/doc/source/specification.rst

    r255 r261  
    3131(including the use of closing tags).  [#]_ 
    3232Files that can be validated  against :ref:`cansas1d.xsd` 
    33 (http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
     33(http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
    3434are deemed to be valid cansas1d/1.1 data files. 
    3535 
  • 1dwg/trunk/doc/source/validation.rst

    r244 r261  
    1818        and press ``<continue validation>`` 
    1919         
    20         (http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd) 
     20        (http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd) 
    2121#. check the results 
  • 1dwg/trunk/gc14-dls-i22.xml

    r233 r261  
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    33<SASroot version="1.1" 
    4         xmlns="cansas1d/1.1" 
     4                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/s81-polyurea.xml

    r233 r261  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot xmlns="cansas1d/1.1" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="cansas1d/1.1    http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
     3<SASroot version="1.1" 
     4                xmlns="urn:cansas1d:1.1" 
     5                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     7                > 
    48  <!--created by CS_XML_Indra.ipf--> 
    59  <!--exported from IgorPro::Indra--> 
Note: See TracChangeset for help on using the changeset viewer.