Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc (Version 11.3.0) and /digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc (Version 10.6.p2)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 //                                                 26 //
 27 //                                                 27 //
 28 // G4PSSphereSurfaceFlux                           28 // G4PSSphereSurfaceFlux
 29 #include "G4PSSphereSurfaceFlux.hh"                29 #include "G4PSSphereSurfaceFlux.hh"
 30                                                    30 
 31 #include "G4SystemOfUnits.hh"                      31 #include "G4SystemOfUnits.hh"
 32 #include "G4StepStatus.hh"                         32 #include "G4StepStatus.hh"
 33 #include "G4Track.hh"                              33 #include "G4Track.hh"
 34 #include "G4VSolid.hh"                             34 #include "G4VSolid.hh"
 35 #include "G4VPhysicalVolume.hh"                    35 #include "G4VPhysicalVolume.hh"
 36 #include "G4VPVParameterisation.hh"                36 #include "G4VPVParameterisation.hh"
 37 #include "G4UnitsTable.hh"                         37 #include "G4UnitsTable.hh"
 38 #include "G4GeometryTolerance.hh"                  38 #include "G4GeometryTolerance.hh"
 39 //////////////////////////////////////////////     39 ////////////////////////////////////////////////////////////////////////////////
 40 // (Description)                                   40 // (Description)
 41 //   This is a primitive scorer class for scor     41 //   This is a primitive scorer class for scoring only Surface Flux.
 42 //  Flux version assumes only for G4Sphere sha <<  42 //  Flux version assumes only for G4Sphere shape. 
 43 //                                                 43 //
 44 // Surface is defined  at the inside of sphere     44 // Surface is defined  at the inside of sphere.
 45 // Direction                  -Rmin   +Rmax        45 // Direction                  -Rmin   +Rmax
 46 //   0  IN || OUT            ->|<-     |           46 //   0  IN || OUT            ->|<-     |
 47 //   1  IN                   ->|       |           47 //   1  IN                   ->|       |
 48 //   2  OUT                    |<-     |           48 //   2  OUT                    |<-     |
 49 //                                                 49 //
 50 // Created: 2005-11-14  Tsukasa ASO, Akinori K     50 // Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
 51 // 29-Mar-2007  T.Aso,  Bug fix for momentum d     51 // 29-Mar-2007  T.Aso,  Bug fix for momentum direction at outgoing flux.
 52 // 2010-07-22   Introduce Unit specification.      52 // 2010-07-22   Introduce Unit specification.
 53 // 2010-07-22   Add weighted and divideByAre o     53 // 2010-07-22   Add weighted and divideByAre options
 54 // 2011-02-21   Get correct momentum direction <<  54 // 2011-02-21   Get correct momentum direction in Flux_Out. 
 55 // 2011-09-09   Modify comment in PrintAll().      55 // 2011-09-09   Modify comment in PrintAll().
 56 // 2014-03-03  T.Aso,  To use always positive      56 // 2014-03-03  T.Aso,  To use always positive value for anglefactor.
 57 //////////////////////////////////////////////     57 ///////////////////////////////////////////////////////////////////////////////
 58                                                    58 
 59 G4PSSphereSurfaceFlux::G4PSSphereSurfaceFlux(c <<  59 G4PSSphereSurfaceFlux::G4PSSphereSurfaceFlux(G4String name, 
 60                                              G <<  60                                          G4int direction, G4int depth)
 61   : G4PSSphereSurfaceFlux(name, direction, "pe <<  61   : G4VPrimitiveScorer(name,depth),HCID(-1),fDirection(direction),
 62 {}                                             <<  62     EvtMap(0),weighted(true),divideByArea(true)
                                                   >>  63 {
                                                   >>  64     DefineUnitAndCategory();
                                                   >>  65     SetUnit("percm2");
                                                   >>  66 }
 63                                                    67 
 64 G4PSSphereSurfaceFlux::G4PSSphereSurfaceFlux(c <<  68 G4PSSphereSurfaceFlux::G4PSSphereSurfaceFlux(G4String name, 
 65                                              c <<  69                                              G4int direction,
 66   : G4VPrimitiveScorer(name, depth)            <<  70                                              const G4String& unit,
 67   , HCID(-1)                                   <<  71                                              G4int depth)
 68   , fDirection(direction)                      <<  72   : G4VPrimitiveScorer(name,depth),HCID(-1),fDirection(direction),
 69   , EvtMap(nullptr)                            <<  73     EvtMap(0),weighted(true),divideByArea(true)
 70   , weighted(true)                             << 
 71   , divideByArea(true)                         << 
 72 {                                                  74 {
 73   DefineUnitAndCategory();                     <<  75     DefineUnitAndCategory();
 74   SetUnit(unit);                               <<  76     SetUnit(unit);
 75 }                                                  77 }
 76                                                    78 
 77 G4bool G4PSSphereSurfaceFlux::ProcessHits(G4St <<  79 G4PSSphereSurfaceFlux::~G4PSSphereSurfaceFlux()
                                                   >>  80 {;}
                                                   >>  81 
                                                   >>  82 G4bool G4PSSphereSurfaceFlux::ProcessHits(G4Step* aStep,G4TouchableHistory*)
 78 {                                                  83 {
 79   G4StepPoint* preStep = aStep->GetPreStepPoin     84   G4StepPoint* preStep = aStep->GetPreStepPoint();
 80                                                    85 
 81   G4VPhysicalVolume* physVol       = preStep-> <<  86   G4VPhysicalVolume* physVol = preStep->GetPhysicalVolume();
 82   G4VPVParameterisation* physParam = physVol->     87   G4VPVParameterisation* physParam = physVol->GetParameterisation();
 83   G4VSolid* solid                  = nullptr;  <<  88   G4VSolid * solid = 0;
 84   if(physParam != nullptr)                     <<  89   if(physParam)
 85   {  // for parameterized volume               <<  90   { // for parameterized volume
 86     G4int idx =                                <<  91     G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
 87       ((G4TouchableHistory*) (aStep->GetPreSte <<  92                 ->GetReplicaNumber(indexDepth);
 88         ->GetReplicaNumber(indexDepth);        << 
 89     solid = physParam->ComputeSolid(idx, physV     93     solid = physParam->ComputeSolid(idx, physVol);
 90     solid->ComputeDimensions(physParam, idx, p <<  94     solid->ComputeDimensions(physParam,idx,physVol);
 91   }                                                95   }
 92   else                                             96   else
 93   {  // for ordinary volume                    <<  97   { // for ordinary volume
 94     solid = physVol->GetLogicalVolume()->GetSo     98     solid = physVol->GetLogicalVolume()->GetSolid();
 95   }                                                99   }
 96                                                   100 
 97   auto  sphereSolid = (G4Sphere*) (solid);     << 101   G4Sphere* sphereSolid = (G4Sphere*)(solid);
 98                                                   102 
 99   G4int dirFlag = IsSelectedSurface(aStep, sph << 103   G4int dirFlag =IsSelectedSurface(aStep,sphereSolid);
100   if(dirFlag > 0)                              << 104   if ( dirFlag > 0 ) {
101   {                                            << 105     if ( fDirection == fFlux_InOut || fDirection == dirFlag ){
102     if(fDirection == fFlux_InOut || fDirection << 106 
103     {                                          << 107       G4StepPoint* thisStep=0;
104       G4StepPoint* thisStep = nullptr;         << 108       if ( dirFlag == fFlux_In ){
105       if(dirFlag == fFlux_In)                  << 
106       {                                        << 
107         thisStep = preStep;                       109         thisStep = preStep;
108       }                                        << 110       }else if ( dirFlag == fFlux_Out ){
109       else if(dirFlag == fFlux_Out)            << 
110       {                                        << 
111         thisStep = aStep->GetPostStepPoint();     111         thisStep = aStep->GetPostStepPoint();
112       }                                        << 112       }else{
113       else                                     << 113         return FALSE;
114       {                                        << 
115         return false;                          << 
116       }                                           114       }
117                                                   115 
118       G4TouchableHandle theTouchable = thisSte    116       G4TouchableHandle theTouchable = thisStep->GetTouchableHandle();
119       G4ThreeVector pdirection       = thisSte << 117       G4ThreeVector pdirection = thisStep->GetMomentumDirection();
120       G4ThreeVector localdir =                 << 118       G4ThreeVector localdir  = 
121         theTouchable->GetHistory()->GetTopTran    119         theTouchable->GetHistory()->GetTopTransform().TransformAxis(pdirection);
122       G4double localdirL2 = localdir.x() * loc << 120       G4double localdirL2 = localdir.x()*localdir.x()
123                             localdir.y() * loc << 121         +localdir.y()*localdir.y()
124                             localdir.z() * loc << 122         +localdir.z()*localdir.z();
125       G4ThreeVector stppos1 = aStep->GetPreSte << 123       G4ThreeVector stppos1= aStep->GetPreStepPoint()->GetPosition();
126       G4ThreeVector localpos1 =                << 124       G4ThreeVector localpos1 = 
127         theTouchable->GetHistory()->GetTopTran    125         theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos1);
128       G4double localR2 = localpos1.x() * local << 126       G4double localR2 = localpos1.x()*localpos1.x()
129                          localpos1.y() * local << 127         +localpos1.y()*localpos1.y()
130                          localpos1.z() * local << 128         +localpos1.z()*localpos1.z();
131       G4double anglefactor =                   << 129       G4double anglefactor = (localdir.x()*localpos1.x()
132         (localdir.x() * localpos1.x() + locald << 130                               +localdir.y()*localpos1.y()
133          localdir.z() * localpos1.z()) /       << 131                               +localdir.z()*localpos1.z())
134         std::sqrt(localdirL2) / std::sqrt(loca << 132         /std::sqrt(localdirL2)/std::sqrt(localR2);
135       if(anglefactor < 0.0)                    << 133       if ( anglefactor < 0.0 ) anglefactor *= -1.0;
136         anglefactor *= -1.0;                   << 
137                                                   134 
138       G4double current = 1.0 / anglefactor;       135       G4double current = 1.0 / anglefactor;
139       if(weighted)                             << 136       if ( weighted ) current *= thisStep->GetWeight(); // Flux (Particle Weight)
140         current *= thisStep->GetWeight();  //  << 137       if ( divideByArea ) // Flux with angle.
141       if(divideByArea)                     //  << 
142       {                                           138       {
143         G4double radi = sphereSolid->GetInnerR << 139         G4double radi   = sphereSolid->GetInnerRadius();
144         G4double dph  = sphereSolid->GetDeltaP << 140         G4double dph    = sphereSolid->GetDeltaPhiAngle()/radian;
145         G4double stth = sphereSolid->GetStartT << 141         G4double stth   = sphereSolid->GetStartThetaAngle()/radian;
146         G4double enth = stth + sphereSolid->Ge << 142         G4double enth   = stth+sphereSolid->GetDeltaThetaAngle()/radian;
147         current /= radi * radi * dph * (-std:: << 143         current /= radi*radi*dph*( -std::cos(enth) + std::cos(stth) );
148       }                                           144       }
149                                                   145 
150       G4int index = GetIndex(aStep);              146       G4int index = GetIndex(aStep);
151       EvtMap->add(index, current);             << 147       EvtMap->add(index,current);
152     }                                             148     }
153   }                                               149   }
154                                                   150 
155   return true;                                 << 151   return TRUE;
156 }                                                 152 }
157                                                   153 
158 G4int G4PSSphereSurfaceFlux::IsSelectedSurface << 154 G4int G4PSSphereSurfaceFlux::IsSelectedSurface(G4Step* aStep, G4Sphere* sphereSolid){
159                                                << 
160 {                                              << 
161   G4TouchableHandle theTouchable =             << 
162     aStep->GetPreStepPoint()->GetTouchableHand << 
163   G4double kCarTolerance =                     << 
164     G4GeometryTolerance::GetInstance()->GetSur << 
165                                                   155 
166   if(aStep->GetPreStepPoint()->GetStepStatus() << 156   G4TouchableHandle theTouchable = 
167   {                                            << 157     aStep->GetPreStepPoint()->GetTouchableHandle();
                                                   >> 158   G4double kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
                                                   >> 159   
                                                   >> 160   if (aStep->GetPreStepPoint()->GetStepStatus() == fGeomBoundary ){
168     // Entering Geometry                          161     // Entering Geometry
169     G4ThreeVector stppos1 = aStep->GetPreStepP << 162     G4ThreeVector stppos1= aStep->GetPreStepPoint()->GetPosition();
170     G4ThreeVector localpos1 =                  << 163     G4ThreeVector localpos1 = 
171       theTouchable->GetHistory()->GetTopTransf    164       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos1);
172     G4double localR2 = localpos1.x() * localpo << 165     G4double localR2 = localpos1.x()*localpos1.x()
173                        localpos1.y() * localpo << 166                       +localpos1.y()*localpos1.y()
174                        localpos1.z() * localpo << 167                       +localpos1.z()*localpos1.z();
175     // G4double InsideRadius2 =                << 168     //G4double InsideRadius2 = 
176     //  sphereSolid->GetInsideRadius()*sphereS    169     //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
177     // if(std::fabs( localR2 - InsideRadius2 ) << 170     //if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
178     G4double InsideRadius = sphereSolid->GetIn    171     G4double InsideRadius = sphereSolid->GetInnerRadius();
179     if(localR2 >                               << 172     if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
180          (InsideRadius - kCarTolerance) * (Ins << 173          &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
181        localR2 <                               << 
182          (InsideRadius + kCarTolerance) * (Ins << 
183     {                                          << 
184       return fFlux_In;                            174       return fFlux_In;
185     }                                             175     }
186   }                                               176   }
187                                                   177 
188   if(aStep->GetPostStepPoint()->GetStepStatus( << 178   if (aStep->GetPostStepPoint()->GetStepStatus() == fGeomBoundary ){
189   {                                            << 
190     // Exiting Geometry                           179     // Exiting Geometry
191     G4ThreeVector stppos2 = aStep->GetPostStep << 180     G4ThreeVector stppos2= aStep->GetPostStepPoint()->GetPosition();
192     G4ThreeVector localpos2 =                  << 181     G4ThreeVector localpos2 = 
193       theTouchable->GetHistory()->GetTopTransf    182       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos2);
194     G4double localR2 = localpos2.x() * localpo << 183     G4double localR2 = localpos2.x()*localpos2.x()
195                        localpos2.y() * localpo << 184                       +localpos2.y()*localpos2.y()
196                        localpos2.z() * localpo << 185                       +localpos2.z()*localpos2.z();
197     // G4double InsideRadius2 =                << 186     //G4double InsideRadius2 = 
198     //  sphereSolid->GetInsideRadius()*sphereS    187     //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
199     // if(std::facb(localR2 - InsideRadius2) ) << 188     //if(std::facb(localR2 - InsideRadius2) ) < kCarTolerance ){
200     G4double InsideRadius = sphereSolid->GetIn    189     G4double InsideRadius = sphereSolid->GetInnerRadius();
201     if(localR2 >                               << 190     if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
202          (InsideRadius - kCarTolerance) * (Ins << 191          &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
203        localR2 <                               << 
204          (InsideRadius + kCarTolerance) * (Ins << 
205     {                                          << 
206       return fFlux_Out;                           192       return fFlux_Out;
207     }                                             193     }
208   }                                               194   }
209                                                   195 
210   return -1;                                      196   return -1;
211 }                                                 197 }
212                                                   198 
213 void G4PSSphereSurfaceFlux::Initialize(G4HCofT    199 void G4PSSphereSurfaceFlux::Initialize(G4HCofThisEvent* HCE)
214 {                                                 200 {
215   EvtMap = new G4THitsMap<G4double>(detector->    201   EvtMap = new G4THitsMap<G4double>(detector->GetName(), GetName());
216   if(HCID < 0)                                 << 202   if ( HCID < 0 ) HCID = GetCollectionID(0);
217     HCID = GetCollectionID(0);                 << 203   HCE->AddHitsCollection(HCID, (G4VHitsCollection*)EvtMap);
218   HCE->AddHitsCollection(HCID, (G4VHitsCollect << 204 }
                                                   >> 205 
                                                   >> 206 void G4PSSphereSurfaceFlux::EndOfEvent(G4HCofThisEvent*)
                                                   >> 207 {;}
                                                   >> 208 
                                                   >> 209 void G4PSSphereSurfaceFlux::clear(){
                                                   >> 210   EvtMap->clear();
219 }                                                 211 }
220                                                   212 
221 void G4PSSphereSurfaceFlux::clear() { EvtMap-> << 213 void G4PSSphereSurfaceFlux::DrawAll()
                                                   >> 214 {;}
222                                                   215 
223 void G4PSSphereSurfaceFlux::PrintAll()            216 void G4PSSphereSurfaceFlux::PrintAll()
224 {                                                 217 {
225   G4cout << " MultiFunctionalDet  " << detecto    218   G4cout << " MultiFunctionalDet  " << detector->GetName() << G4endl;
226   G4cout << " PrimitiveScorer " << GetName() < << 219   G4cout << " PrimitiveScorer " << GetName() <<G4endl; 
227   G4cout << " Number of entries " << EvtMap->e    220   G4cout << " Number of entries " << EvtMap->entries() << G4endl;
228   for(const auto& [copy, flux] : *(EvtMap->Get << 221   std::map<G4int,G4double*>::iterator itr = EvtMap->GetMap()->begin();
229   {                                            << 222   for(; itr != EvtMap->GetMap()->end(); itr++) {
230     G4cout << "  copy no.: " << copy           << 223     G4cout << "  copy no.: " << itr->first
231            << "  Flux  : " << *(flux) / GetUni << 224            << "  Flux  : " << *(itr->second)/GetUnitValue()
232            << GetUnit() << "]" << G4endl;      << 225            << " ["<<GetUnit()<<"]"
                                                   >> 226            << G4endl;
233   }                                               227   }
234 }                                                 228 }
235                                                   229 
236 void G4PSSphereSurfaceFlux::SetUnit(const G4St    230 void G4PSSphereSurfaceFlux::SetUnit(const G4String& unit)
237 {                                                 231 {
238   if(divideByArea)                             << 232     if ( divideByArea ) {
239   {                                            << 233         CheckAndSetUnit(unit,"Per Unit Surface");
240     CheckAndSetUnit(unit, "Per Unit Surface"); << 234     } else {
241   }                                            << 235         if (unit == "" ){
242   else                                         << 236             unitName = unit;
243   {                                            << 237             unitValue = 1.0;
244     if(unit.empty())                           << 238         }else{
245     {                                          << 239             G4String msg = "Invalid unit ["+unit+"] (Current  unit is [" +GetUnit()+"] ) for " + GetName();
246       unitName  = unit;                        << 240             G4Exception("G4PSSphereSurfaceFlux::SetUnit","DetPS0016",JustWarning,msg);
247       unitValue = 1.0;                         << 241         }
248     }                                          << 
249     else                                       << 
250     {                                          << 
251       G4String msg = "Invalid unit [" + unit + << 
252                      GetUnit() + "] ) for " +  << 
253       G4Exception("G4PSSphereSurfaceFlux::SetU << 
254                   msg);                        << 
255     }                                             242     }
256   }                                            << 
257 }                                                 243 }
258                                                   244 
259 void G4PSSphereSurfaceFlux::DefineUnitAndCateg << 245 void G4PSSphereSurfaceFlux::DefineUnitAndCategory(){
260 {                                              << 246    // Per Unit Surface
261   // Per Unit Surface                          << 247    new G4UnitDefinition("percentimeter2","percm2","Per Unit Surface",(1./cm2));
262   new G4UnitDefinition("percentimeter2", "perc << 248    new G4UnitDefinition("permillimeter2","permm2","Per Unit Surface",(1./mm2));
263                        (1. / cm2));            << 249    new G4UnitDefinition("permeter2","perm2","Per Unit Surface",(1./m2));
264   new G4UnitDefinition("permillimeter2", "perm << 
265                        (1. / mm2));            << 
266   new G4UnitDefinition("permeter2", "perm2", " << 
267 }                                                 250 }
                                                   >> 251 
268                                                   252