2 removed + 2 modified, total 4 files
slic/include
diff -u -r1.8 -r1.9
--- SteppingAction.hh 19 Oct 2005 22:51:10 -0000 1.8
+++ SteppingAction.hh 9 Feb 2006 03:05:20 -0000 1.9
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/SteppingAction.hh,v 1.8 2005/10/19 22:51:10 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/SteppingAction.hh,v 1.9 2006/02/09 03:05:20 jeremy Exp $
#ifndef slic_SteppingAction_hh
#define slic_SteppingAction_hh 1
@@ -9,7 +9,7 @@
#include "G4StepPoint.hh"
// Makoto's material scanner.
-#include "G4MSSteppingAction.hh"
+//#include "G4MSSteppingAction.hh"
class G4UserRegionInformation;
@@ -27,8 +27,8 @@
virtual ~SteppingAction();
virtual void UserSteppingAction(const G4Step*);
- private:
- G4MSSteppingAction* scanner;
+// private:
+// G4MSSteppingAction* scanner;
};
}
slic/include
diff -N G4MSSteppingAction.hh
--- G4MSSteppingAction.hh 7 Sep 2005 18:40:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-//
-// ********************************************************************
-// * DISCLAIMER *
-// * *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in: *
-// * http://cern.ch/geant4/license *
-// * *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work make any representation or warranty, express or implied, *
-// * regarding this software system or assume any liability for its *
-// * use. *
-// * *
-// * This code implementation is the intellectual property of the *
-// * GEANT4 collaboration. *
-// * By copying, distributing or modifying the Program (or any work *
-// * based on the Program) you indicate your acceptance of this *
-// * statement, and all its terms. *
-// ********************************************************************
-//
-//
-// $Id: G4MSSteppingAction.hh,v 1.1 2005/09/07 18:40:38 jeremy Exp $
-// GEANT4 tag $Name: $
-//
-//
-
-// class description:
-//
-
-//////////////////////
-//G4MSSteppingAction
-/////////////////////
-
-
-#ifndef G4MSSteppingAction_h
-#define G4MSSteppingAction_h 1
-
-class G4Region;
-
-#include "G4UserSteppingAction.hh"
-#include "globals.hh"
-
-class G4MSSteppingAction : public G4UserSteppingAction
-{
- public:
- G4MSSteppingAction();
- virtual ~G4MSSteppingAction();
-
- void Initialize(G4bool rSens,G4Region* reg);
- virtual void UserSteppingAction(const G4Step*);
-
- private:
- G4bool regionSensitive;
- G4Region* theRegion;
- G4double length;
- G4double x0;
- G4double lambda;
-
- public:
- inline G4double GetTotalStepLength() const { return length; }
- inline G4double GetX0() const { return x0; }
- inline G4double GetLambda0() const { return lambda; }
-};
-
-#endif
slic/src
diff -u -r1.9 -r1.10
--- SteppingAction.cc 19 Oct 2005 22:51:18 -0000 1.9
+++ SteppingAction.cc 9 Feb 2006 03:05:21 -0000 1.10
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/SteppingAction.cc,v 1.9 2005/10/19 22:51:18 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SteppingAction.cc,v 1.10 2006/02/09 03:05:21 jeremy Exp $
#include "SteppingAction.hh"
// slic
@@ -8,12 +8,14 @@
#include "G4UserRegionInformation.hh"
#include "TrackInformation.hh"
+#include "G4UserSteppingAction.hh"
+
namespace slic
{
SteppingAction::SteppingAction()
{
- scanner = new G4MSSteppingAction();
+// scanner = new G4MSSteppingAction();
}
SteppingAction::~SteppingAction()
@@ -25,7 +27,7 @@
TrajectoryManager::instance()->stepping( aStep );
// Materials scanner
- scanner->UserSteppingAction(aStep);
+// scanner->UserSteppingAction(aStep);
}
}
slic/src
diff -N G4MSSteppingAction.cc
--- G4MSSteppingAction.cc 7 Sep 2005 18:40:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,69 +0,0 @@
-//
-// ********************************************************************
-// * DISCLAIMER *
-// * *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in: *
-// * http://cern.ch/geant4/license *
-// * *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work make any representation or warranty, express or implied, *
-// * regarding this software system or assume any liability for its *
-// * use. *
-// * *
-// * This code implementation is the intellectual property of the *
-// * GEANT4 collaboration. *
-// * By copying, distributing or modifying the Program (or any work *
-// * based on the Program) you indicate your acceptance of this *
-// * statement, and all its terms. *
-// ********************************************************************
-//
-//
-// $Id: G4MSSteppingAction.cc,v 1.1 2005/09/07 18:40:39 jeremy Exp $
-// GEANT4 tag $Name: $
-//
-//
-//
-
-
-#include "G4MSSteppingAction.hh"
-
-#include "G4Step.hh"
-#include "G4VPhysicalVolume.hh"
-#include "G4LogicalVolume.hh"
-#include "G4Region.hh"
-#include "G4Material.hh"
-
-G4MSSteppingAction::G4MSSteppingAction()
-{
- Initialize(false,0);
-}
-
-G4MSSteppingAction::~G4MSSteppingAction()
-{;}
-
-void G4MSSteppingAction::Initialize(G4bool rSens,G4Region* reg)
-{
- regionSensitive = rSens;
- theRegion = reg;
- length = 0.;
- x0 = 0.;
- lambda = 0.;
-}
-
-void G4MSSteppingAction::UserSteppingAction(const G4Step* aStep)
-{
- G4StepPoint* preStepPoint = aStep->GetPreStepPoint();
- G4Region* region = preStepPoint->GetPhysicalVolume()->GetLogicalVolume()->GetRegion();
-
- if(regionSensitive && (region!=theRegion)) return;
-
- G4double stlen = aStep->GetStepLength();
- G4Material* material = preStepPoint->GetMaterial();
- length += stlen;
- x0 += stlen/(material->GetRadlen());
- lambda += stlen/(material->GetNuclearInterLength());
-}
-
CVSspam 0.2.8