Import Geant4 10.5.0.beta source tree

examples/advanced/composite_calorimeter/include/CCalActionInitializer.hh

@@ -0,0 +1,54 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * 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.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// $Id: CCalActionInitializer.hh 66241 2012-12-13 18:34:42Z gunter $
+// GEANT4 tag $Name:  $
+//
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+#ifndef CCalActionInitializer_h
+#define CCalActionInitializer_h 1
+
+#include "G4VUserActionInitialization.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+class CCalActionInitializer : public G4VUserActionInitialization
+{
+public:
+
+  CCalActionInitializer();
+  ~CCalActionInitializer(){;};
+  
+  void Build() const;
+  void BuildForMaster() const;
+
+};
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+#endif
+

examples/advanced/composite_calorimeter/include/CCalAnalysis.hh

@@ -41,55 +41,4 @@
 //! Alternative here is a XML file
 //#include "g4xml.hh"
 
-class CCalAnalysis {
-public:
-  virtual ~CCalAnalysis();
-  
-public:
-  void BeginOfRun(G4int n);
-  void EndOfRun(G4int n);
-  void EndOfEvent(G4int flag);
-
-  void Init();
-  void Finish();
-
-  int maxbin() {return numberOfTimeSlices;}
-
-  void InsertEnergyHcal(float*);
-  void InsertEnergyEcal(float*);
-  void InsertEnergy(float v);
-  void InsertLateralProfile(float*);
-  void InsertTime(float*); 
-  void InsertTimeProfile(int, double, double); 
-
-  void setNtuple(float* hcalE, float* ecalE, float elab, float x, float y, 
-		 float z, float edep, float edec, float edhc);
-
-  static CCalAnalysis* getInstance();
-
-private:
-  CCalAnalysis();
-
-private:
-  static CCalAnalysis* instance;
-
-  G4int fVerbosity;
-
-  G4int numberOfTimeSlices;
-  //enum {numberOfTimeSlices = 200}; 
-
-  //
-  //Id of the histograms (first of each block). Used internally for a 
-  //quick mapping of the proper histoID
-  //
-  G4int energy;
-  G4int hcalE; //  28 hadronic modules
-  G4int ecalE; //  49 crystal towers
-  G4int timeHist; // 200 nanoseconds time window
-  G4int lateralProfile;//  70 centimeters lateral window
-  // (indeed 64 should be enough)
-  G4int timeProfile; // at step and in sensitive detector
-};
-
-
 #endif

examples/advanced/composite_calorimeter/include/CCalEventAction.hh

@@ -28,36 +28,35 @@
 // Description: CCalEndOfEventAction provides User actions at end of event
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef CCalEndOfEventAction_h
-#define CCalEndOfEventAction_h
+#ifndef CCalEventAction_h
+#define CCalEventAction_h
 
 #include "G4UserEventAction.hh"
 #include "globals.hh"
 
 class CCaloOrganization;
 class G4HCofThisEvent;
-class CCalSteppingAction;
 class CCalPrimaryGeneratorAction;
+class CCalSteppingAction;
 
 typedef G4String nameType;
 
-class CCalEndOfEventAction: public G4UserEventAction{
+class CCalEventAction: public G4UserEventAction{
 
 public:
-  CCalEndOfEventAction(CCalPrimaryGeneratorAction*);
-  ~CCalEndOfEventAction();
+  CCalEventAction(CCalPrimaryGeneratorAction*,CCalSteppingAction*);
+  ~CCalEventAction();
   virtual void StartOfEventAction(const G4Event* evt);    
   virtual void EndOfEventAction(const G4Event* evt);    
 
 private:
-  void instanciateSteppingAction();
   void initialize();    
 
 private:
   G4bool                      isInitialized;
 
-  CCalPrimaryGeneratorAction* primaryGenerator;
-  CCalSteppingAction*         theSteppingAction;
+  CCalPrimaryGeneratorAction* fPrimaryGenerator;
+  CCalSteppingAction*         fSteppingAction;
   nameType*                   SDnames;
   G4int                       numberOfSD;
   CCaloOrganization*          theOrg;

examples/advanced/composite_calorimeter/include/CCalRunAction.hh

@@ -43,7 +43,13 @@ public:
   virtual void BeginOfRunAction(const G4Run* aRun);    
   virtual void EndOfRunAction(const G4Run* aRun);    
 
+  void Book();
+  G4int maxbin() const {return numberOfTimeSlices;}
 
+private:
+  G4int numberOfTimeSlices;
+  
+  
 };
 
 #endif

examples/advanced/composite_calorimeter/include/CCalSteppingAction.hh

@@ -34,26 +34,24 @@
 #include "globals.hh"
 
 class G4Step;
-class CCalSteppingAction : public G4UserSteppingAction {
-
-  friend class CCalEndOfEventAction;
-private:
-  CCalSteppingAction();
+class CCalRunAction;
+class CCalSteppingAction : public G4UserSteppingAction 
+{
+  
 public:
+  CCalSteppingAction();
   ~CCalSteppingAction();
       
 public:
   virtual void UserSteppingAction(const G4Step* aStep);    
-
+  void endOfEvent();
 
 private:
-
+  const CCalRunAction* runAct;
   float          LateralProfile[70];	
   float          timeDeposit[200];
   int            timeHistoMaxBin;	    
       
-private:
-  void endOfEvent();
 };
 
 #endif