Changeset 47 in JEM-EUSO for esaf_lal

Timestamp:

Mar 21, 2013, 4:11:34 PM (11 years ago)

Author:

moretto

Message:

electronics for new mapmts

Location:

esaf_lal/branches/test_electronics

Files:

• include/R11265U200Photomultiplier.hh (modified) (1 diff)
• src/ElectronicsFactory.cc (modified) (3 diffs)
• src/EusoElectronics.cc (modified) (1 diff)
• src/MacroCell.cc (modified) (1 diff)
• src/Photomultiplier.cc (modified) (1 diff)
• src/R11265U200Photomultiplier.cc (modified) (1 diff)
• src/R11265UPhotomultiplier.cc (deleted)
• src/StandardMacroCell.cc (modified) (1 diff)

esaf_lal/branches/test_electronics/include/R11265U200Photomultiplier.hh

@@ -4 +4 @@
 //
 // S.Ogawa & M. Bertaina 2004-11-26
-// C.Moretto & S.Dagoret-Campagne 2013-02-21
+// C.Moretto &S.Dagoret-Campagne 2013-02-21
 
 #ifndef __R11265U200PHOTOMULTIPLIER_HH_

esaf_lal/branches/test_electronics/src/ElectronicsFactory.cc

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

esaf_lal/branches/test_electronics/src/EusoElectronics.cc

@@ -474 +474 @@
     // Simulate the whole electronics behaviour for this event
     //
-
-std::cout << "****************************************************************" << std::endl;
-std::cout << "Salut!! Ici on utilise la methode => EusoElectronics::Simulate()" << std::endl;
-std::cout << "****************************************************************" << std::endl;
 
     if ( !fSimulateElectronics ) {

esaf_lal/branches/test_electronics/src/MacroCell.cc

@@ -158 +158 @@
     // (user must have called Simulate for each of them)
     // 
-
-std::cout << "****************************************************************" << std::endl;
-std::cout << "Salut!! ici on utilise la methode => MacroCell::CheckPmtState()" << std::endl;
-std::cout << "****************************************************************" << std::endl;
-
 
     for( size_t i=0; i < fPmts.size(); i++) { 

esaf_lal/branches/test_electronics/src/Photomultiplier.cc

@@ -314 +314 @@
     // the Photomultipliers job ends here. The Front End simulation
     // and MacroCell simulation is assumed to be handled by some one else.
-std::cout << "*****************************************************************************" << std::endl;
-std::cout << "Salut!! Ici on utillise la methode => Photomultiplier::Simulate()" << std::endl;
-std::cout << "*****************************************************************************" << std::endl;
 
     // do not do it twice or if empty

esaf_lal/branches/test_electronics/src/R11265U200Photomultiplier.cc

@@ -10 +10 @@
 //_____________________________________________________________________________
 //
-//   R11265U-200 high collection efficiency photomultiplier tube
+//   R11265U-100 high collection efficiency photomultiplier tube
 //   ===========================================================
 //  

esaf_lal/branches/test_electronics/src/StandardMacroCell.cc

@@ -40 +40 @@
     // Electronics simulation for this macrocell
     //
-
-std::cout << "****************************************************************" << std::endl;
-std::cout << "Salut!! Ici on utilise la methode StandardMacroCell::Simulate()" << std::endl;
-std::cout << "****************************************************************" << std::endl;
 
     ConfigFileParser *pConfig = Config::Get()->GetCF("Electronics","MacroCell");