Changeset 17202 for trunk

Timestamp:

10/06/13 13:30:11 (11 years ago)

Author:

dneise

Message:

in commit 17200 & 17201 I committed accidentally a lot of changes,
that were totally unnecessary. So I reverted back to 17199.
In this revision the svn property svn:ignore is still set, such that 
all the Cint.cc and Cint.h files as well as .d files are ignored.

In addition I changed melectronics/MAvalanchePhotoDiode.h:
I gave the Afterpulse class a ClassDef macro... 
and I added the link pragma into LinkDef.h file.
So now one can easier write test macros for the APD class,
without the need to compile the macro.

Sorry for the hubbub.

Location:

trunk/Mars

Files:

• melectronics/Afterpulse.cc (deleted)
• melectronics/Afterpulse.h (deleted)
• melectronics/MAvalanchePhotoDiode.cc (modified) (2 diffs)
• melectronics/MAvalanchePhotoDiode.h (modified) (1 diff)
• melectronics/Makefile (modified) (1 diff)
• msimcamera/MSimAPD.cc (modified) (1 diff)

trunk/Mars/melectronics/MAvalanchePhotoDiode.cc

@@ -71 +71 @@
 //        apd.IncreaseTime(dtend);
 //
-//        // Now you can access the afterpulses by
+//        // Now you can excess the afterpulses by
 //        TIter Next(&a->GetListOfAfterpulses());
 //        Afterpulse *ap = 0;
@@ -94 +94 @@
 #include "MLog.h"
 #include "MLogManip.h"
-#include "Afterpulse.h"
 
 ClassImp(APD);

trunk/Mars/melectronics/MAvalanchePhotoDiode.h

@@ -122 +122 @@
 };
 
+class Afterpulse : public TObject
+{
+private:
+    UInt_t  fCellIndex;  // Index of G-APD cell the afterpulse belongs to
+
+    Float_t fTime;       // Time at which the afterpulse avalanch broke through
+    Float_t fAmplitude;  // Amplitude (crosstalk!) the pulse produced
+
+    Int_t Compare(const TObject *obj) const
+    {
+        return static_cast<const Afterpulse*>(obj)->fTime>fTime ? -1 : 1;
+    }
+
+    Bool_t IsSortable() const { return kTRUE; }
+
+public:
+    Afterpulse(UInt_t idx, Float_t t) : fCellIndex(idx), fTime(t), fAmplitude(0) { }
+
+    UInt_t GetCellIndex() const { return fCellIndex; }
+
+    Float_t GetTime() const { return fTime; }
+    Float_t GetAmplitude() const { return fAmplitude; }
+
+    Float_t Process(APD &apd)
+    {
+        // Do not process afterpulses twice (e.g. HitRelative + IncreaseTime)
+        // This should not happen anyway
+        //        if (fAmplitude>0)
+        //            return fAmplitude;
+
+        const UInt_t nx  = apd.GetNumCellsX()+2;
+
+        const UInt_t x = fCellIndex%nx;
+        const UInt_t y = fCellIndex/nx;
+
+        fAmplitude = apd.HitCellImp(x, y, fTime);
+
+        return fAmplitude;
+    }
+    ClassDef(Afterpulse, 1) // An Afterpulse object
+};
+
 #endif

trunk/Mars/melectronics/Makefile

@@ -22 +22 @@
 
 SRCFILES = MAvalanchePhotoDiode.cc \
-           Afterpulse.cc \
            MAnalogSignal.cc \
            MAnalogChannels.cc \

trunk/Mars/msimcamera/MSimAPD.cc

@@ -69 +69 @@
 
 #include "MAvalanchePhotoDiode.h"
-#include "Afterpulse.h"
 
 ClassImp(MSimAPD);