Ignore:
Timestamp:
Nov 5, 2010, 3:45:55 PM (14 years ago)
Author:
garnier
Message:

update ti head

Location:
trunk/source/digits_hits/utils/include
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/digits_hits/utils/include/CVS/Entries

    r1337 r1340  
    1 /G4DefaultLinearColorMap.hh/1.1/Wed Sep 29 21:48:17 2010//Tgeant4-09-04-beta-01
    2 /G4ScoreLogColorMap.hh/1.1/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    3 /G4ScoreQuantityMessenger.hh/1.4/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    4 /G4ScoringBox.hh/1.19/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    5 /G4ScoringBoxParameterisation.hh/1.3/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    6 /G4ScoringCylinder.hh/1.2/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    7 /G4ScoringManager.hh/1.23/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    8 /G4ScoringMessenger.hh/1.22/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    9 /G4VScoreColorMap.hh/1.5/Wed Sep 29 21:48:24 2010//Tgeant4-09-04-beta-01
    10 /G4VScoreWriter.hh/1.2/Wed Sep 29 21:48:27 2010//Tgeant4-09-04-beta-01
    11 /G4VScoringMesh.hh/1.30/Wed Sep 29 21:48:27 2010//Tgeant4-09-04-beta-01
     1/G4DefaultLinearColorMap.hh/1.1/Thu Nov  4 15:58:45 2010//
     2/G4ScoringManager.hh/1.23/Thu Nov  4 15:58:45 2010//
     3/G4ScoringMessenger.hh/1.22/Thu Nov  4 15:58:45 2010//
     4/G4VScoreWriter.hh/1.2/Thu Nov  4 15:58:45 2010//
     5/G4ScoreLogColorMap.hh/1.3/Fri Nov  5 09:56:24 2010//
     6/G4ScoreQuantityMessenger.hh/1.5/Fri Nov  5 09:56:24 2010//
     7/G4ScoringBox.hh/1.21/Fri Nov  5 09:56:24 2010//
     8/G4ScoringCylinder.hh/1.6/Fri Nov  5 09:56:24 2010//
     9/G4VScoreColorMap.hh/1.7/Fri Nov  5 09:56:24 2010//
     10/G4VScoringMesh.hh/1.40/Fri Nov  5 09:56:24 2010//
    1211D

  • trunk/source/digits_hits/utils/include/G4DefaultLinearColorMap.hh

    r1337 r1340  
    2626//
    2727// $Id: G4DefaultLinearColorMap.hh,v 1.1 2007/11/04 04:06:08 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/digits_hits/utils/include/G4ScoreLogColorMap.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ScoreLogColorMap.hh,v 1.1 2008/03/25 02:18:39 akimura Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ScoreLogColorMap.hh,v 1.3 2010/07/23 06:25:30 akimura Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/digits_hits/utils/include/G4ScoreQuantityMessenger.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ScoreQuantityMessenger.hh,v 1.4 2007/11/06 17:17:14 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ScoreQuantityMessenger.hh,v 1.5 2010/07/22 22:14:40 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030// (HISTORY)
    3131//  03-Sep-2007  T.Aso Command definitions are introduced.
    3232//  01-Nov-2007  M.Asai Class is splited into two.
     33//  20-Jul-2010  T.Aso  Specify unit for scorer
    3334
    3435
    … …  
    4546class G4UIdirectory;
    4647class G4UIcmdWithAString;
     48class G4UIcmdWithoutParameter;
    4749class G4UIcommand;
    4850
    … …  
    7375    void FParticleCommand(G4VScoringMesh* mesh,G4TokenVec& token);
    7476    void FParticleWithEnergyCommand(G4VScoringMesh* mesh,G4TokenVec& token);
     77
     78    G4bool CheckMeshPS(G4VScoringMesh* mesh, G4String& psname);
    7579 
    7680  private:
    … …  
    8488    G4UIdirectory*             quantityDir;
    8589    G4UIcmdWithAString*        qTouchCmd;
     90    G4UIcmdWithoutParameter*   qGetUnitCmd;
     91    G4UIcmdWithAString*        qSetUnitCmd;
    8692    //
    87     G4UIcmdWithAString*   qCellChgCmd;
    88     G4UIcmdWithAString*   qCellFluxCmd;
    89     G4UIcmdWithAString*   qPassCellFluxCmd;
    90     G4UIcmdWithAString*   qeDepCmd;
    91     G4UIcmdWithAString*   qdoseDepCmd;
    92     G4UIcmdWithAString*   qnOfStepCmd;
    93     G4UIcmdWithAString*   qnOfSecondaryCmd;
     93    G4UIcommand*   qCellChgCmd;
     94    G4UIcommand*   qCellFluxCmd;
     95    G4UIcommand*   qPassCellFluxCmd;
     96    G4UIcommand*   qeDepCmd;
     97    G4UIcommand*   qdoseDepCmd;
     98    G4UIcommand*   qnOfStepCmd;
     99    G4UIcommand*   qnOfSecondaryCmd;
    94100    //
    95101    G4UIcommand*          qTrackLengthCmd;
    … …  
    106112    G4UIcommand*          qTrackCountCmd;
    107113    G4UIcommand*          qTerminationCmd;
     114    G4UIcommand*          qMinKinEAtGeneCmd;
    108115
    109116    //

  • trunk/source/digits_hits/utils/include/G4ScoringBox.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ScoringBox.hh,v 1.19 2010/06/14 13:28:17 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ScoringBox.hh,v 1.21 2010/07/22 02:04:39 akimura Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5353  void Draw(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, G4int axflg=111);
    5454  void DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap,
    55                           G4int idxProj, G4int idxColumn);
     55                  G4int idxProj, G4int idxColumn);
    5656
    5757  // set a direction to segment this mesh

  • trunk/source/digits_hits/utils/include/G4ScoringCylinder.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4ScoringCylinder.hh,v 1.2 2008/03/23 14:32:12 akimura Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ScoringCylinder.hh,v 1.6 2010/07/25 11:05:03 akimura Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5151      virtual void Draw(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, G4int axflg=111);
    5252      virtual void DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap,
    53                               G4int idxProj, G4int idxColumn);
     53                          G4int idxProj, G4int idxColumn);
    5454
    55 
    56   void SetRMinMax(G4double rMinMax[2]) {
    57     for(int i = 0; i < 2; i++) fSize[i] = rMinMax[i];
    58   }
    59   void SetRMin(G4double rMin) {fSize[0] = rMin;}
    60   void SetRMax(G4double rMax) {fSize[1] = rMax;}
    61   void SetZSize(G4double zSize) {fSize[2] = zSize;}
    62 
    63   void SetSegmentDirection(G4int dir) {fSegmentDirection = dir;} // supports the r-direction only at present.
     55  void SetRMax(G4double rMax) {fSize[0] = rMax;}
     56  void SetZSize(G4double zSize) {fSize[1] = zSize;} // half height
    6457
    6558  void RegisterPrimitives(std::vector<G4VPrimitiveScorer *> & vps);
    6659
    67   // get 3D index (r,z,phi) from sequential index
     60  // get 3D index (z,phi,r) from sequential index
    6861  void GetRZPhi(G4int index, G4int q[3]) const;
    6962
    7063private:
    71   G4int fSegmentDirection; // =1: r, =2: phi, =3: z
     64  //enum IDX {IR, IZ, IPHI};
     65  enum IDX {IZ, IPHI, IR};
     66
    7267  G4LogicalVolume * fMeshElementLogical;
    7368 

  • trunk/source/digits_hits/utils/include/G4ScoringManager.hh

    r1337 r1340  
    2626//
    2727// $Id: G4ScoringManager.hh,v 1.23 2007/11/14 20:41:17 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/digits_hits/utils/include/G4ScoringMessenger.hh

    r1337 r1340  
    2626//
    2727// $Id: G4ScoringMessenger.hh,v 1.22 2008/02/29 12:23:14 akimura Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030// (HISTORY)

  • trunk/source/digits_hits/utils/include/G4VScoreColorMap.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VScoreColorMap.hh,v 1.5 2008/08/29 02:50:05 akimura Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VScoreColorMap.hh,v 1.7 2010/07/23 06:25:30 akimura Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    7070  // draw a color chart
    7171  virtual void DrawColorChart(G4int nPoint = 5);
     72
    7273  virtual void DrawColorChartBar(G4int nPoint);
     74
    7375  virtual void DrawColorChartText(G4int nPoint);
     76
     77
     78  void SetPSUnit(G4String & unit) {fPSUnit = unit;}
     79  void SetPSName(G4String & psName) {fPSName = psName;}
    7480
    7581  protected:
    … …  
    7985      G4double fMaxVal;
    8086  G4VVisManager * fVisManager;
     87  G4String fPSUnit;
     88  G4String fPSName;
    8189};
    8290

  • trunk/source/digits_hits/utils/include/G4VScoreWriter.hh

    r1337 r1340  
    2626//
    2727// $Id: G4VScoreWriter.hh,v 1.2 2007/11/06 09:41:34 akimura Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/digits_hits/utils/include/G4VScoringMesh.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VScoringMesh.hh,v 1.30 2010/06/14 13:28:17 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VScoringMesh.hh,v 1.40 2010/07/27 01:44:54 akimura Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    8787  virtual void Draw(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, G4int axflg=111) = 0;
    8888  // draw a column of a quantity on a current viewer
    89   virtual void DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap, 
    90                           G4int idxProj, G4int idxColumn) = 0;
     89  virtual void DrawColumn(std::map<G4int, G4double*> * map, G4VScoreColorMap* colorMap,
     90                          G4int idxProj, G4int idxColumn) = 0;
    9191  // reset registered primitive scorers
    9292  void ResetScore();
    … …  
    115115  // get number of segments of this mesh
    116116  void GetNumberOfSegments(G4int nSegment[3]);
    117   // set positions to segment this mesh
    118   inline void SetSegmentPositions(std::vector<G4double> & sp) {fSegmentPositions = sp;}
    119117
    120118  // register a primitive scorer to the MFD & set it to the current primitive scorer
    … …  
    131129    else return false;
    132130  }
     131  // get unit of primitive scorer by the name
     132  G4String GetPSUnit(G4String & psname);
     133  // get unit of current primitive scorer
     134  G4String GetCurrentPSUnit();
     135  // set unit of current primitive scorer
     136  void SetCurrentPSUnit(const G4String& unit);
     137  // get unit value of primitive scorer by the name
     138  G4double GetPSUnitValue(G4String & psname);
     139  // set PS name to be drawn
     140  void SetDrawPSName(G4String & psname) {fDrawPSName = psname;}
     141
     142  // get axis names of the hierarchical division in the divided order
     143  void GetDivisionAxisNames(G4String divisionAxisNames[3]);
     144
    133145  // set current  primitive scorer to NULL
    134146  void SetNullToCurrentPrimitiveScorer() {fCurrentPS = NULL;}
    … …  
    157169  G4RotationMatrix * fRotationMatrix;
    158170  G4int fNSegment[3];
    159   std::vector<G4double> fSegmentPositions;
    160171
    161172  std::map<G4String, G4THitsMap<G4double>* > fMap;
    … …  
    167178  G4bool nMeshIsSet;
    168179
     180  G4String fDrawUnit;
     181  G4double fDrawUnitValue;
     182  G4String fDrawPSName;
     183
     184  G4String fDivisionAxisNames[3];
    169185};
    170186
    … …  
    192208void G4VScoringMesh::DrawMesh(G4String psName,G4VScoreColorMap* colorMap,G4int axflg)
    193209{
     210  fDrawPSName = psName;
    194211  std::map<G4String, G4THitsMap<G4double>* >::const_iterator fMapItr = fMap.find(psName);
    195   if(fMapItr!=fMap.end())
    196   { Draw(fMapItr->second->GetMap(),colorMap,axflg); }
    197   else
    198   { G4cerr << "Scorer <" << psName << "> is not defined. Method ignored." << G4endl; }
     212  if(fMapItr!=fMap.end()) {
     213    fDrawUnit = GetPSUnit(psName);
     214    fDrawUnitValue = GetPSUnitValue(psName);
     215    Draw(fMapItr->second->GetMap(), colorMap,axflg);
     216  } else {
     217    G4cerr << "Scorer <" << psName << "> is not defined. Method ignored." << G4endl;
     218  }
    199219}
    200220
    201221void G4VScoringMesh::DrawMesh(G4String psName,G4int idxPlane,G4int iColumn,G4VScoreColorMap* colorMap)
    202222{
     223  fDrawPSName = psName;
    203224  std::map<G4String, G4THitsMap<G4double>* >::const_iterator fMapItr = fMap.find(psName);
    204   if(fMapItr!=fMap.end())
    205   { DrawColumn(fMapItr->second->GetMap(),colorMap,idxPlane,iColumn); }
    206   else
    207   { G4cerr << "Scorer <" << psName << "> is not defined. Method ignored." << G4endl; }
     225  if(fMapItr!=fMap.end()) {
     226    fDrawUnit = GetPSUnit(psName);
     227    fDrawUnitValue = GetPSUnitValue(psName);
     228    DrawColumn(fMapItr->second->GetMap(),colorMap,idxPlane,iColumn);
     229  } else {
     230    G4cerr << "Scorer <" << psName << "> is not defined. Method ignored." << G4endl;
     231  }
    208232}
    209233
Note: See TracChangeset for help on using the changeset viewer.