Changeset 17200

Timestamp:

10/06/13 12:08:11 (11 years ago)

Author:

dneise

Message:

adjusted svn:ignore property to ignore Cint and Deb files

Location:

trunk/Mars

Files:

• . (modified) (1 prop)
• libnova (modified) (1 prop)
• manalysis (modified) (1 prop)
• mastro (modified) (1 prop)
• mbadpixels (modified) (1 prop)
• mbase (modified) (1 prop)
• mcalib (modified) (1 prop)
• mcamera (modified) (1 prop)
• mcorsika (modified) (1 prop)
• mdata (modified) (1 prop)
• mdrs (modified) (1 prop)
• melectronics (modified) (1 prop)
• melectronics/ElectronicsLinkDef.h (modified) (1 diff)
• melectronics/MAvalanchePhotoDiode.cc (modified) (2 diffs)
• melectronics/MAvalanchePhotoDiode.h (modified) (1 diff)
• melectronics/Makefile (modified) (1 diff)
• mextralgo (modified) (1 prop)
• mfbase (modified) (1 prop)
• mfileio (modified) (1 prop)
• mfilter (modified) (1 prop)
• mgeom (modified) (1 prop)
• mgui (modified) (1 prop)
• mhbase (modified) (1 prop)
• mhcalib (modified) (1 prop)
• mhflux (modified) (1 prop)
• mhft (modified) (1 prop)
• mhist (modified) (1 prop)
• mhvstime (modified) (1 prop)
• mimage (modified) (1 prop)
• mjobs (modified) (1 prop)
• mjoptim (modified) (1 prop)
• mjtrain (modified) (1 prop)
• mmain (modified) (1 prop)
• mmc (modified) (1 prop)
• mmovie (modified) (1 prop)
• mmuon (modified) (1 prop)
• mpedestal (modified) (1 prop)
• mpointing (modified) (1 prop)
• mranforest (modified) (1 prop)
• mraw (modified) (1 prop)
• mreport (modified) (1 prop)
• msignal (modified) (1 prop)
• msim (modified) (1 prop)
• msimcamera (modified) (1 prop)
• msimcamera/MSimAPD.cc (modified) (1 diff)
• msimreflector (modified) (1 prop)
• msql (modified) (1 prop)
• mtools (modified) (1 prop)
• mtrigger (modified) (1 prop)

trunk/Mars/melectronics/ElectronicsLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class APD+;
+#pragma link C++ class Afterpulse;
 #pragma link C++ class MAnalogSignal+;
 #pragma link C++ class MDigitalSignal+;

trunk/Mars/melectronics/MAvalanchePhotoDiode.cc

@@ -71 +71 @@
 //        apd.IncreaseTime(dtend);
 //
-//        // Now you can excess the afterpulses by
+//        // Now you can access 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;
-    }
-};
-
 #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);