Context Navigation

Changeset 48 in JEM-EUSO

Timestamp:

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

Author:

moretto

Message:

merge test_electronics branch with trunk

Location:

esaf_lal/trunk/esaf/packages/simulation/detector/electronics

Files:

esaf_lal/trunk/esaf/packages/simulation/detector/electronics
- Property svn:mergeinfo set to
  /esaf_lal/branches/test_electronics merged eligible

r16	r48
56	56	#pragma link C++ class R8900M36Photomultiplier+;
57	57	#pragma link C++ class R8900M64Photomultiplier+;
	58	#pragma link C++ class R11265U100Photomultiplier+;
	59	#pragma link C++ class R11265U200Photomultiplier+;
58	60	#pragma link C++ class SignalChipTrackingTrgEngine+;
59	61	#pragma link C++ class SiliconPhotomultiplier+;

-                      r16
+                      r48
 #include "OpticsFactory.hh"
 #include "Photomultiplier.hh"
+#include "R11265U100Photomultiplier.hh"
+#include "R11265U200Photomultiplier.hh"
 #include "R7600M64Photomultiplier.hh"
 #include "R8900M36Photomultiplier.hh"
 …
         return new R8900M64Photomultiplier( id , g );
+    }
+    FatalError("Unknown Pmt Type");
+    if ( type == "R11265U100Photomultiplier" ) {
+        return new R11265U100Photomultiplier( id , g );
+    }
+    if ( type == "R11265U200Photomultiplier" ) {
+        return new R11265U200Photomultiplier( id , g );
+    }
+    FatalError(type + ", unknown Pmt Type");
     return 0;
+}

r16	r48
158	158	// (user must have called Simulate for each of them)
159	159	//
	160
160	161	for( size_t i=0; i < fPmts.size(); i++) {
161	162	Photomultiplier* pPmt = fPmts[i];

Note: See TracChangeset for help on using the changeset viewer.