Changeset 120 for MEMPHYS

Timestamp:

Mar 28, 2006, 3:22:43 PM (18 years ago)

Author:

barrand

Message:

G.Barrand : migrate to Slash and Accessors

Location:

MEMPHYS/HEAD/applications

Files:

• DigitsCollectionAccessor.cxx (added)
• DigitsCollectionType.cxx (deleted)
• HitsCollectionAccessor.cxx (added)
• HitsCollectionType.cxx (deleted)
• MEMPHYS_session.cxx (modified) (8 diffs)

MEMPHYS/HEAD/applications/MEMPHYS_session.cxx

@@ -12 +12 @@
 #include <iostream>
 
+// Slash :
+#include <Slash/Core/IManager.h>
+#include <Slash/Core/ISession.h>
+#include <Slash/Data/IProcessor.h>
+
 // Lib :
-#include <Lib/Interfaces/IManager.h>
-#include <Lib/Interfaces/ISession.h>
-#include <Lib/Interfaces/ITypeManager.h>
 #include <Lib/Manager.h>
 #include <Lib/System.h>
@@ -25 +27 @@
 #include <G4Lab/TrackingAction.h>
 #include <G4Lab/Interfaces/IGeant4Manager.h>
-//#include <G4Lab/DigitsCollectionType.h>
+//#include <G4Lab/DigitsCollectionAccessor.h>
 
 //MEMPHYS:
@@ -39 +41 @@
 #include "MEMPHYS/SteppingAction.hh"
 #include "MEMPHYS/WCDigi.hh"
-#include <MEMPHYS/HitsCollectionType.h>
-#include <MEMPHYS/DigitsCollectionType.h>
+#include <MEMPHYS/HitsCollectionAccessor.h>
+#include <MEMPHYS/DigitsCollectionAccessor.h>
 
 // Create a manager to access the MEMPHYSAnalysis from the callbacks :
@@ -48 +50 @@
 
 class AppManager 
-  :public virtual IManager
+  :public virtual Slash::Core::IManager
   ,public Analysis  {
- public: //IManager
-  virtual const std::string& name() const { return fName;}
-  virtual void* cast(const std::string& aTo) const {
-    if(aTo=="MEMPHYS::AppManager") {
-      return Lib_SCast(MEMPHYS::AppManager);
-    } else if(aTo=="MEMPHYS::IAppManager") {
-      return Lib_SCast(MEMPHYS::IAppManager);
-    } else if(aTo=="MEMPHYS::Analysis") {
-      return Lib_SCast(MEMPHYS::Analysis);
-    } else if(aTo=="IManager") {
-      return Lib_SCast(IManager);
-    } else {
-      return 0;
-    }
+ public: //Slash::Core::IManager
+  virtual std::string name() const { return fName;}
+  virtual void* cast(const std::string& aClass) const {
+    if_Lib_SCast(MEMPHYS::AppManager)
+    else if_Lib_SCast(MEMPHYS::IAppManager)
+    else if_Lib_SCast(MEMPHYS::Analysis)
+    else if_Lib_SCast(Slash::Core::IManager)
+    else return 0;
   }
  public://IAppManager
@@ -85 +81 @@
     g4Manager->initialize();
 
-    // Overload the HitsCollectionType of G4Lab :
-    Lib::ITypeManager* typeManager = 
-      Lib_findManager(fSession,"TypeManager",Lib::ITypeManager);
-    if(typeManager) {
+    // Overload the HitsCollectionAccessor of G4Lab :
+    Slash::Data::IProcessor* accessorManager = 
+      Lib_findManager(fSession,"AccessorManager",Slash::Data::IProcessor);
+    if(accessorManager) {
       G4SDManager* sdManager = g4Manager->sdManager();
       if(sdManager) {
@@ -96 +92 @@
           for(int index=0;index<number;index++) {
             G4String hcName = hcTable->GetHCname(index);
-            typeManager->removeType(hcName);
-            typeManager->addType
-              (new MEMPHYS::HitsCollectionType(fSession,hcName));
+            accessorManager->removeAccessor(hcName);
+            accessorManager->addAccessor
+              (new MEMPHYS::HitsCollectionAccessor(fSession,hcName));
           }
         }
@@ -104 +100 @@
 
       /*
-      typeManager->addType
-        (new G4Lab::DigitsCollectionType<MEMPHYS::WCDigi>
+      accessorManager->addAccessor
+        (new G4Lab::DigitsCollectionAccessor<MEMPHYS::WCDigi>
           (fSession,"WCDigitizedCollection"));
       */
-      typeManager->addType
-        (new MEMPHYS::DigitsCollectionType<MEMPHYS::WCDigi>
+      accessorManager->addAccessor
+        (new MEMPHYS::DigitsCollectionAccessor<MEMPHYS::WCDigi>
           (fSession,"WCDigitizedCollection"));
     }
@@ -115 +111 @@
   }
  public:
-  AppManager(ISession& aSession,AIDA::IAnalysisFactory& aAIDA,bool aBatch)
+  AppManager(Slash::Core::ISession& aSession,AIDA::IAnalysisFactory& aAIDA,bool aBatch)
     :Analysis(aAIDA,aBatch),fSession(aSession),fName("MEMPHYS::AppManager") {}
   virtual ~AppManager(){}
  private:
-  ISession& fSession;
+  Slash::Core::ISession& fSession;
   std::string fName;
 };