Ignore:
Timestamp:
Sep 30, 2010, 2:47:17 PM (15 years ago)
Author:
garnier
Message:

tag geant4.9.4 beta 1 + modifs locales

Location:
trunk/examples/extended/analysis/A01
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/analysis/A01/History

    r807 r1337  
    1 $Id: History,v 1.43 2007/05/17 09:55:13 duns Exp $
     1$Id: History,v 1.50 2010/06/06 04:21:04 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1111
    1212--------------------------------------------------------------------------- 
     13
     144 June 2010  Joseph Perl (exampleA01-V09-03-00)
     15- Updated vis usage.
     16
     172 Dec 2009  Joseph Perl (exampleA01-V09-02-02)
     18- A01MuonPhysics: change hMultipleScattering to MuMultipleScattering.
     19
     2020 Mov 2009  Joseph Perl (exampleA01-V09-02-01)
     21- A01DetectorConstruction, A01MagneticField: improve handing of field.
     22  Resolves bug 1012.
     23- A01Trajectory: removed.  Example uses G4Trajectory.
     24- Update to new multiple scattering classes.
     25- README: General update.
     26          Remove references to obsolete SLAC Geant4 tutorial CD.
     27
     2814 Mov 2009  John Allison (exampleA01-V09-02-00)
     29- A01app.cc: Introduced G4UIExecutive.
     30
     315 March 2009 Guy Barrand
     32- GNUmakefile : remove the G4ANALYSIS_USE logic found in this file, since
     33  it is handled already in the config/analysis.gmk.
     34  This avoids a duplication in the compilation and link commands
     35  of the aida-config options.
     36
    133717 May 2007 - Mark Donszelmann (exampleA01-V08-03-01)
    1438- Fixed memory leak for plotter

  • trunk/examples/extended/analysis/A01/README

    r807 r1337  
    1 $Id: README,v 1.9 2005/06/01 18:10:15 duns Exp $
     1$Id: README,v 1.10 2009/11/21 00:22:55 perl Exp $
    22
    33    =========================================================
    … …  
    1010  Example A01 implements a double-arm spectrometer with wire chambers,
    1111  hodoscopes and calorimeters.  Event simulation and collection are
    12   enabled, as well as event display and analysis.  This example is
    13   extensively documented on the Geant4 Workshop Tutorial CD available at:
    14   http://geant4.slac.stanford.edu/g4cd/Welcome.html
     12  enabled, as well as event display and analysis.
    1513
    1614
    … …  
    7270
    7371
    74 
    75 
    7672  3. EVENT:
    7773
    … …  
    130126  5. VISUALIZATION:
    131127 
    132      Simulated events can be displayed on top of a representation of
    133      the spectrometer.
     128     Simulated events can be displayed on top of a representation of the spectrometer.
    134129
    135      vis.mac outputs HepRep version 1 files suitable for viewing in WIRED.
     130     vis.mac outputs HepRep version 1 files suitable for viewing in HepRApp or WIRED4.
    136131     Change the /vis/open line from HepRepFile to DAWNFILE to instead
    137132     make .prim files suitable for viewing in DAWN.
    138133
    139134     heprep2-000-gz.mac outputs a series of gzipped HepRep version 2 files
    140      each containing a single event, suitable for viewing in WIRED (there
    141      is no need to ungzip them since WIRED can do this itself).
     135     each containing a single event, suitable for viewing in HepRApp or WIRED4
    142136
    143137     heprep2zip.mac outputs a single zip file that unzips to a series of
    144138     HepRep version 2 files, each each containing a single event (unzip
    145      the single file by hand, then view the resulting individial HepRep
    146      files in WIRED 3).
     139     the single file by hand, then view the resulting individial HepRep files).
    147140
    148141     heprep2-000-zip.mac outputs a series of zipped HepRep version 2 files
    149      each containing a single event (not yet viewable in WIRED unless you
     142     each containing a single event (not yet viewable unless you
    150143     explicitly unzip them before viewing).
    151144
    152145     heprep2.mac outputs a HepRep version 2 file with multiple events
    153      appended to a single file in an experimental manner (not yet viewable
    154      in WIRED).
     146     appended to a single file in an experimental manner
    155147
    156148     heprep2gz.mac outputs a HepRep version 2 file with multiple events
    157      appended to a single file in an experimental manner (not yet viewable
    158      in WIRED).
     149     appended to a single file in an experimental manner
    159150
    160151     Any of the heprep mac files above with the name bheprep (for instance
    161      bheprep2zip.mac) will write a Binary HepRep version 2 file, readable
    162      by WIRED 4.
    163      
    164      WIRED 4 can read Binary HepRep and XML HepRep version 2 files without
    165      the need for manual unzipping.
     152     bheprep2zip.mac) will write a Binary HepRep version 2 file, readable only
     153     by WIRED4 (not by HepRApp).
    166154
    167      For more information on visualization with this A01 example,
    168      see the visualization tutorials on the Geant4 Workshop Tutorial CD
    169      available at:
    170      http://geant4.slac.stanford.edu/g4cd/Welcome.html
    171155
    172156  6. ANALYSIS:
    173157
    174158     This example implements an AIDA-compliant analysis system which
    175      creates histograms, ntuples and plotters.  At the completion of a
    176      simulation run a file A01.aida is produced which contains these
    177      data structures.  This file can be used as an input to the Java
    178      Analysis Studio (JAS) which allows the histograms and ntuples to
    179      examined, manipulated, saved and printed.  For further details,
    180      see README.JAIDA.
    181 
    182 
    183   7. GETTING STARTED:
    184 
    185      Build the A01 executable:
    186 
    187          cd to A01
    188          gmake clean
    189          gmake
    190 
    191      gmake will create tmp and bin directories in your work directory.
    192      The executable, named A01app, will be in /bin/$G4SYSTEM/
    193  
    194      While in directory A01, run the executable:
    195 
    196          ../bin/$G4SYSTEM/A01app
    197 
    198      which will bring up the interactive prompt:
    199 
    200          Idle>
    201 
    202      To run 10 events you can now enter:
    203 
    204          /run/beamOn 10
    205 
    206      If all goes well, a JAS window will appear containing two histograms
    207      and three scatterplots.
    208 
    209      To terminate the job, at the prompt enter:
    210 
    211          exit
    212 
    213      Currently you must also close the JAS-AIDA window to get the job to stop.
    214 
    215 
    216      In the A01 directory will be a file A01.aida which contains the plots.
    217      To examine them
    218 
    219          /usr/local.bin/jas3 & or jas3 &
     159     creates histograms, ntuples and plotters.  If you have built Geant4 with
     160     the option to use anlaysis (answering yes to the appropriate question in
     161     ./Configure -build), then at the completion of a simulation run,
     162     a file A01.aida is produced which contains these data structures.
     163     This file can be used as an input to the Java Analysis Studio (JAS) which allows
     164     the histograms and ntuples to examined, manipulated, saved and printed.
     165     For further details, see README.JAIDA.

  • trunk/examples/extended/analysis/A01/include/A01DetectorConstruction.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01DetectorConstruction.hh,v 1.5 2006/06/29 16:30:50 gunter Exp $
     26// $Id: A01DetectorConstruction.hh,v 1.6 2009/11/21 00:22:55 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    3434#include "G4VUserDetectorConstruction.hh"
    3535#include "G4RotationMatrix.hh"
     36#include "G4FieldManager.hh"
    3637
    3738class G4VPhysicalVolume;
    … …  
    6162    A01DetectorConstMessenger* messenger;
    6263    A01MagneticField* magneticField;
     64    G4FieldManager* fieldMgr;
    6365
    6466    G4Material* air;

  • trunk/examples/extended/analysis/A01/include/A01EMPhysics.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01EMPhysics.hh,v 1.6 2006/06/29 16:30:58 gunter Exp $
     26// $Id: A01EMPhysics.hh,v 1.7 2009/11/21 01:00:19 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    4141#include "G4ComptonScattering.hh"
    4242#include "G4GammaConversion.hh"
    43 #include "G4MultipleScattering.hh"
     43#include "G4eMultipleScattering.hh"
    4444#include "G4eIonisation.hh"
    4545#include "G4eBremsstrahlung.hh"

  • trunk/examples/extended/analysis/A01/include/A01HadronPhysics.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01HadronPhysics.hh,v 1.6 2006/06/29 16:31:14 gunter Exp $
     26// $Id: A01HadronPhysics.hh,v 1.7 2009/11/21 01:00:19 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    3636
    3737#include "G4VPhysicsConstructor.hh"
    38 #include "G4MultipleScattering.hh"
     38#include "G4hMultipleScattering.hh"
    3939#include "G4hIonisation.hh"
    4040

  • trunk/examples/extended/analysis/A01/include/A01IonPhysics.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01IonPhysics.hh,v 1.7 2006/06/29 16:31:22 gunter Exp $
     26// $Id: A01IonPhysics.hh,v 1.8 2009/11/21 01:00:19 perl Exp $
    2727// --------------------------------------------------------------
    2828// 05-Jan-2004 Add G4ionIonisation T. Koi
    … …  
    5151#include "G4hIonisation.hh"
    5252#include "G4ionIonisation.hh"
    53 #include "G4MultipleScattering.hh"
     53#include "G4hMultipleScattering.hh"
    5454
    5555class A01IonPhysics : public G4VPhysicsConstructor

  • trunk/examples/extended/analysis/A01/include/A01MagneticField.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01MagneticField.hh,v 1.4 2006/06/29 16:31:27 gunter Exp $
     26// $Id: A01MagneticField.hh,v 1.5 2009/11/21 00:22:55 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    4141    ~A01MagneticField();
    4242
    43     virtual void GetFieldValue( const  double Point[3],
    44                                double *Bfield ) const;
     43    virtual void GetFieldValue(const G4double Point[4],double *Bfield ) const;
    4544
    4645  private:
    4746    A01MagneticFieldMessenger* messenger;
    4847    G4double By;
    49     G4double rmax_sq;
    50     G4double ymax;
    51 
     48   
    5249  public:
    5350    inline void SetField(G4double val) { By = val; }

  • trunk/examples/extended/analysis/A01/include/A01MuonPhysics.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01MuonPhysics.hh,v 1.6 2006/06/29 16:31:31 gunter Exp $
     26// $Id: A01MuonPhysics.hh,v 1.8 2009/12/02 22:45:09 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    3737
    3838#include "G4VPhysicsConstructor.hh"
    39 #include "G4MultipleScattering.hh"
     39#include "G4MuMultipleScattering.hh"
    4040#include "G4MuBremsstrahlung.hh"
    4141#include "G4MuPairProduction.hh"

  • trunk/examples/extended/analysis/A01/opengl.mac

    r807 r1337  
    1111#   /vis/viewer/create
    1212#
    13 /vis/open OGLIX
     13/vis/open OGL
    1414#
    1515# Create a scene.  One could use /vis/drawVolume, which is equivalent to:

  • trunk/examples/extended/analysis/A01/src/A01DetectorConstruction.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01DetectorConstruction.cc,v 1.9 2006/06/29 16:32:22 gunter Exp $
     26// $Id: A01DetectorConstruction.cc,v 1.10 2009/11/21 00:22:55 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    3232#include "G4FieldManager.hh"
    3333#include "G4TransportationManager.hh"
     34#include "G4Mag_UsualEqRhs.hh"
    3435
    3536#include "G4Material.hh"
    3637#include "G4Element.hh"
    3738#include "G4MaterialTable.hh"
     39#include "G4NistManager.hh"
    3840
    3941#include "G4VSolid.hh"
    … …  
    7678  messenger = new A01DetectorConstMessenger(this);
    7779  magneticField = new A01MagneticField();
     80  fieldMgr = new G4FieldManager();
    7881  armRotation = new G4RotationMatrix();
    7982  armRotation->rotateY(armAngle);
    … …  
    8487  delete armRotation;
    8588  delete magneticField;
     89  delete fieldMgr;
    8690  delete messenger;
    8791
    … …  
    111115  G4VSensitiveDetector* HadCalorimeter;
    112116//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
    113 
    114117  ConstructMaterials();
    115118
    116   // Magnetic field ----------------------------------------------------------
     119  // Local Magnetic Field
    117120  static G4bool fieldIsInitialized = false;
     121
    118122  if(!fieldIsInitialized)
    119123  {
    120     G4FieldManager* fieldMgr
    121       = G4TransportationManager::GetTransportationManager()->GetFieldManager();
    122124    fieldMgr->SetDetectorField(magneticField);
    123125    fieldMgr->CreateChordFinder(magneticField);
    … …  
    133135    = new G4PVPlacement(0,G4ThreeVector(),worldLogical,"worldPhysical",0,0,0);
    134136
    135   // magnetic field region
     137  // Tube with Local Magnetic field
     138   
    136139  G4VSolid* magneticSolid = new G4Tubs("magneticTubs",0.,1.*m,1.*m,0.,360.*deg);
    137   G4LogicalVolume* magneticLogical
    138     = new G4LogicalVolume(magneticSolid,air,"magneticLogical",0,0,0);
     140  G4NistManager* man = G4NistManager::Instance();
     141  G4Material* G4_Galactic = man->FindOrBuildMaterial("G4_Galactic");
     142 
     143   G4LogicalVolume* magneticLogical
     144    = new G4LogicalVolume(magneticSolid,G4_Galactic,"magneticLogical",fieldMgr,0,0);
     145  //                                                                  ********
     146 
     147  // placement of Tube
     148 
    139149  G4RotationMatrix* fieldRot = new G4RotationMatrix();
    140150  fieldRot->rotateX(90.*deg);

  • trunk/examples/extended/analysis/A01/src/A01EMPhysics.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01EMPhysics.cc,v 1.8 2006/06/29 16:32:30 gunter Exp $
     26// $Id: A01EMPhysics.cc,v 1.9 2009/11/21 01:00:19 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    7373   //Electorn
    7474   pManager = G4Electron::Electron()->GetProcessManager();
    75    G4VProcess* theeminusMultipleScattering = new G4MultipleScattering();
     75   G4VProcess* theeminusMultipleScattering = new G4eMultipleScattering();
    7676   G4VProcess* theeminusIonisation         = new G4eIonisation();
    7777   G4VProcess* theeminusBremsstrahlung     = new G4eBremsstrahlung();
    … …  
    9494   //Positron
    9595   pManager = G4Positron::Positron()->GetProcessManager();
    96    G4VProcess* theeplusMultipleScattering = new G4MultipleScattering();
     96   G4VProcess* theeplusMultipleScattering = new G4eMultipleScattering();
    9797   G4VProcess* theeplusIonisation         = new G4eIonisation();
    9898   G4VProcess* theeplusBremsstrahlung     = new G4eBremsstrahlung();

  • trunk/examples/extended/analysis/A01/src/A01HadronPhysics.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01HadronPhysics.cc,v 1.8 2006/06/29 16:32:48 gunter Exp $
     26// $Id: A01HadronPhysics.cc,v 1.9 2009/11/21 01:00:19 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    7474   pManager->AddDiscreteProcess(thePionPlusInelasticProcess);
    7575
    76    G4VProcess* theppMultipleScattering = new G4MultipleScattering();
     76   G4VProcess* theppMultipleScattering = new G4hMultipleScattering();
    7777   G4VProcess* theppIonisation        = new G4hIonisation();
    7878   //
    … …  
    107107   pManager->AddDiscreteProcess(thePionMinusInelasticProcess);
    108108
    109    G4VProcess* thepmMultipleScattering = new G4MultipleScattering();
     109   G4VProcess* thepmMultipleScattering = new G4hMultipleScattering();
    110110   G4VProcess* thepmIonisation        = new G4hIonisation();
    111111   //
    … …  
    141141   pManager->AddDiscreteProcess(theKaonPlusInelasticProcess);
    142142
    143    G4VProcess* thekpMultipleScattering = new G4MultipleScattering();
     143   G4VProcess* thekpMultipleScattering = new G4hMultipleScattering();
    144144   G4VProcess* thekpIonisation        = new G4hIonisation();
    145145   //
    … …  
    176176   pManager->AddDiscreteProcess(theKaonMinusInelasticProcess);
    177177
    178    G4VProcess* thekmMultipleScattering = new G4MultipleScattering();
     178   G4VProcess* thekmMultipleScattering = new G4hMultipleScattering();
    179179   G4VProcess* thekmIonisation        = new G4hIonisation();
    180180
    … …  
    248248   pManager->AddDiscreteProcess(theProtonInelasticProcess);
    249249
    250    G4VProcess* thepMultipleScattering = new G4MultipleScattering();
     250   G4VProcess* thepMultipleScattering = new G4hMultipleScattering();
    251251   G4VProcess* thepIonisation        = new G4hIonisation();
    252252
    … …  
    286286   pManager->AddRestProcess(theAntiProtonAnnihilation);
    287287
    288    G4VProcess* theapMultipleScattering = new G4MultipleScattering();
     288   G4VProcess* theapMultipleScattering = new G4hMultipleScattering();
    289289   G4VProcess* theapIonisation        = new G4hIonisation();
    290290
    … …  
    417417   pManager->AddDiscreteProcess(theSigmaPlusInelasticProcess);
    418418
    419    G4VProcess* thespMultipleScattering = new G4MultipleScattering();
     419   G4VProcess* thespMultipleScattering = new G4hMultipleScattering();
    420420   G4VProcess* thespIonisation        = new G4hIonisation();
    421421
    … …  
    451451   pManager->AddDiscreteProcess(theAntiSigmaPlusInelasticProcess);
    452452
    453    G4VProcess* theaspMultipleScattering = new G4MultipleScattering();
     453   G4VProcess* theaspMultipleScattering = new G4hMultipleScattering();
    454454   G4VProcess* theaspIonisation        = new G4hIonisation();
    455455
    … …  
    485485   pManager->AddDiscreteProcess(theSigmaMinusInelasticProcess);
    486486
    487    G4VProcess* thesmMultipleScattering = new G4MultipleScattering();
     487   G4VProcess* thesmMultipleScattering = new G4hMultipleScattering();
    488488   G4VProcess* thesmIonisation        = new G4hIonisation();
    489489
    … …  
    519519   pManager->AddDiscreteProcess(theAntiSigmaMinusInelasticProcess);
    520520
    521    G4VProcess* theasmMultipleScattering = new G4MultipleScattering();
     521   G4VProcess* theasmMultipleScattering = new G4hMultipleScattering();
    522522   G4VProcess* theasmIonisation        = new G4hIonisation();
    523523
    … …  
    593593   pManager->AddDiscreteProcess(theXiMinusInelasticProcess);
    594594
    595    G4VProcess* thexmMultipleScattering = new G4MultipleScattering();
     595   G4VProcess* thexmMultipleScattering = new G4hMultipleScattering();
    596596   G4VProcess* thexmIonisation        = new G4hIonisation();
    597597
    … …  
    627627   pManager->AddDiscreteProcess(theAntiXiMinusInelasticProcess);
    628628
    629    G4VProcess* theaxmMultipleScattering = new G4MultipleScattering();
     629   G4VProcess* theaxmMultipleScattering = new G4hMultipleScattering();
    630630   G4VProcess* theaxmIonisation        = new G4hIonisation();
    631631
    … …  
    661661   pManager->AddDiscreteProcess(theOmegaMinusInelasticProcess);
    662662
    663    G4VProcess* theomMultipleScattering = new G4MultipleScattering();
     663   G4VProcess* theomMultipleScattering = new G4hMultipleScattering();
    664664   G4VProcess* theomIonisation        = new G4hIonisation();
    665665
    … …  
    695695   pManager->AddDiscreteProcess(theAntiOmegaMinusInelasticProcess);
    696696
    697    G4VProcess* theaomMultipleScattering = new G4MultipleScattering();
     697   G4VProcess* theaomMultipleScattering = new G4hMultipleScattering();
    698698   G4VProcess* theaomIonisation        = new G4hIonisation();
    699699

  • trunk/examples/extended/analysis/A01/src/A01IonPhysics.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01IonPhysics.cc,v 1.9 2006/06/29 16:32:55 gunter Exp $
     26// $Id: A01IonPhysics.cc,v 1.10 2009/11/21 01:00:19 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    6262
    6363   // add process
    64    G4VProcess* thegionMultipleScattering = new G4MultipleScattering();
     64   G4VProcess* thegionMultipleScattering = new G4hMultipleScattering();
    6565   //
    6666   // G4hIonization may be not able to use for Geanric Ion in future
    … …  
    100100   pManager->AddDiscreteProcess(theDeuteronInelasticProcess);
    101101
    102    G4VProcess* thedueMultipleScattering = new G4MultipleScattering();
     102   G4VProcess* thedueMultipleScattering = new G4hMultipleScattering();
    103103   G4VProcess* thedueIonisation        = new G4hIonisation();
    104104   //
    … …  
    132132   pManager->AddDiscreteProcess(theTritonInelasticProcess);
    133133
    134    G4VProcess* thetriMultipleScattering = new G4MultipleScattering();
     134   G4VProcess* thetriMultipleScattering = new G4hMultipleScattering();
    135135   G4VProcess* thetriIonisation        = new G4hIonisation();
    136136   //
    … …  
    164164   pManager->AddDiscreteProcess(theAlphaInelasticProcess);
    165165
    166    G4VProcess* thealpMultipleScattering = new G4MultipleScattering();
     166   G4VProcess* thealpMultipleScattering = new G4hMultipleScattering();
    167167   G4VProcess* thealpIonisation        = new G4hIonisation();
    168168   //
    … …  
    189189   pManager->AddDiscreteProcess(thehe3ElasticProcess);
    190190
    191    G4VProcess* thehe3MultipleScattering = new G4MultipleScattering();
     191   G4VProcess* thehe3MultipleScattering = new G4hMultipleScattering();
    192192   G4VProcess* thehe3Ionisation        = new G4hIonisation();
    193193   //

  • trunk/examples/extended/analysis/A01/src/A01MagneticField.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01MagneticField.cc,v 1.6 2006/06/29 16:32:57 gunter Exp $
     26// $Id: A01MagneticField.cc,v 1.7 2009/11/21 00:22:55 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    3030#include "A01MagneticField.hh"
    3131#include "A01MagneticFieldMessenger.hh"
     32#include "globals.hh"
    3233
    3334A01MagneticField::A01MagneticField()
    … …  
    3536  messenger = new A01MagneticFieldMessenger(this);
    3637  By = 1.0*tesla;
    37   rmax_sq = sqr(1.*m);
    38   ymax = 100.*cm;
     38 
    3939}
    4040
    … …  
    4242{ delete messenger; }
    4343
    44 void A01MagneticField::GetFieldValue(const double Point[3],double *Bfield) const
     44void A01MagneticField::GetFieldValue(const G4double [4],double *Bfield) const
    4545{
    4646  Bfield[0] = 0.;
    4747  Bfield[2] = 0.;
    48   if(std::abs(Point[1])<ymax && (sqr(Point[0])+sqr(Point[2]))<rmax_sq)
    49   { Bfield[1] = By; }
    50   else
    51   { Bfield[1] = 0.; }
     48  Bfield[1] = By;
     49
    5250}
    5351

  • trunk/examples/extended/analysis/A01/src/A01MuonPhysics.cc

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: A01MuonPhysics.cc,v 1.8 2006/06/29 16:33:01 gunter Exp $
     26// $Id: A01MuonPhysics.cc,v 1.10 2009/12/02 22:45:09 perl Exp $
    2727// --------------------------------------------------------------
    2828//
    … …  
    6262   //Muon+
    6363   pManager = G4MuonPlus::MuonPlus()->GetProcessManager();
    64    G4VProcess* thempMultipleScattering = new G4MultipleScattering();
     64   G4VProcess* thempMultipleScattering = new G4MuMultipleScattering();
    6565   G4VProcess* thempBremsstrahlung     = new G4MuBremsstrahlung();
    6666   G4VProcess* thempPairProduction     = new G4MuPairProduction();
    … …  
    8787   //Muon-
    8888   pManager = G4MuonMinus::MuonMinus()->GetProcessManager();
    89    G4VProcess* themmMultipleScattering = new G4MultipleScattering();
     89   G4VProcess* themmMultipleScattering = new G4MuMultipleScattering();
    9090   G4VProcess* themmBremsstrahlung     = new G4MuBremsstrahlung();
    9191   G4VProcess* themmPairProduction     = new G4MuPairProduction();
    … …  
    111111   // Tau+ Physics
    112112   pManager = G4TauPlus::TauPlus()->GetProcessManager();
    113    G4VProcess* thetpMultipleScattering = new G4MultipleScattering();
     113   G4VProcess* thetpMultipleScattering = new G4MuMultipleScattering();
    114114   G4VProcess* thetpIonisation        = new G4hIonisation();
    115115   //
    … …  
    128128   // Tau- Physics
    129129   pManager = G4TauMinus::TauMinus()->GetProcessManager();
    130    G4VProcess* thetmMultipleScattering = new G4MultipleScattering();
     130   G4VProcess* thetmMultipleScattering = new G4MuMultipleScattering();
    131131   G4VProcess* thetmIonisation        = new G4hIonisation();
    132132   //

  • trunk/examples/extended/analysis/A01/test.out

    r807 r1337  
    11
    22*************************************************************
    3  Geant4 version $Name: $   (25-June-2004)
     3 Geant4 version $Name: geant4-09-04-beta-01 $   (25-June-2004)
    44                      Copyright : Geant4 Collaboration
    55                      Reference : NIM A 506 (2003), 250-303

  • trunk/examples/extended/analysis/A01/vis.mac

    r807 r1337  
    55#
    66/control/verbose 2
    7 # /vis/verbose confirmations
    87#
    9 # Create a scene handler and viewer for HepRep
     8# Use this open statement to create an OpenGL view:
     9/vis/open OGL 600x600-0+0
    1010#
    11 /vis/open HepRepFile
     11# Use this open statement to create a .prim file suitable for
     12# viewing in DAWN:
    1213#/vis/open DAWNFILE
    1314#
    14 # Draw detector
     15# Use this open statement to create a .heprep file suitable for
     16# viewing in HepRApp:
     17#/vis/open HepRepFile
    1518#
     19# Use this open statement to create a .wrl file suitable for
     20# viewing in a VRML viewer:
     21#/vis/open VRML2FILE
     22#
     23# Disable auto refresh and quieten vis messages whilst scene and
     24# trajectories are established:
     25/vis/viewer/set/autoRefresh false
     26/vis/verbose errors
     27#
     28# Draw geometry:
    1629/vis/drawVolume
    1730#
    18 # Declare that trajectories and hits should be added to the scene
     31# Specify view angle:
     32#/vis/viewer/set/viewpointThetaPhi 90. 0.
    1933#
    20 /vis/scene/add/trajectories
    21 /vis/scene/add/hits
     34# Specify zoom value:
     35/vis/viewer/zoom 1.6
    2236#
    23 # Execute the visualization via the /vis/viewer/flush that comes
    24 # automatically at the end of each /run.
     37# Specify style (surface or wireframe):
     38#/vis/viewer/set/style wireframe
     39#
     40# Draw coordinate axes:
     41#/vis/scene/add/axes 0 0 0 1 m
     42#
     43# Draw smooth trajectories at end of event, showing trajectory points
     44# as markers 2 pixels wide:
     45/vis/scene/add/trajectories smooth
     46/vis/modeling/trajectories/create/drawByCharge
     47/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     48/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2
     49# (if too many tracks cause core dump => /tracking/storeTrajectory 0)
     50#
     51# Draw hits at end of event:
     52#/vis/scene/add/hits
     53#
     54# To draw only gammas:
     55#/vis/filtering/trajectories/create/particleFilter
     56#/vis/filtering/trajectories/particleFilter-0/add gamma
     57#
     58# To invert the above, drawing all particles except gammas,
     59# keep the above two lines but also add:
     60#/vis/filtering/trajectories/particleFilter-0/invert true
     61#
     62# Many other options are available with /vis/modeling and /vis/filtering.
     63# For example, to select colour by particle ID:
     64#/vis/modeling/trajectories/create/drawByParticleID
     65#/vis/modeling/trajectories/drawByParticleID-0/set e- blue
     66#
     67# To superimpose all of the events from a given run:
     68#/vis/scene/endOfEventAction accumulate
     69#
     70# Re-establish auto refreshing and verbosity:
     71/vis/viewer/set/autoRefresh true
     72/vis/verbose warnings
     73#
     74# For file-based drivers, use this to create an empty detector view:
     75#/vis/viewer/flush
    2576#
    2677/mydet/armAngle 60. deg
Note: See TracChangeset for help on using the changeset viewer.