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

tag geant4.9.4 beta 1 + modifs locales

Location:
trunk/examples/extended/medical/DICOM/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/medical/DICOM/include/DicomDetectorConstruction.hh

    r1230 r1337  
    9797  std::vector<G4Material*> fMaterials;  // list of new materials created to distinguish different density voxels that have the same original materials
    9898  size_t* fMateIDs; // index of material of each voxel
     99 //unsigned int* fMateIDs; // index of material of each voxel
    99100
    100101  std::map<G4int,G4double> fDensityDiffs; // Density difference to distinguish material for each original material (by index)

  • trunk/examples/extended/medical/DICOM/include/DicomHandler.hh

    r807 r1337  
    9090
    9191    void GetInformation(G4int &, char *);
    92     G4double Pixel2density(G4int pixel);
     92    G4float Pixel2density(G4int pixel);
    9393    void ReadMaterialIndices( std::ifstream& finData);
    94     size_t GetMaterialIndex( G4double density );
     94    unsigned int GetMaterialIndex( G4float density );
    9595    void StoreData(std::ofstream& foutG4DCM);
     96    G4int read_defined_nested(FILE *, G4int);
     97    void read_undefined_nested(FILE *);
     98    void read_undefined_item(FILE *);
    9699
    97100    short compression;
    … …  
    112115
    113116    G4int** tab;
    114   std::map<G4double,G4String> fMaterialIndices;
     117    std::map<G4float,G4String> fMaterialIndices;
    115118};
    116119#endif

  • trunk/examples/extended/medical/DICOM/include/DicomNestedPhantomParameterisation.hh

    r1230 r1337  
    2424// ********************************************************************
    2525//
    26 // $Id: DicomNestedPhantomParameterisation.hh,v 1.3 2009/01/27 10:44:58 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: DicomNestedPhantomParameterisation.hh,v 1.5 2009/11/19 16:15:23 chauvie Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-01 $
    2828//
    2929// --------------------------------------------------------------------
    … …  
    7676      // of all instances with the same mother/ancestor volume
    7777
    78     size_t GetMaterialIndex( size_t nx, size_t ny, size_t nz) const;
    79     size_t GetMaterialIndex( size_t copyNo) const;
     78    unsigned int GetMaterialIndex( unsigned int nx, unsigned int ny, unsigned int nz) const;
     79    unsigned int GetMaterialIndex( unsigned int copyNo) const;
     80    //void SetMaterialIndices( unsigned int* matInd ) { fMaterialIndices = matInd; }
    8081    void SetMaterialIndices( size_t* matInd ) { fMaterialIndices = matInd; }
    81     void SetNoVoxel( size_t nx, size_t ny, size_t nz );
     82    void SetNoVoxel( unsigned int nx, unsigned int ny, unsigned int nz );
    8283
    8384    void ComputeTransformation(const G4int no,
    … …  
    121122    std::vector<G4Material*> fMaterials;
    122123    size_t* fMaterialIndices; // Index in materials corresponding to each voxel
     124//    unsigned int* fMaterialIndices; // Index in materials corresponding to each voxel
    123125};
    124 
    125126#endif

  • trunk/examples/extended/medical/DICOM/include/DicomPhysicsList.hh

    r807 r1337  
    2424// ********************************************************************
    2525//
    26 // The code was written by :
    27 //      *Louis Archambault louis.archambault@phy.ulaval.ca,
    28 //      *Luc Beaulieu beaulieu@phy.ulaval.ca
    29 //      +Vincent Hubert-Tremblay at tigre.2@sympatico.ca
    30 //
    31 //
    32 // *Centre Hospitalier Universitaire de Quebec (CHUQ),
    33 // Hotel-Dieu de Quebec, departement de Radio-oncologie
    34 // 11 cote du palais. Quebec, QC, Canada, G1R 2J6
    35 // tel (418) 525-4444 #6720
    36 // fax (418) 691 5268
    37 //
    38 // + Université Laval, Québec (QC) Canada
    39 //*******************************************************//
     26// -------------------------------------------------------------------
     27// $Id: DicomPhysicsList.hh,v 1.7 2009/10/26 11:21:01 chauvie Exp $
     28// -------------------------------------------------------------------
    4029
    4130#ifndef DicomPhysicsList_h
    … …  
    4332
    4433#include "G4VUserPhysicsList.hh"
    45 #include "globals.hh"
    4634
    47 class G4LowEnergyIonisation;
    48 class G4LowEnergyPhotoElectric;
    49 class G4LowEnergyBremsstrahlung;
     35//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    5036
    5137class DicomPhysicsList: public G4VUserPhysicsList
    … …  
    5541  ~DicomPhysicsList();
    5642
    57   // Set Cuts
    58   void SetGammaCut(G4double);
    59   void SetElectronCut(G4double);
    60   void SetPositronCut(G4double);
    61  
    62 protected:
    63   // Construct particle and physics
    64   void ConstructParticle();
    65   void ConstructProcess();
    66 
    67   void SetCuts();
    68 
    69   // these methods Construct particles
    70   void ConstructBosons();
    71   void ConstructLeptons();
    72 
    73   // these methods Construct physics processes and register them
    74   void ConstructGeneral();
    75   void ConstructEM();
    76 
    7743private:
    78 
     44 
    7945  G4double cutForGamma;
    8046  G4double cutForElectron;
    8147  G4double cutForPositron;
     48 
     49protected:
     50 
     51  void ConstructParticle();
     52  void ConstructBosons();
     53  void ConstructLeptons();
     54  void ConstructBaryons();
    8255
    83   G4LowEnergyIonisation*  loweIon;
    84   G4LowEnergyPhotoElectric* lowePhot;
    85   G4LowEnergyBremsstrahlung* loweBrem;
    86 
     56  void ConstructProcess();
     57  void ConstructEM();
     58  void ConstructHad();
     59  void ConstructGeneral();
     60  void SetCuts();
     61 
    8762};
    88 
    8963#endif
    9064
Note: See TracChangeset for help on using the changeset viewer.