Changeset 273 in Idarraga

Timestamp:

Mar 13, 2012, 9:02:36 AM (12 years ago)

Author:

idarraga

Message:

Mimosa26 included

File:

• allpix/src/AllPixSetupDigitizers.cc (modified) (5 diffs)

allpix/src/AllPixSetupDigitizers.cc

@@ -2 +2 @@
  *  Authors:
  *   John Idarraga <idarraga@cern.ch>
- *   Mathieu Benoit <benoit@lal.in2p3.fr>
+ *   Mathieu Benoit <Mathieu.Benoit@cern.ch>
  */
 
@@ -9 +9 @@
 #include "G4SDManager.hh"
 #include "G4PrimaryVertex.hh"
+#include "AllPixMedipix2Digitizer.hh"
+#include "AllPixFEI3StandardDigitizer.hh"
 #include "AllPixMimosa26Digitizer.hh"
-#include "AllPixFEI3StandardDigitizer.hh"
 
+// __endofheader__
 
 // geometry
@@ -71 +73 @@
                 }
                 if(!found){
-                        cout << "Couldn't find the detector in the list ! "<< endl;
+                        cout << "Couldn't find the detector in the list !!!??? "<< endl;
                         exit(1);
                 }
@@ -100 +102 @@
                 // Creating an instance of the actual digitizer, and keep pointer through the interface
                 AllPixDigitizerInterface * dmPtr;
+        // __beginofdigitlist__
                 if (digitizerName == "FEI3Standard") {
                         AllPixFEI3StandardDigitizer * dp = new AllPixFEI3StandardDigitizer(digitizerModulesNames[itr] , hcName, digitColectionName);
+                        dmPtr = static_cast<AllPixDigitizerInterface *> (dp);
+                        cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
+                } else if (digitizerName == "Medipix2") {
+                        AllPixMedipix2Digitizer * dp = new AllPixMedipix2Digitizer(digitizerModulesNames[itr] , hcName, digitColectionName);
                         dmPtr = static_cast<AllPixDigitizerInterface *> (dp);
                         cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
@@ -109 +116 @@
                         cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
                 }
-
- else {
+ 
+        // __endofdigitlist__
+            else {
                         G4cout << "    can't find digitizer with name : " << digitizerName << G4endl;
                         exit(1);