Changeset 70

Timestamp:

Jan 12, 2006, 3:58:03 PM (18 years ago)

Author:

campagne

Message:

simplification of the names

Location:

MEMPHYS/HEAD

Files:

• MEMPHYS/Analysis.hh (added)
• MEMPHYS/Cast.hh (added)
• MEMPHYS/DetectorConstruction.hh (added)
• MEMPHYS/DetectorMessenger.hh (added)
• MEMPHYS/EventAction.hh (added)
• MEMPHYS/IAnalysis.hh (added)
• MEMPHYS/MEMPHYSAnalysis.hh (deleted)
• MEMPHYS/MEMPHYSCast.hh (deleted)
• MEMPHYS/MEMPHYSDetectorConstruction.hh (deleted)
• MEMPHYS/MEMPHYSDetectorMessenger.hh (deleted)
• MEMPHYS/MEMPHYSEventAction.hh (deleted)
• MEMPHYS/MEMPHYSIAnalysis.hh (deleted)
• MEMPHYS/MEMPHYSPhysicsList.hh (deleted)
• MEMPHYS/MEMPHYSPhysicsMessenger.hh (deleted)
• MEMPHYS/MEMPHYSPrimaryGeneratorAction.hh (deleted)
• MEMPHYS/MEMPHYSPrimaryGeneratorMessenger.hh (deleted)
• MEMPHYS/MEMPHYSRunAction.hh (deleted)
• MEMPHYS/MEMPHYSRunActionMessenger.hh (deleted)
• MEMPHYS/MEMPHYSStackingAction.hh (deleted)
• MEMPHYS/MEMPHYSSteppingAction.hh (deleted)
• MEMPHYS/MEMPHYSTrackInformation.hh (deleted)
• MEMPHYS/MEMPHYSTrackingAction.hh (deleted)
• MEMPHYS/MEMPHYSTrajectory.hh (deleted)
• MEMPHYS/MEMPHYSWCDigi.hh (deleted)
• MEMPHYS/MEMPHYSWCDigitizer.hh (deleted)
• MEMPHYS/MEMPHYSWCHit.hh (deleted)
• MEMPHYS/MEMPHYSWCSD.hh (deleted)
• MEMPHYS/PhysicsList.hh (added)
• MEMPHYS/PhysicsMessenger.hh (added)
• MEMPHYS/PrimaryGeneratorAction.hh (added)
• MEMPHYS/PrimaryGeneratorMessenger.hh (added)
• MEMPHYS/RunAction.hh (added)
• MEMPHYS/RunActionMessenger.hh (added)
• MEMPHYS/StackingAction.hh (added)
• MEMPHYS/SteppingAction.hh (added)
• MEMPHYS/TrackInformation.hh (added)
• MEMPHYS/TrackingAction.hh (added)
• MEMPHYS/Trajectory.hh (added)
• MEMPHYS/WCDigi.hh (added)
• MEMPHYS/WCDigitizer.hh (added)
• MEMPHYS/WCHit.hh (added)
• MEMPHYS/WCSD.hh (added)
• applications/MEMPHYS_batch.cxx (modified) (4 diffs)
• applications/MEMPHYS_session.cxx (modified) (7 diffs)

MEMPHYS/HEAD/applications/MEMPHYS_batch.cxx

@@ -5 +5 @@
 
 //MEMPHYS:
-#include "MEMPHYS/MEMPHYSAnalysis.hh"
-#include "MEMPHYS/MEMPHYSDetectorConstruction.hh"
-#include "MEMPHYS/MEMPHYSPhysicsList.hh"
-#include "MEMPHYS/MEMPHYSPhysicsMessenger.hh"
-#include "MEMPHYS/MEMPHYSPrimaryGeneratorAction.hh"
-#include "MEMPHYS/MEMPHYSEventAction.hh"
-#include "MEMPHYS/MEMPHYSRunAction.hh"
-#include "MEMPHYS/MEMPHYSStackingAction.hh"
-#include "MEMPHYS/MEMPHYSTrackingAction.hh"
-#include "MEMPHYS/MEMPHYSSteppingAction.hh"
+#include "MEMPHYS/Analysis.hh"
+#include "MEMPHYS/DetectorConstruction.hh"
+#include "MEMPHYS/PhysicsList.hh"
+#include "MEMPHYS/PhysicsMessenger.hh"
+#include "MEMPHYS/PrimaryGeneratorAction.hh"
+#include "MEMPHYS/EventAction.hh"
+#include "MEMPHYS/RunAction.hh"
+#include "MEMPHYS/StackingAction.hh"
+#include "MEMPHYS/TrackingAction.hh"
+#include "MEMPHYS/SteppingAction.hh"
 
 
@@ -40 +40 @@
   }
   //Book all the histo, tuple 
-  MEMPHYS::MEMPHYSAnalysis* analysis = new MEMPHYS::MEMPHYSAnalysis(*aida);
+  MEMPHYS::Analysis* analysis = new MEMPHYS::Analysis(*aida);
 
 
@@ -51 +51 @@
 
   //JEC 18/11/05 give the "analysis" to fill geometry ITuple
-  MEMPHYS::MEMPHYSDetectorConstruction* MEMPHYSdetector = 
-    new MEMPHYS::MEMPHYSDetectorConstruction(*analysis); 
+  MEMPHYS::DetectorConstruction* MEMPHYSdetector = 
+    new MEMPHYS::DetectorConstruction(*analysis); 
 
   runManager->SetUserInitialization(MEMPHYSdetector);
 
-  runManager->SetUserInitialization(new MEMPHYS::MEMPHYSPhysicsList);
+  runManager->SetUserInitialization(new MEMPHYS::PhysicsList);
 
   G4UImanager* UI = G4UImanager::GetUIpointer();
@@ -68 +68 @@
 
   // Set user action classes
-  MEMPHYS::MEMPHYSPrimaryGeneratorAction* myGeneratorAction = new MEMPHYS::MEMPHYSPrimaryGeneratorAction(MEMPHYSdetector);
+  MEMPHYS::PrimaryGeneratorAction* myGeneratorAction = new MEMPHYS::PrimaryGeneratorAction(MEMPHYSdetector);
   runManager->SetUserAction(myGeneratorAction);
 
-  MEMPHYS::MEMPHYSRunAction* myRunAction = new MEMPHYS::MEMPHYSRunAction();
+  MEMPHYS::RunAction* myRunAction = new MEMPHYS::RunAction();
 
   runManager->SetUserAction(myRunAction);
 
 
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSEventAction(*analysis,
+  runManager->SetUserAction(new MEMPHYS::EventAction(*analysis,
                                                    myRunAction, 
                                                    MEMPHYSdetector,
                                                    myGeneratorAction));
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSTrackingAction);
+  runManager->SetUserAction(new MEMPHYS::TrackingAction);
 
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSStackingAction);
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSSteppingAction); //JEC 15/12/05 Add user SteppingAction
+  runManager->SetUserAction(new MEMPHYS::StackingAction);
+  runManager->SetUserAction(new MEMPHYS::SteppingAction); //JEC 15/12/05 Add user SteppingAction
 
   // Initialize G4 kernel

MEMPHYS/HEAD/applications/MEMPHYS_session.cxx

@@ -23 +23 @@
 
 //MEMPHYS:
-#include "MEMPHYS/MEMPHYSAnalysis.hh"
-#include "MEMPHYS/MEMPHYSDetectorConstruction.hh"
-#include "MEMPHYS/MEMPHYSPhysicsList.hh"
-#include "MEMPHYS/MEMPHYSPhysicsMessenger.hh"
-#include "MEMPHYS/MEMPHYSPrimaryGeneratorAction.hh"
-#include "MEMPHYS/MEMPHYSEventAction.hh"
-#include "MEMPHYS/MEMPHYSRunAction.hh"
-#include "MEMPHYS/MEMPHYSStackingAction.hh"
-#include "MEMPHYS/MEMPHYSTrackingAction.hh"
-#include "MEMPHYS/MEMPHYSSteppingAction.hh"
-#include "MEMPHYS/MEMPHYSWCDigi.hh"
+#include "MEMPHYS/Analysis.hh"
+#include "MEMPHYS/DetectorConstruction.hh"
+#include "MEMPHYS/PhysicsList.hh"
+#include "MEMPHYS/PhysicsMessenger.hh"
+#include "MEMPHYS/PrimaryGeneratorAction.hh"
+#include "MEMPHYS/EventAction.hh"
+#include "MEMPHYS/RunAction.hh"
+#include "MEMPHYS/StackingAction.hh"
+#include "MEMPHYS/TrackingAction.hh"
+#include "MEMPHYS/SteppingAction.hh"
+#include "MEMPHYS/WCDigi.hh"
 
 // Create a manager to access the MEMPHYSAnalysis from the callbacks :
@@ -39 +39 @@
 //JEC 10/1/06 introduce MEMPHYS namespace
 namespace MEMPHYS {
-class MEMPHYSAnalysisManager 
+
+class AnalysisManager 
   :public virtual IManager
-  ,public MEMPHYSAnalysis  {
+  ,public Analysis  {
  public: //IManager
   virtual const std::string& name() const { return fName;}
   virtual void* cast(const std::string& aTo) const {
-    if(aTo=="MEMPHYS::MEMPHYSAnalysisManager") {
-      return Lib_SCast(MEMPHYS::MEMPHYSAnalysisManager);
-    } else if(aTo=="MEMPHYS::MEMPHYSIAnalysis") {
-      return Lib_SCast(MEMPHYS::MEMPHYSIAnalysis);
-    } else if(aTo=="MEMPHYS::MEMPHYSAnalysis") {
-      return Lib_SCast(MEMPHYS::MEMPHYSAnalysis);
+    if(aTo=="MEMPHYS::AnalysisManager") {
+      return Lib_SCast(MEMPHYS::AnalysisManager);
+    } else if(aTo=="MEMPHYS::IAnalysis") {
+      return Lib_SCast(MEMPHYS::IAnalysis);
+    } else if(aTo=="MEMPHYS::Analysis") {
+      return Lib_SCast(MEMPHYS::Analysis);
     } else if(aTo=="IManager") {
       return Lib_SCast(IManager);
@@ -58 +59 @@
   }
  public:
-  MEMPHYSAnalysisManager(AIDA::IAnalysisFactory& aAIDA,bool aBatch)
-    :MEMPHYSAnalysis(aAIDA,aBatch),fName("MEMPHYS::MEMPHYSAnalysisManager") {}
-  virtual ~MEMPHYSAnalysisManager(){}
+  AnalysisManager(AIDA::IAnalysisFactory& aAIDA,bool aBatch)
+    :Analysis(aAIDA,aBatch),fName("MEMPHYS::AnalysisManager") {}
+  virtual ~AnalysisManager(){}
  private:
   std::string fName;
@@ -82 +83 @@
   G4Lab::UIOnX* session = new G4Lab::UIOnX(*runManager,gui,aArgc,aArgv);
 
-  MEMPHYS::MEMPHYSAnalysisManager* analysisManager = 0;
+  MEMPHYS::AnalysisManager* analysisManager = 0;
 
   AIDA::IAnalysisFactory* aida = G4Lab::UIOnX_aida(*session);
@@ -88 +89 @@
     std::cout << "MEMPHYS_session : AIDA not found." << std::endl;
   } else {
-    analysisManager = new MEMPHYS::MEMPHYSAnalysisManager(*aida,false);
+    analysisManager = new MEMPHYS::AnalysisManager(*aida,false);
     session->addManager(analysisManager);
   }
@@ -96 +97 @@
     //FIXME : From G4VDigiCollection, we can't loop on G4VDigi !
     session->addType
-      (new G4Lab::DigitsCollectionType<MEMPHYS::MEMPHYSWCDigi>
+      (new G4Lab::DigitsCollectionType<MEMPHYS::WCDigi>
         (*(session->session()),"WCDigitizedCollection"));
   }
@@ -109 +110 @@
   
   //JEC 18/11/05 give the "analysis" to fill geometry ITuple
-  MEMPHYS::MEMPHYSDetectorConstruction* MEMPHYSdetector = 
-    new MEMPHYS::MEMPHYSDetectorConstruction(*analysisManager); 
+  MEMPHYS::DetectorConstruction* MEMPHYSdetector = 
+    new MEMPHYS::DetectorConstruction(*analysisManager); 
 
   runManager->SetUserInitialization(MEMPHYSdetector);
 
-  runManager->SetUserInitialization(new MEMPHYS::MEMPHYSPhysicsList);
+  runManager->SetUserInitialization(new MEMPHYS::PhysicsList);
 
   // Set user action classes
-  MEMPHYS::MEMPHYSPrimaryGeneratorAction* myGeneratorAction = 
-    new MEMPHYS::MEMPHYSPrimaryGeneratorAction(MEMPHYSdetector);
+  MEMPHYS::PrimaryGeneratorAction* myGeneratorAction = 
+    new MEMPHYS::PrimaryGeneratorAction(MEMPHYSdetector);
   runManager->SetUserAction(myGeneratorAction);
 
-  MEMPHYS::MEMPHYSRunAction* myRunAction = new MEMPHYS::MEMPHYSRunAction();
+  MEMPHYS::RunAction* myRunAction = new MEMPHYS::RunAction();
 
   runManager->SetUserAction(myRunAction);
 
 
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSEventAction(*analysisManager,
+  runManager->SetUserAction(new MEMPHYS::EventAction(*analysisManager,
                                                    myRunAction, 
                                                    MEMPHYSdetector,
                                                    myGeneratorAction));
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSTrackingAction);
+  runManager->SetUserAction(new MEMPHYS::TrackingAction);
 
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSStackingAction);
+  runManager->SetUserAction(new MEMPHYS::StackingAction);
 
-  runManager->SetUserAction(new MEMPHYS::MEMPHYSSteppingAction); //JEC 15/12/05 Add user SteppingAction
+  runManager->SetUserAction(new MEMPHYS::SteppingAction); //JEC 15/12/05 Add user SteppingAction
 
   // Initialize G4 kernel