DO NOT MERGE YET: Removal of DECLARATION and OUTPUT parameters

doc/ESS-source/instruments/mcstas-1.12c/Brilliance_monitor.comp

@@ -55,7 +55,7 @@
 * tofcuts:   Flag to generate TOF-distributions as function of wavelength (1)
 * toflambda: Flag to generate TOF-lambda distribution output ´ (1)
 * 
-* OUTPUT PARAMETERS:
+* CALCULATED PARAMETERS:
 *
 * Div_N:    Array of neutron counts
 * Div_p:    Array of neutron weight counts

doc/ESS-source/instruments/mcstas-2.0/Brilliance_monitor.comp

@@ -55,7 +55,7 @@
 * tofcuts:   Flag to generate TOF-distributions as function of wavelength (1)
 * toflambda: Flag to generate TOF-lambda distribution output ´ (1)
 * 
-* OUTPUT PARAMETERS:
+* CALCULATED PARAMETERS:
 *
 * Div_N:    Array of neutron counts
 * Div_p:    Array of neutron weight counts

doc/ESS-source/instruments/mcstas-2.0a-updated-src/Brilliance_monitor.comp

@@ -55,7 +55,7 @@
 * tofcuts:   Flag to generate TOF-distributions as function of wavelength (1)
 * toflambda: Flag to generate TOF-lambda distribution output ´ (1)
 * 
-* OUTPUT PARAMETERS:
+* CALCULATED PARAMETERS:
 *
 * Div_N:    Array of neutron counts
 * Div_p:    Array of neutron weight counts

doc/ESS-source/instruments/mcstas-2.1/Brilliance_monitor.comp

@@ -55,7 +55,7 @@
 * tofcuts:   Flag to generate TOF-distributions as function of wavelength (1)
 * toflambda: Flag to generate TOF-lambda distribution output ´ (1)
 * 
-* OUTPUT PARAMETERS:
+* CALCULATED PARAMETERS:
 *
 * Div_N:    Array of neutron counts
 * Div_p:    Array of neutron weight counts

mcstas-comps/contrib/Al_window.comp

@@ -38,9 +38,9 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Al_window
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (thickness=0.001)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 SHARE
 %{

mcstas-comps/contrib/CavitiesIn.comp

@@ -34,10 +34,10 @@
 
 DEFINE COMPONENT CavitiesIn
 
-DEFINITION PARAMETERS ()
+
 
 SETTING PARAMETERS (xw=0.05, yw=0.05, xc=1, yc=1)
-OUTPUT PARAMETERS()
+
 
 DECLARE
 %{

mcstas-comps/contrib/CavitiesOut.comp

@@ -34,9 +34,9 @@
 
 
 DEFINE COMPONENT CavitiesOut
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (xw=0.05, yw=0.05, xc=1, yc=1)
-OUTPUT PARAMETERS()
+
 
 DECLARE
 %{

mcstas-comps/contrib/Collimator_ROC.comp

@@ -57,10 +57,10 @@
 
 
 DEFINE COMPONENT Collimator_ROC
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (ROC_pitch=1, ROC_ri=0.4, ROC_ro=1.2, ROC_h=0.153,
 ROC_ttmin=0, ROC_ttmax=100, ROC_sign=1)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 INITIALIZE
 %{

mcstas-comps/contrib/Conics_EH.comp

@@ -45,12 +45,11 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Conics_EH
-DEFINITION PARAMETERS()
+
 SETTING PARAMETERS (
     rmin=0.0031416, rmax=0.05236,focal_length_u=10, focal_length_d=10, le=0.25, lh=0.25,
     int nshells=4, m=1, mirr_thick=0, int disk=1, vector radii=NULL,
     R0 = 0.99, Qc = 0.021, W = 0.003, alpha = 6.07, transmit = 0)
-OUTPUT PARAMETERS(pTable, transmit, s)
 
 SHARE
 %{

mcstas-comps/contrib/Conics_HE.comp

@@ -45,12 +45,11 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Conics_HE
-DEFINITION PARAMETERS()
+
 SETTING PARAMETERS (
     rmin=0.0031416, rmax=0.05236,focal_length_u=10, focal_length_d=10, le=0.25, lh=0.25,
     int nshells=4, m=1, mirr_thick=0, int disk=1, vector radii=NULL,
     R0 = 0.99, Qc = 0.021, W = 0.003, alpha = 6.07, transmit = 0)
-OUTPUT PARAMETERS(pTable, transmit, s)
 
 SHARE
 %{

mcstas-comps/contrib/Conics_PH.comp

@@ -43,12 +43,11 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Conics_PH
-DEFINITION PARAMETERS()
+
 SETTING PARAMETERS (
     rmin=0.65/2.0,rmax=1.23/2.0, focal_length=10.070, lp=0.84, lh=0.84,
     int nshells=4, m=1, mirr_thick=0, int disk=1, vector radii=NULL,
     R0 = 0.99, Qc = 0.021, W = 0.003, alpha = 6.07, transmit = 0)
-OUTPUT PARAMETERS(pTable, s)
 
 SHARE
 %{

mcstas-comps/contrib/Conics_PP.comp

@@ -45,12 +45,11 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Conics_PP
-DEFINITION PARAMETERS()
+
 SETTING PARAMETERS (
     rmin=0.0031416, rmax=0.05236, focal_length_u=10.070, focal_length_d=10.070, lp1=0.84, lp2=0.84,
     int nshells=4, m=1, mirr_thick=0, int disk=1, vector radii=NULL,
     R0 = 0.99, Qc = 0.021, W = 0.003, alpha = 6.07, transmit = 0)
-OUTPUT PARAMETERS(pTable, s)
 
 SHARE
 %{

mcstas-comps/contrib/E_4PI.comp

@@ -28,7 +28,7 @@
 * filename: [string] Name of file in which to store the output data
 * restore_neutron: [1] If set, the monitor does not influence the neutron state
 *
-* OUTPUT PARAMETERS:
+* CALCULATED PARAMETERS:
 *
 * PSD_N:    Array of neutron counts
 * PSD_p:    Array of neutron weight counts
@@ -43,10 +43,8 @@
 
 
 DEFINE COMPONENT E_4PI
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (int ne=50, Emin=0, Emax=5, string filename=0, radius=1, restore_neutron=0)
-OUTPUT PARAMETERS (PSD_N, PSD_p, PSD_p2)
-/* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */ 
 
 DECLARE
 %{

mcstas-comps/contrib/Exact_radial_coll.comp

@@ -47,11 +47,11 @@
 
 
 DEFINE COMPONENT Exact_radial_coll
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (theta_min=-5, theta_max=5, nslit=100,
 radius=1.0, length=.5, h_in=.3, h_out=.4,
 d=0.0001, verbose=0)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 DECLARE
 %{

mcstas-comps/contrib/FermiChopper_ILL.comp

@@ -87,12 +87,12 @@
 */
 
 DEFINE COMPONENT FermiChopper_ILL
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (phase=0, radius=0.04, nu=100,
 yheight=0.08, w=0.00022475, nslit=200.0, R0=0.0,
 Qc=0.02176, alpha=2.33, m=0.0, W=2e-3, length=0.012, eff=0.95,
 zero_time=0, xwidth=0, verbose=0)
-OUTPUT PARAMETERS()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 SHARE
 %{

mcstas-comps/contrib/Fermi_chop2a.comp

@@ -32,10 +32,9 @@
 * %End
 *******************************************************************/
 DEFINE COMPONENT Fermi_chop2a
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (len, w, nu, delta, tc, ymin, ymax, nchan, bw, blader)
-OUTPUT PARAMETERS (omega, r_blade, x_width, nn, tdr)
-/*STATE PARAMETERS (x, y, z, vx, vy, vz, t, s1, s2, p)*/
+
 SHARE
 %{
 #ifndef FERMI_CHOP_DEFS

mcstas-comps/contrib/Filter_graphite.comp

@@ -43,9 +43,9 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Filter_graphite
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (xmin=-0.16, xmax=0.16, ymin=-0.16, ymax=0.16, length=0.05, xwidth=0, yheight=0)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 INITIALIZE
 %{

mcstas-comps/contrib/FlatEllipse_finite_mirror.comp

@@ -53,7 +53,6 @@ SETTING PARAMETERS (
     doubleReflections = 0, //can neutrons be reflected from the backside of a mirror
     string rfront_inner_file = "NULL"//file name of the file providing the distances to the optical axis of the mirrors at the entrance, lStart, of the respective mirror
 )
-OUTPUT PARAMETERS(s, pTable, R0, Qc, W, alpha, transmit)
 
 
 SHARE

mcstas-comps/contrib/Foil_flipper_magnet.comp

@@ -54,10 +54,8 @@ This comment will not be exported to mcdoc
 */
 
 DEFINE COMPONENT Foil_flipper_magnet
-DEFINITION PARAMETERS()
+
 SETTING PARAMETERS(stray_field=1,xwidth, yheight, zdepth, Bxwidth=-1, Byheight=-1, Bzdepth=-1, phi=0.0, foilthick=0.0, Bx,By,Bz,foil_in=1, verbose=0)
-OUTPUT PARAMETERS(instray_magnet,outstray_magnet,inside_magnet,hit_foil)
-//STATE PARAMETERS (x,y,z,vx,vy,vz,t,sx,sy,sz,p)
 
 SHARE
 %{

mcstas-comps/contrib/GISANS_sample.comp

@@ -68,7 +68,7 @@
 *******************************************************************************/
 
 DEFINE COMPONENT GISANS_sample
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (xwidth=0.05, yheight=0.15, zsapph=0.02, zsamp=0.002, zsampsurf=0.000001, zsilicon=0.02, zsiliconsurf=5e-9,
 rhosapph=5.773e-6,       abslensapph=163.708,       inclensapph=49.815,
 rhoD2O=6.364e-6,         abslenD2O=44066.347,       inclenD2O=7.258,
@@ -77,7 +77,7 @@ rhosiliconsurf=4.123e-6, abslensiliconsurf=401.051, inclensiliconsurf=169.11,
 rhosilicon=2.079e-6,     abslensilicon=209.919,     inclensilicon=9901.6,
 phiPS = 0.1, Rad = 370.0, phirot=0.0, sc_aim=0.98, sans_aim=0.98
 )
-OUTPUT PARAMETERS ()
+
 
 SHARE
 %{

mcstas-comps/contrib/Guide_anyshape_r.comp

@@ -58,7 +58,7 @@
 * W: [AA-1]                    Width of supermirror cut-off
 * transmit: [1]                When true, non reflected neutrons are transmitted through the surfaces, instead of being absorbed. No material absorption is taken into account though
 *
-* OUTPUT PARAMETERS:
+* CALCULATED PARAMETERS:
 * SCATTERED: []                number of reflected events
 *
 * %D
@@ -77,10 +77,10 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Guide_anyshape_r
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (xwidth=0, yheight=0, zdepth=0, center=0, transmit=0,
 R0=0.99, Qc=0.0219, alpha=0, m=0, W=0, string geometry=0)
-OUTPUT PARAMETERS ()
+
 DEPENDENCY " -DUSE_OFF "
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 

mcstas-comps/contrib/Guide_curved.comp

@@ -46,9 +46,9 @@
 * %E
 *******************************************************************************/
 DEFINE COMPONENT Guide_curved
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (w1, h1, l, R0=0.995, Qc=0.0218, alpha=4.38, m=2, W=0.003, curvature=2700)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 SHARE
 %{

mcstas-comps/contrib/Guide_four_side.comp

@@ -271,7 +271,7 @@
 ******************************************************************************/
 
 DEFINE COMPONENT Guide_four_side
-DEFINITION PARAMETERS()
+
 SETTING PARAMETERS (string RIreflect=0, string LIreflect=0, string UIreflect=0, string DIreflect=0,
 		    string ROreflect=0, string LOreflect=0, string UOreflect=0, string DOreflect=0,
 		    w1l=0.002,w2l=0.002,linwl=0,loutwl=0,
@@ -288,7 +288,7 @@ SETTING PARAMETERS (string RIreflect=0, string LIreflect=0, string UIreflect=0,
                     WxrOW=0.003,WxlOW=0.003,WyuOW=0.003,WydOW=0.003,
                     mxrOW=0, mxlOW=0, myuOW=0, mydOW=0,
 		    rwallthick=0.001,lwallthick=0.001,uwallthick=0.001,dwallthick=0.001)
-OUTPUT PARAMETERS()
+
 
 SHARE
 %{	

mcstas-comps/contrib/Guide_gravity_psd.comp

@@ -120,7 +120,7 @@
 
 DEFINE COMPONENT Guide_gravity_psd
 
-DEFINITION PARAMETERS ()
+
 
 SETTING PARAMETERS (nxpsd,
   string filenameT, string filenameB, string filenameL, string filenameR,
@@ -132,7 +132,7 @@ SETTING PARAMETERS (nxpsd,
   chamfers=0, chamfers_z=0, chamfers_lr=0, chamfers_tb=0, nelements=1,
   nu=0, phase=0, string reflect="NULL")
 
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 
 SHARE

mcstas-comps/contrib/Guide_honeycomb.comp

@@ -70,11 +70,11 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Guide_honeycomb
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (w1, w2=0, l,
 R0=0.995, Qc=0.0218, alpha=4.38, m=1.0, W=0.003, nslit=1, d=0.0005,
 mleftup=-1, mrightup=-1, mleftdown=-1, mrightdown=-1,mleft=-1, mright=-1, G=0)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 SHARE
 %{

mcstas-comps/contrib/Guide_m.comp

@@ -88,9 +88,9 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Guide_m
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (string reflect=0, w1, h1, w2, h2, l, R0_left=0.99, R0_right=0.99, R0_top=0.99, R0_bottom=0.99, Qc_left=0.0219, Qc_right=0.0219, Qc_top=0.0219, Qc_bottom=0.0219, alpha_left=6.07, alpha_right=6.07, alpha_top=6.07, alpha_bottom=6.07, m_left=2, m_right=2, m_top=2, m_bottom=2, W_left=0.003, W_right=0.003 , W_top=0.003 , W_bottom=0.003)
-OUTPUT PARAMETERS ()
+
 
 
 SHARE

mcstas-comps/contrib/Guide_multichannel.comp

@@ -85,7 +85,7 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Guide_multichannel
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (w1, h1, w2=0, h2=0, l,
   R0=0.995, Qc=0, alpha=0, m=0, int nslit=1, dlam=0.0005,
   Qcx=0.0218, Qcy=0.0218, alphax=4.38, alphay=4.38, W=0.003, mx=1, my=1, string mater="absorb")

mcstas-comps/contrib/ISIS_moderator.comp

@@ -53,10 +53,10 @@
  *******************************************************************************/
 
 DEFINE COMPONENT ISIS_moderator
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (string Face="hydrogen", Emin = 49.0,Emax = 51.0, dist = 1.0, focus_xw = 0.01,
 focus_yh = 0.01, xwidth = 0.074, yheight = 0.074, CAngle = 0.0,SAC= 1, Lmin=0, Lmax=0, int target_index=+1, verbose=0)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 
 SHARE

mcstas-comps/contrib/Lens.comp

@@ -110,13 +110,13 @@
 *******************************************************************************/
 
 DEFINE COMPONENT Lens
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (r1=0,r2=0,focus1=0,focus2=0,phiy1=0,phiy2=0,
 thickness=0.001,radius=0.015,
 sigma_coh=11.74,sigma_inc=0.0816,sigma_abs=0.0822,
 density=3.148,weight=62.3018,
 p_interact=0.1,focus_aw=10,focus_ah=10,RMS=0, string geometry=0)
-OUTPUT PARAMETERS ()
+
 /* Neutron parameters: (x,y,z,vx,vy,vz,t,sx,sy,sz,p) */
 
 SHARE

mcstas-comps/contrib/Lens_simple.comp

@@ -67,7 +67,7 @@
 
 
 DEFINE COMPONENT Lens_simple
-DEFINITION PARAMETERS ()
+
 SETTING PARAMETERS (rho=5.16e14, Rc=0.02, Nl=7.0, parab=1.1,
 xmin=0, xmax=0, ymin=0, ymax=0, radius=0,
 SigmaAL=0.141, d0=0.002)