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

update to geant4.9.3

Location:
trunk/examples/advanced/xray_fluorescence/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/advanced/xray_fluorescence/include/XrayFluoDataSet.hh

    r807 r1230  
    3333// -----------
    3434//  28 Nov 2001  Elena Guardincerri   Created
    35 //
     35//  2001 - 2009  Alfonso Mantero      Mantained
    3636// -------------------------------------------------------------------
    3737
    … …  
    7474  virtual size_t NumberOfComponents() const { return 0; }
    7575
     76  virtual void SetEnergiesData(G4DataVector*, G4DataVector*, int
     77    = 0) {}
     78
     79  virtual G4bool SaveData(const G4String&) const {return true;}
     80
     81  virtual G4double RandomSelect(int = 0) const {return 0;}
    7682
    7783  void PrintData() const;
    … …  
    7985  const G4DataVector& GetEnergies(G4int) const { return *energies; }
    8086  const G4DataVector& GetData(G4int) const { return *data; }
     87 
     88  virtual const G4DataVector& GetLogEnergies(G4int ) const { return *energies; }
     89  virtual const G4DataVector& GetLogData(G4int ) const { return *data; }
     90  //  void SetEnergiesData(G4DataVector* x, G4DataVector* data, G4int component=0) {;}
     91 
     92  virtual void SetLogEnergiesData(G4DataVector* ,
     93                                  G4DataVector* ,
     94                                  G4DataVector* ,
     95                                  G4DataVector* ,
     96                                  G4int ) {;}
     97
     98  virtual G4bool LoadNonLogData(const G4String& ) {return false;}
     99
     100//  G4bool SaveData(const G4String& fileName) const {return 0;}
     101
     102
    81103
    82104private:
    83105
    84   void LoadData(const G4String& dataFile);
     106  G4bool LoadData(const G4String& dataFile);
     107
    85108  G4int z;
    86109  G4int FindBinLocation(G4double energy) const;
    … …  
    97120
    98121};
     122
     123
    99124 
    100125#endif

  • trunk/examples/advanced/xray_fluorescence/include/XrayFluoDetectorConstruction.hh

    r807 r1230  
    4848#include "globals.hh"
    4949#include "G4RotationMatrix.hh"
     50#include "G4Navigator.hh"
    5051
    5152#include "XrayFluoGeometry.hh"
    … …  
    143144 
    144145private:
    145  
     146
     147  G4Navigator* aNavigator; 
     148
    146149  XrayFluoDetectorConstruction();
    147150
    … …  
    226229  G4Material* GetDia1Material()  {return Dia1Material;};
    227230  G4Material* GetDia3Material()  {return Dia3Material;};
     231 
     232  // GetSampleIlluminatedFacecoord();
     233  // GetSampleShadowedFaceCoord();
     234  // GetSampleXplusFaceCoord();
     235  // GetSampleXminusFaceCoord();
     236  // GetSampleYplusFaceCoord();
     237  // GetSampleYminusFaceCoord();
     238
     239  G4Navigator* GetGeometryNavigator() {return aNavigator;};
    228240 
    229241private:

  • trunk/examples/advanced/xray_fluorescence/include/XrayFluoNistMaterials.hh

    r807 r1230  
    6666  G4NistManager*     nistMan;
    6767
     68  G4Material*        copper;
     69  G4Material*        SiLi;
    6870  G4Material*        dolorite;
    6971  G4Material*        HPGe;
    7072  G4Material*        mars1;
     73  G4Material*        hawaiianWD;
     74  G4Material*        hawaiianRF;
    7175  G4Material*        anorthosite;
    7276  G4Material*        basalt;
     77  G4Material*        gabbro;
     78  G4Material*        gabbroWD;
     79  G4Material*        gabbroRF;
    7380  G4Material*        Air;
    7481  G4Material*        Sci;
    … …  
    7683  G4Material*        madaBasalt;
    7784  G4Material*        icelandicBasalt;
     85  G4Material*        icelandicWD;
     86  G4Material*        icelandicRF;
    7887  G4Material*        GaAs;
    7988  G4Material*        galactic;

  • trunk/examples/advanced/xray_fluorescence/include/XrayFluoPhysicsList.hh

    r807 r1230  
    4545//#include "XrayFluoMercuryConstruction.hh"
    4646
    47 class XrayFluoPhysicsListMessenger;
     47/*
    4848class G4LowEnergyIonisation;
    4949class G4LowEnergyPhotoElectric;
    5050class G4LowEnergyBremsstrahlung;
    5151class G4eIonisation;
     52*/
     53
     54class XrayFluoPhysicsListMessenger;
    5255class XrayFluoDetectorConstruction;
    5356class XrayFluoPlaneDetectorConstruction;
    … …  
    104107private:
    105108
    106   G4LowEnergyIonisation*  LeIoprocess;
    107   G4LowEnergyPhotoElectric* LePeprocess;
    108   G4LowEnergyBremsstrahlung* LeBrprocess;
     109//  G4LowEnergyIonisation*  LeIoprocess;
     110//  G4LowEnergyPhotoElectric* LePeprocess;
     111//  G4LowEnergyBremsstrahlung* LeBrprocess;
    109112  // G4eIonisation* eIoProcess; // modified
    110113  XrayFluoPhysicsListMessenger* physicsListMessenger;

  • trunk/examples/advanced/xray_fluorescence/include/XrayFluoPrimaryGeneratorAction.hh

    r807 r1230  
    9393  //messenger of this class
    9494  XrayFluoPrimaryGeneratorMessenger* gunMessenger;
     95
    9596  XrayFluoRunAction*  runManager;
    9697 
Note: See TracChangeset for help on using the changeset viewer.