Merge pull request #114 from JeffersonLab/run_number_info_rtj

Run number info rtj

test/control.in

@@ -20,7 +20,29 @@ c reached before the event count specified in card TRIG is exhausted then the
 c processing will stop at the end of file.
 cINFILE 'bggen.hddm'
 TRIG 1000000
-RUNG 9001
+
+c The RUNG card is one of the ways to set the run number that is written to
+c the output events. The simulation run number determines which geometry and
+c magnetic field settings are used in the simulation, and also a variety of
+c detector readout and digitization parameters that are read from ccdb.
+c The simulation run number is selected according to the following rules:
+c  1) if it is specified on the command line with the -r <run_number> option
+c     then this <run_number> overrides all other sources;
+c  2) if is it specified in this control.in file on a line starting with the
+c     letters runno or RUNNO then the second field in that line is interpreted
+c     as an unsigned integer and assigned as the simulation run number;
+c  3) if there is no RUNNO line in control.in but there is a line starting
+c     with rung or RUNG then the second field on the RUNG line is taken
+c     as the simulation run number and written to the output events;
+c  4) if there is no RUNNO or RUNG card in control.in but there is an
+c     external input event file specified by a line starting with INFI[le]
+c     then the run number that is written in the input events in that input
+c     file is carried over to the simulation output events, and used by the
+c     simulation;
+c  5) if none of the above conditions is met then the simulation run number
+c     is taken to be zero. Normally this is not considered valid, and a
+c     warning message is printed at startup.
+RUNG 51500
 
 c The BEAM card configures the built-in coherent bremsstralung photon
 c beam generator in HDGeant.  If the INFILE card is not present and BEAM
@@ -30,17 +52,20 @@ c event source is the external Monte Carlo generator that produced the file,
 c but the BEAM card may still be present, and it is needed if beam-related
 c backgrounds are being superimposed on top of the primary event signals,
 c as requested with the BGRATE card (see below).  The beam card accepts
-c the following five parameters.  
+c the following parameters.  
 c      Emax   - end-point energy of the electron beam (GeV)
 c      Epeak  - energy of the primary coherent peak edge (GeV)
 c      Emin   - minimum energy of the coherent bremsstrahlung beam (GeV)
 c      collz  - z position of collimator in m
 c      colld  - diameter of collimator in m 
 c      Eemit  - electron beam emittance in m.rad
 c      radthick - dimaond radiator thickneess in m
+c      spotRMS - virtual spot rms size at the collimator (m)
+c      spotX - x offset of virtual spot from collimator axis (m)
+c      spotY - y offset of virtual spot from collimator axis (m)
 c Omitting the final parameter Emin results in the default value being used.
 c Setting Epeak to zero selects an amorphous radiator instead of diamond.
-cBEAM 12. 9.0 0.0012 76.00 0.005 10.e-9 20.e-6
+cBEAM 12. 9.0 0.0012 76.00 0.005 10.e-9 20.e-6 1e-3 -0.0 +0.0
 
 c The GENBEAM card configures the simulation program to act purely as a
 c Monte Carlo event generator, and not to actually track any of the particles
@@ -139,7 +164,7 @@ c by SCAP. Note that this only affects the particle gun. Events read
 c from a file contain their own vertex information.
 c
 c            vertex_extent_r  vertex_extent_z
-TGTWIDTH           0.5              15
+TGTWIDTH           0.5              29.5
 
 c If you specify a non-zero value for vertex_x and/or vertex_y above then
 c all tracks will emerge from the given point.  If you leave them at zero,
@@ -182,8 +207,8 @@ c     below, and remove any characters before the BGRATE keyword. You are
 c     now ready to go. If you ever change anything in the beamline geometry
 c     eg. the collimator diameter, the coherent edge position, or the value
 c     of beamEmin, do not forget to come back and change your BGRATE.
-BGGATE -200. 200.
-BGRATE 4.80
+cBGGATE -200. 200.
+cBGRATE 2.67
 
 c The above cards BGRATE, BGGATE normally cause the simulation to add
 c accidental tagger hits to the simulated output record, in addition to
@@ -388,7 +413,7 @@ c similarly named configuration parameters used in the reconstruction,
 c the difference being that underscores are not allowed here. To
 c specify the values to the reconstruction code used here, use the
 c -PBFIELD_TYPE=CalibDB and -PBFIELD_MAP=Magnets/Solenoid/solenoid_1500
-BFIELDMAP 'Magnets/Solenoid/solenoid_1200A_poisson_20140520'
+cBFIELDMAP 'Magnets/Solenoid/solenoid_1200A_poisson_20140520'
 cBFIELDTYPE 'NoField'
 
 c The pair spectrometer magnetic field map can also be accessed through the
@@ -399,7 +424,7 @@ c supported values for PSBFIELDTYPE. To specify the values used here to
 c the reconstruction code, use options -PPSBFIELD_TYPE=CalibDB and 
 c -PPSBFIELD_MAP=Magnets/PairSpectrometer/PS_1.8T_20150513_test
 c on the jana command line.
-PSBFIELDMAP 'Magnets/PairSpectrometer/PS_1.8T_20150513_test'
+cPSBFIELDMAP 'Magnets/PairSpectrometer/PS_1.8T_20150513_test'
 cPSBFIELDTYPE 'Const'
 
 c Use this card to enable/disable ( SAVEHITS  1/0 ) writing events with no