Changeset 44 in JEM-EUSO for esaf_lal

Timestamp:

Mar 18, 2013, 4:23:14 PM (11 years ago)

Author:

moretto

Message:

addition in branches of R11265UPhotomultiplier.cc

Location:

esaf_lal/branches/test_electronics/src

Files:

• ElectronicsFactory.cc (modified) (3 diffs)
• R11265UPhotomultiplier.cc (added)

esaf_lal/branches/test_electronics/src/ElectronicsFactory.cc

@@ -15 +15 @@
 #include "OpticsFactory.hh"
 #include "Photomultiplier.hh"
+#include "R11265UPhotomultiplier.hh"
 #include "R7600M64Photomultiplier.hh"
 #include "R8900M36Photomultiplier.hh"
 #include "R8900M64Photomultiplier.hh"
-#include "R11265U100Photomultiplier.hh"
-#include "R11265U200Photomultiplier.hh"
 #include "FrontEndChip.hh"
 #include "StandardMacroCell.hh"
@@ -162 +161 @@
 
     string type = Conf()->GetStr("ElectronicsFactory.PmtType");
+std::cout << "***************************************************PmtType => " << type << std::endl;
+
     if ( type == "R7600M64Photomultiplier" ) {
         return new R7600M64Photomultiplier( id , g );
@@ -171 +172 @@
         return new R8900M64Photomultiplier( id , g );
     }
-    if ( type == "R11265U100Photomultiplier" ) {
-        return new R11265U100Photomultiplier( id , g );
-    }
-    if ( type == "R11265U200Photomultiplier" ) {
-        return new R11265U200Photomultiplier( id , g );
-    }    
+    if ( type == "R11265U100Photomultiplier" || type == "R11265U200Photomultiplier" ) {
+std::cout << "la fonction ElectronicsFactory::MakePmt retourne un new R11265UPhotomultiplier" << std::endl;
+        return new R11265UPhotomultiplier( id , g ); 
+    }
     FatalError(type + ", unknown Pmt Type");
     return 0;