Changeset 963 for trunk/source/processes/optical/src

Timestamp:

Apr 6, 2009, 12:34:39 PM (16 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/optical/src

Files:

• G4OpAbsorption.cc (modified) (3 diffs)
• G4OpBoundaryProcess.cc (modified) (8 diffs)
• G4OpRayleigh.cc (modified) (10 diffs)
• G4OpWLS.cc (modified) (12 diffs)

trunk/source/processes/optical/src/G4OpAbsorption.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpAbsorption.cc,v 1.7 2006/06/29 21:08:50 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4OpAbsorption.cc,v 1.9 2008/10/24 19:52:28 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -52 +52 @@
 
 #include "G4ios.hh"
+#include "G4OpProcessSubType.hh"
+
 #include "G4OpAbsorption.hh"
 
@@ -76 +78 @@
            G4cout << GetProcessName() << " is created " << G4endl;
         }
+
+        SetProcessSubType(fOpAbsorption);
 }
 

trunk/source/processes/optical/src/G4OpBoundaryProcess.cc

@@ -67 +67 @@
 
 #include "G4ios.hh"
+#include "G4OpProcessSubType.hh"
+
 #include "G4OpBoundaryProcess.hh"
 #include "G4GeometryTolerance.hh"
@@ -93 +95 @@
            G4cout << GetProcessName() << " is created " << G4endl;
         }
+
+        SetProcessSubType(fOpBoundary);
 
         theStatus = Undefined;
@@ -220 +224 @@
         OpticalSurface = NULL;
 
-        G4LogicalSurface* Surface = G4LogicalBorderSurface::GetSurface
-                                    (pPreStepPoint ->GetPhysicalVolume(),
-                                     pPostStepPoint->GetPhysicalVolume());
+        G4LogicalSurface* Surface = NULL;
+
+        Surface = G4LogicalBorderSurface::GetSurface
+                  (pPreStepPoint ->GetPhysicalVolume(),
+                   pPostStepPoint->GetPhysicalVolume());
 
         if (Surface == NULL){
@@ -249 +255 @@
         }
 
-        //      if (Surface) OpticalSurface = dynamic_cast <G4OpticalSurface*> (Surface->GetSurfaceProperty());
-        if (Surface) OpticalSurface = (G4OpticalSurface*) Surface->GetSurfaceProperty();
+        if (Surface) OpticalSurface = 
+           dynamic_cast <G4OpticalSurface*> (Surface->GetSurfaceProperty());
 
         if (OpticalSurface) {
@@ -429 +435 @@
 
           DielectricMetal();
+
+          // Uncomment the following lines if you wish to have 
+          //         Transmission instead of Absorption
+          // if (theStatus == Absorption) {
+          //    return G4VDiscreteProcess::PostStepDoIt(aTrack, aStep);
+          // }
 
         }
@@ -579 +591 @@
            if( !G4BooleanRand(theReflectivity) && n == 1 ) {
 
+             // Comment out DoAbsorption and uncomment theStatus = Absorption;
+             // if you wish to have Transmission instead of Absorption
+
              DoAbsorption();
+             // theStatus = Absorption;
              break;
 
@@ -657 +673 @@
               Through = false;
               theGlobalNormal = -theGlobalNormal;
-              G4Swap(Material1,Material2);
-              G4Swap(&Rindex1,&Rindex2);
+              G4SwapPtr(Material1,Material2);
+              G4SwapObj(&Rindex1,&Rindex2);
            }
 
@@ -864 +880 @@
                 else {
                    Swap = !Swap;
-                   G4Swap(Material1,Material2);
-                   G4Swap(&Rindex1,&Rindex2);
+                   G4SwapPtr(Material1,Material2);
+                   G4SwapObj(&Rindex1,&Rindex2);
                 }
                 if ( theFinish == groundbackpainted )

trunk/source/processes/optical/src/G4OpRayleigh.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpRayleigh.cc,v 1.14 2006/06/29 21:08:54 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4OpRayleigh.cc,v 1.17 2008/10/24 19:51:12 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 
@@ -57 +57 @@
 
 #include "G4ios.hh"
+#include "G4OpProcessSubType.hh"
+
 #include "G4OpRayleigh.hh"
 
@@ -78 +80 @@
            : G4VDiscreteProcess(processName, type)
 {
+        SetProcessSubType(fOpRayleigh);
 
         thePhysicsTable = 0;
@@ -248 +251 @@
         const G4Material* aMaterial = aTrack.GetMaterial();
 
-        G4double thePhotonMomentum = aParticle->GetTotalMomentum();
+        G4double thePhotonEnergy = aParticle->GetTotalEnergy();
 
         G4double AttenuationLength = DBL_MAX;
@@ -258 +261 @@
            AttenuationLength =
                 (*thePhysicsTable)(aMaterial->GetIndex())->
-                           GetValue(thePhotonMomentum, isOutRange);
+                           GetValue(thePhotonEnergy, isOutRange);
         }
         else {
@@ -270 +273 @@
              if(AttenuationLengthVector){
                AttenuationLength = AttenuationLengthVector ->
-                                    GetProperty(thePhotonMomentum);
+                                    GetProperty(thePhotonEnergy);
              }
              else{
@@ -305 +308 @@
 
         // Retrieve vectors for refraction index
-        // and photon momentum from the material properties table
+        // and photon energy from the material properties table
 
         G4MaterialPropertyVector* Rindex = aMPT->GetProperty("RINDEX");
@@ -325 +328 @@
            while (++(*Rindex)) {
 
-                e = (Rindex->GetPhotonMomentum());
+                e = (Rindex->GetPhotonEnergy());
 
                 refraction_index = Rindex->GetProperty();
@@ -332 +335 @@
 
                 if (verboseLevel>0) {
-                        G4cout << Rindex->GetPhotonMomentum() << " MeV\t";
+                        G4cout << Rindex->GetPhotonEnergy() << " MeV\t";
                         G4cout << xlambda << " mm\t";
                 }
@@ -347 +350 @@
                 }
                 RayleighScatteringLengths->
-                        InsertValues(Rindex->GetPhotonMomentum(), Dist);
+                        InsertValues(Rindex->GetPhotonEnergy(), Dist);
            }
 

trunk/source/processes/optical/src/G4OpWLS.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpWLS.cc,v 1.9 2007/10/30 03:53:36 gum Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4OpWLS.cc,v 1.13 2008/10/24 19:50:50 gum Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -46 +46 @@
 
 #include "G4ios.hh"
+#include "G4OpProcessSubType.hh"
+
 #include "G4OpWLS.hh"
 #include "G4WLSTimeGeneratorProfileDelta.hh"
@@ -61 +63 @@
   : G4VDiscreteProcess(processName, type)
 {
+  SetProcessSubType(fOpWLS);
+
   theIntegralTable = 0;
  
@@ -161 +165 @@
   for (G4int i = 0; i < NumPhotons; i++) {
     
-    // Determine photon momentum
+    // Determine photon energy
     
     G4double CIIvalue = G4UniformRand()*CIImax;
-    G4double sampledMomentum = 
+    G4double sampledEnergy = 
       WLSIntegral->GetEnergy(CIIvalue);
     
     if (verboseLevel>1) {
-      G4cout << "sampledMomentum = " << sampledMomentum << G4endl;
+      G4cout << "sampledEnergy = " << sampledEnergy << G4endl;
       G4cout << "CIIvalue =        " << CIIvalue << G4endl;
     }
@@ -217 +221 @@
        photonPolarization.z());
     
-    aWLSPhoton->SetKineticEnergy(sampledMomentum);
+    aWLSPhoton->SetKineticEnergy(sampledEnergy);
     
     // Generate new G4Track object:
@@ -230 +234 @@
     G4Track* aSecondaryTrack = 
       new G4Track(aWLSPhoton,aSecondaryTime,aSecondaryPosition);
-    
-    aSecondaryTrack->SetTouchableHandle((G4VTouchable*)0);
+   
+    aSecondaryTrack->SetTouchableHandle(aTrack.GetTouchableHandle()); 
+    // aSecondaryTrack->SetTouchableHandle((G4VTouchable*)0);
     
     aSecondaryTrack->SetParentID(aTrack.GetTrackID());
@@ -285 +290 @@
           
           // Retrieve the first intensity point in vector
-          // of (photon momentum, intensity) pairs
+          // of (photon energy, intensity) pairs
           
           theWLSVector->ResetIterator();
@@ -295 +300 @@
           if (currentIN >= 0.0) {
 
-            // Create first (photon momentum) 
+            // Create first (photon energy) 
            
             G4double currentPM = theWLSVector->
-              GetPhotonMomentum();
+              GetPhotonEnergy();
             
             G4double currentCII = 0.0;
@@ -311 +316 @@
             G4double prevIN  = currentIN;
             
-            // loop over all (photon momentum, intensity)
+            // loop over all (photon energy, intensity)
             // pairs stored for this material
             
@@ -317 +322 @@
               {
                 currentPM = theWLSVector->
-                  GetPhotonMomentum();
+                  GetPhotonEnergy();
                 
                 currentIN=theWLSVector->
@@ -355 +360 @@
   const G4Material* aMaterial = aTrack.GetMaterial();
 
-  G4double thePhotonMomentum = aParticle->GetTotalMomentum();
+  G4double thePhotonEnergy = aParticle->GetTotalEnergy();
 
   G4MaterialPropertiesTable* aMaterialPropertyTable;
@@ -369 +374 @@
     if ( AttenuationLengthVector ){
       AttenuationLength = AttenuationLengthVector->
-        GetProperty (thePhotonMomentum);
+        GetProperty (thePhotonEnergy);
     }
     else {