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