Ignore:
Timestamp:
Jan 8, 2010, 3:02:48 PM (14 years ago)
Author:
garnier
Message:

update to geant4.9.3

Location:
trunk/examples/extended/exoticphysics/monopole
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/exoticphysics/monopole/GNUmakefile

    r807 r1230  
    1 # $Id: GNUmakefile,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
     1# $Id: GNUmakefile,v 1.2 2008/06/11 14:34:19 vnivanch Exp $
    22# --------------------------------------------------------------
    33# GNUmakefile for examples module.  Gabriele Cosmo, 06/04/98.
    … …  
    1515all: lib bin
    1616
    17 ifdef G4ANALYSIS_USE
    18   CPPFLAGS += -DG4ANALYSIS_USE
    19 endif
    20 
    2117include $(G4INSTALL)/config/architecture.gmk
    22 
    23 ifdef G4ANALYSIS_USE
    24   # for the aida-config command see the README file
    25   CPPFLAGS += `aida-config --include`
    26   LOADLIBS += `aida-config --lib`
    27 endif
    2818
    2919include $(G4INSTALL)/config/binmake.gmk

  • trunk/examples/extended/exoticphysics/monopole/include/DetectorConstruction.hh

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: DetectorConstruction.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: DetectorConstruction.hh,v 1.2 2009/07/15 10:19:47 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4646class DetectorConstruction : public G4VUserDetectorConstruction
    4747{
    48   public:
     48public:
    4949 
    50     DetectorConstruction();
    51    ~DetectorConstruction();
     50  DetectorConstruction();
     51  ~DetectorConstruction();
    5252
    53   public:
    54        
    55      void SetSizeX    (G4double);
    56      void SetSizeYZ   (G4double);             
    57      void SetMaterial (G4String);           
    58      void SetMagField (G4double);
     53  void SetSizeX    (G4double);
     54  void SetSizeYZ   (G4double);             
     55  void SetMaterial (G4String);           
     56  void SetMagField (G4double);
    5957     
    60      void SetMaxStepSize   (G4double);
     58  void SetMaxStepSize   (G4double);
    6159     
    62      G4VPhysicalVolume* Construct();
    63      void               UpdateGeometry();
     60  G4VPhysicalVolume* Construct();
     61  void               UpdateGeometry();
    6462     
    65   public: 
    66                    
    67      G4double     GetWorldSizeX()    {return worldSizeX;};
    68      G4double     GetWorldSizeYZ()   {return worldSizeYZ;};
    69      G4Material*  GetWorldMaterial() {return worldMaterial;};     
    70      G4double     GetAbsorSizeX()    {return absorSizeX;};
    71      G4double     GetAbsorSizeYZ()   {return absorSizeYZ;};
    72      G4double     GetMaxStepSize()   {return maxStepSize;};
    73      G4Material*  GetAbsorMaterial() {return absorMaterial;};
    74      
    75      void         PrintParameters();
     63  G4double     GetWorldSizeX()    {return worldSizeX;};
     64  G4double     GetWorldSizeYZ()   {return worldSizeYZ;};
     65  G4Material*  GetWorldMaterial() {return worldMaterial;};     
     66  G4double     GetAbsorSizeX()    {return absorSizeX;};
     67  G4double     GetAbsorSizeYZ()   {return absorSizeYZ;};
     68  G4double     GetMaxStepSize()   {return maxStepSize;};
     69  G4Material*  GetAbsorMaterial() {return absorMaterial;};
     70 
     71  void         PrintParameters();
    7672                       
    77   private:
     73private:
     74
     75  void               DefineMaterials();
     76  G4VPhysicalVolume* ConstructVolumes();     
    7877 
    79      G4double            worldSizeX;
    80      G4double            worldSizeYZ;
    81      G4Material*         worldMaterial;           
    82      G4double            absorSizeX;
    83      G4double            absorSizeYZ;
    84                  G4double                                                maxStepSize;
    85      G4Material*         absorMaterial;
    86      G4UniformMagField*  magField;
    87      G4LogicalVolume*    lAbsor;
     78  G4double            worldSizeX;
     79  G4double            worldSizeYZ;
     80  G4Material*         worldMaterial;           
     81  G4double            absorSizeX;
     82  G4double            absorSizeYZ;
     83  G4double            maxStepSize;
     84  G4Material*         absorMaterial;
     85  G4UniformMagField*  magField;
     86  G4LogicalVolume*    lAbsor;
    8887               
    89      DetectorMessenger* detectorMessenger;
     88  DetectorMessenger* detectorMessenger;
    9089
    91   private:
    92    
    93      void               DefineMaterials();
    94      G4VPhysicalVolume* ConstructVolumes();     
    9590};
    9691

  • trunk/examples/extended/exoticphysics/monopole/include/DetectorMessenger.hh

    r807 r1230  
    2525//
    2626// $Id: DetectorMessenger.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/include/EventAction.hh

    r807 r1230  
    2525//
    2626// $Id: EventAction.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/include/EventActionMessenger.hh

    r807 r1230  
    2525//
    2626// $Id: EventActionMessenger.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/include/G4Monopole.hh

    r807 r1230  
    5353{
    5454private:
     55
    5556  static G4Monopole*  theMonopole;
    5657
    … …  
    6667       G4DecayTable        *decaytable );
    6768
     69  virtual ~G4Monopole();
     70
    6871public:
    69 
    70   virtual ~G4Monopole();
    7172 
    7273  static G4Monopole* MonopoleDefinition(G4double mass_ = 100.*GeV,

  • trunk/examples/extended/exoticphysics/monopole/include/G4MonopolePhysics.hh

    r807 r1230  
    2525//
    2626//
    27 // $Id: G4MonopolePhysics.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4MonopolePhysics.hh,v 1.2 2009/07/15 10:19:47 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3939//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    4040
     41class G4MonopolePhysicsMessenger;
     42
    4143class G4MonopolePhysics : public G4VPhysicsConstructor
    4244{
    4345public:
    44   G4MonopolePhysics(const G4String& name = "EM_monopole");
    45   virtual ~G4MonopolePhysics();
     46
     47  G4MonopolePhysics(const G4String& nam = "Monopole Physics");
     48  ~G4MonopolePhysics();
    4649
    4750  // This method is dummy for physics
    … …  
    5356  virtual void ConstructProcess();
    5457
     58  void SetMagneticCharge(G4int);
     59  void SetElectricCharge(G4int);
     60  void SetMonopoleMass(G4double);
     61
    5562private:
    5663
    5764  // hide assignment operator
    58   G4MonopolePhysics & operator=(const G4MonopolePhysics &right);
    59   G4MonopolePhysics(const G4MonopolePhysics&);
     65  //  G4MonopolePhysics & operator=(const G4MonopolePhysics &right);
     66  // G4MonopolePhysics(const G4MonopolePhysics&);
     67
     68  G4int    magCharge;
     69  G4int    elCharge;
     70  G4double monopoleMass;
     71
     72  G4MonopolePhysicsMessenger*  theMessenger;
    6073
    6174};

  • trunk/examples/extended/exoticphysics/monopole/include/PrimaryGeneratorAction.hh

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: PrimaryGeneratorAction.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: PrimaryGeneratorAction.hh,v 1.2 2009/07/15 10:19:47 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4545class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
    4646{
    47   public:
    48     PrimaryGeneratorAction(DetectorConstruction*);   
    49    ~PrimaryGeneratorAction();
     47public:
    5048
    51   public: 
    52     void SetRndmBeam(G4double val)  {rndmBeam = val;}   
    53     void GeneratePrimaries(G4Event*);
     49  PrimaryGeneratorAction(DetectorConstruction*);   
     50  ~PrimaryGeneratorAction();
     51
     52  void SetRndmBeam(G4double val)  {rndmBeam = val;}   
     53  void GeneratePrimaries(G4Event*);
    5454   
    55     void   ResetEbeamCumul() {EbeamCumul = 0.;}
    56     G4double GetEbeamCumul() {return EbeamCumul;}
     55  void   ResetEbeamCumul() {EbeamCumul = 0.;}
     56  G4double GetEbeamCumul() {return EbeamCumul;}
    5757     
    58     G4ParticleGun* GetParticleGun() {return particleGun;}
     58  G4ParticleGun* GetParticleGun() {return particleGun;}
    5959   
    60   private:
    61     G4ParticleGun*             particleGun;
    62     DetectorConstruction*      detector;
    63     G4double                   rndmBeam;
    64     G4double                   EbeamCumul;       
    65     PrimaryGeneratorMessenger* gunMessenger;     
     60private:
     61
     62  G4ParticleGun*             particleGun;
     63  DetectorConstruction*      detector;
     64  G4double                   rndmBeam;
     65  G4double                   EbeamCumul;       
     66  PrimaryGeneratorMessenger* gunMessenger;     
    6667};
    6768

  • trunk/examples/extended/exoticphysics/monopole/include/PrimaryGeneratorMessenger.hh

    r807 r1230  
    2525//
    2626// $Id: PrimaryGeneratorMessenger.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/include/RunAction.hh

    r807 r1230  
    2525//
    2626// $Id: RunAction.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/include/RunActionMessenger.hh

    r807 r1230  
    2525//
    2626// $Id: RunActionMessenger.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/include/SteppingAction.hh

    r807 r1230  
    2525//
    2626// $Id: SteppingAction.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/include/TrackingAction.hh

    r807 r1230  
    2525//
    2626// $Id: TrackingAction.hh,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/monopole.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: monopole.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: monopole.cc,v 1.2 2009/07/15 10:19:47 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    3535#include "G4UItcsh.hh"
    3636#include "Randomize.hh"
     37#include "globals.hh"
    3738
    3839#include "DetectorConstruction.hh"
    … …  
    6061  G4RunManager * runManager = new G4RunManager;
    6162
    62   //set mandatory initialization classes
    63   DetectorConstruction* det;
    64 
    65         //ceate physicsList
     63  //create physicsList
    6664  QGSP* phys = new QGSP();
    67   G4MonopolePhysics * theMonopole = new G4MonopolePhysics;
     65  G4MonopolePhysics * theMonopole = new G4MonopolePhysics();
    6866  phys->RegisterPhysics(theMonopole);
    6967
    70   PrimaryGeneratorAction* kin;
    71   runManager->SetUserInitialization(det  = new DetectorConstruction);
    72         runManager->SetUserInitialization(phys);
    73   runManager->SetUserAction(kin = new PrimaryGeneratorAction(det));
     68  //get the pointer to the User Interface manager
     69  G4UImanager* UI = G4UImanager::GetUIpointer();
     70
     71  // Setup monopole
     72  G4String s = "";
     73  if(argc > 2) s = argv[2];
     74  UI->ApplyCommand("/control/verbose 1");
     75  UI->ApplyCommand("/monopole/setup "+s);
     76
     77  // mandator user classes
     78  DetectorConstruction* det = new DetectorConstruction();
     79
     80  runManager->SetUserInitialization(det); 
     81  runManager->SetUserInitialization(phys);
     82
     83  PrimaryGeneratorAction* kin = new PrimaryGeneratorAction(det);
     84  runManager->SetUserAction(kin);
    7485
    7586#ifdef G4VIS_USE
    … …  
    7889#endif
    7990
    80   //set user action classes
     91  //user action classes
    8192  RunAction* run;
    8293
    … …  
    8596  runManager->SetUserAction(new TrackingAction(run));
    8697  runManager->SetUserAction(new SteppingAction(det, run));
    87 
    88   //get the pointer to the User Interface manager
    89   G4UImanager* UI = G4UImanager::GetUIpointer();
    90   G4cout << "User actions are instantiated" << G4endl;
    9198
    9299  if (argc == 1)   // Define UI terminal for interactive mode
    … …  
    100107      session = new G4UIterminal();
    101108#endif
    102      session->SessionStart();
    103      delete session;
     109      session->SessionStart();
     110      delete session;
    104111    }
    105112  else           // Batch mode
    106113    {
    107      G4String command = "/control/execute ";
    108      G4String fileName = argv[1];
    109      UI->ApplyCommand(command+fileName);
     114      G4String command = "/control/execute ";
     115      G4String fileName = argv[1];
     116      UI->ApplyCommand(command+fileName);
    110117    }
    111118

  • trunk/examples/extended/exoticphysics/monopole/src/DetectorConstruction.cc

    r807 r1230  
    2525//
    2626// $Id: DetectorConstruction.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/src/DetectorMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: DetectorMessenger.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/src/EventAction.cc

    r807 r1230  
    2525//
    2626// $Id: EventAction.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/src/EventActionMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: EventActionMessenger.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/src/G4Monopole.cc

    r807 r1230  
    103103
    104104//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
     105
    105106G4Monopole* G4Monopole::Monopole()
    106107{   

  • trunk/examples/extended/exoticphysics/monopole/src/G4MonopolePhysics.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: G4MonopolePhysics.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4MonopolePhysics.cc,v 1.2 2009/07/15 10:19:47 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//---------------------------------------------------------------------------
    … …  
    4242//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    4343
     44#include "G4MonopolePhysics.hh"
     45#include "G4MonopolePhysicsMessenger.hh"
     46
    4447#include "G4Monopole.hh"
    45 #include "G4MonopolePhysics.hh"
    4648#include "G4ParticleDefinition.hh"
    4749#include "G4ProcessManager.hh"
    … …  
    5557//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    5658
    57 G4MonopolePhysics::G4MonopolePhysics(const G4String& name):  G4VPhysicsConstructor(name)
    58 {}
     59G4MonopolePhysics::G4MonopolePhysics(const G4String& nam)
     60  : G4VPhysicsConstructor(nam)
     61{
     62  magCharge = 1;
     63  elCharge  = 0;
     64  monopoleMass = 100.*GeV;
     65  theMessenger = new G4MonopolePhysicsMessenger(this);
     66}
    5967
    6068G4MonopolePhysics::~G4MonopolePhysics()
    61 {}
     69{
     70  delete theMessenger;
     71}
    6272
    6373void G4MonopolePhysics::ConstructParticle()
    6474{
    65   G4Monopole::MonopoleDefinition();
     75  G4Monopole::MonopoleDefinition(monopoleMass, magCharge, elCharge);
     76}
     77
     78//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     79void G4MonopolePhysics::ConstructProcess()
     80{
     81  if(verboseLevel > 0) {
     82    G4cout << "G4MonopolePhysics::ConstructProcess" << G4endl;
     83  }
     84  G4Monopole* mpl = G4Monopole::Monopole();
     85 
     86  G4ProcessManager* pmanager = new G4ProcessManager(mpl);
     87  mpl->SetProcessManager(pmanager);
     88 
     89  // defined monopole parameters and binning
     90
     91  G4double emax = 10.*TeV;
     92  G4double magn = mpl->MagneticCharge();
     93  G4double emin = mpl->GetPDGMass()/20000.;
     94  if(emin < keV) emin = keV;
     95
     96  G4int nbin = G4int(std::log10(emin/eV));
     97  emin       = std::pow(10.,G4double(nbin))*eV;
     98
     99  nbin = G4int(std::log10(emax/emin));
     100  if(nbin < 1) nbin = 1;
     101  nbin *= 10;
     102 
     103  pmanager->AddProcess( new G4Transportation(), -1, 0, 0);
     104  if(magn != 0.0) {
     105    G4mplIonisation* mplioni = new G4mplIonisation(magn);
     106    mplioni->SetDEDXBinning(nbin);
     107    mplioni->SetMinKinEnergy(emin);
     108    mplioni->SetMaxKinEnergy(emax);
     109    pmanager->AddProcess(mplioni, -1, 1, 1);
     110  }
     111  if(mpl->GetPDGCharge() != 0.0) {
     112    G4hhIonisation* hhioni = new G4hhIonisation();
     113    hhioni->SetDEDXBinning(nbin);
     114    hhioni->SetMinKinEnergy(emin);
     115    hhioni->SetMaxKinEnergy(emax);
     116    pmanager->AddProcess(hhioni,  -1, 2, 2);
     117  }
     118  pmanager->AddProcess( new G4StepLimiter(),  -1, -1, 3);
     119
     120}
     121
     122void G4MonopolePhysics::SetMagneticCharge(G4int val)
     123{
     124  magCharge = val;
     125}
     126
     127void G4MonopolePhysics::SetElectricCharge(G4int val)
     128{
     129  elCharge = val;
     130}
     131
     132void G4MonopolePhysics::SetMonopoleMass(G4double mass)
     133{
     134  monopoleMass = mass;
    66135}
    67136
    68137
    69138//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    70 void G4MonopolePhysics::ConstructProcess()
    71 {
    72139
    73   // Add standard EM Processes for gamma
    74   G4cout << "G4MonopolePhysics::ConstructProcess" << G4endl;
    75 
    76   G4Monopole* mpl = G4Monopole::MonopoleDefinition();
    77  
    78   G4ProcessManager* pmanager = new G4ProcessManager(mpl);
    79   mpl->SetProcessManager(pmanager);
    80  
    81   pmanager->AddProcess( new G4Transportation(), -1, 0, 0);
    82   pmanager->AddProcess( new G4mplIonisation(mpl->MagneticCharge()), -1, 1, 1);
    83   pmanager->AddProcess( new G4StepLimiter(),  -1, -1, 3);
    84   if(mpl->GetPDGCharge() != 0.0) {
    85     pmanager->AddProcess(new G4hhIonisation(),  -1, 2, 2);
    86   }
    87 
    88 }
    89 
    90 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    91 

  • trunk/examples/extended/exoticphysics/monopole/src/PrimaryGeneratorAction.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: PrimaryGeneratorAction.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: PrimaryGeneratorAction.cc,v 1.2 2009/07/15 10:19:47 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    4444
    4545PrimaryGeneratorAction::PrimaryGeneratorAction(DetectorConstruction* det)
    46 :detector(det)                                         
     46  :detector(det)
    4747{
    4848  particleGun  = new G4ParticleGun(1);
    49   G4ParticleDefinition* particle = G4ParticleTable::GetParticleTable()->FindParticle("monopole");
     49  G4ParticleDefinition* particle =
     50    G4ParticleTable::GetParticleTable()->FindParticle("monopole");
    5051  particleGun->SetParticleDefinition(particle);
    5152  particleGun->SetParticleEnergy(100 * GeV);
    … …  
    5960}
    6061
    61 
    6262//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    6363PrimaryGeneratorAction::~PrimaryGeneratorAction()
    … …  
    6767}
    6868
     69//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    6970
    70 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    7171void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
    7272{

  • trunk/examples/extended/exoticphysics/monopole/src/PrimaryGeneratorMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: PrimaryGeneratorMessenger.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/src/RunAction.cc

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: RunAction.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: RunAction.cc,v 1.2 2008/06/11 14:34:19 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    8484  if(!binLength) binLength = 5 * mm;
    8585        if(binLength > detector->GetMaxStepSize()) binLength = detector->GetMaxStepSize();
    86   G4int nbBins = (int)(0.5 + length / binLength);
    8786  offsetX   = 0.5 * length;
    8887 
    8988#ifdef G4ANALYSIS_USE
    9089  if(GetVerbose() > 0) G4cout << "\n----> Histogram Tree opened" << G4endl;
     90
     91  G4int nbBins = (int)(0.5 + length / binLength);
    9192
    9293  // Create the tree factory
    … …  
    143144void RunAction::FillHisto(G4int ih, G4double x, G4double weight)
    144145{
     146  if(GetVerbose() > 1) {
     147    G4cout << "FillHisto " << ih << "  x=" << x << " weight= " << weight
     148           << G4endl;
     149  }
    145150#ifdef G4ANALYSIS_USE
    146151  if(histo[ih]) histo[ih]->fill(x, weight);

  • trunk/examples/extended/exoticphysics/monopole/src/RunActionMessenger.cc

    r807 r1230  
    2525//
    2626// $Id: RunActionMessenger.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/src/SteppingAction.cc

    r807 r1230  
    2525//
    2626// $Id: SteppingAction.cc,v 1.2 2007/12/10 16:28:17 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/exoticphysics/monopole/src/TrackingAction.cc

    r807 r1230  
    2525//
    2626// $Id: TrackingAction.cc,v 1.1 2007/08/16 10:32:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Note: See TracChangeset for help on using the changeset viewer.