X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSBeamTestDigSDD.cxx;h=2e41b18ac52a6b399586e1ef93d2eb9f42004f78;hb=62bdc654ba1174f485e4626a8aa0ac0e6dd3f4c8;hp=df99d3acebf396ae1751e78732e6a58863a4af76;hpb=5ba31760b3df11b728d346dd1e088dde8c649536;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSBeamTestDigSDD.cxx b/ITS/AliITSBeamTestDigSDD.cxx
index df99d3acebf..2e41b18ac52 100644
--- a/ITS/AliITSBeamTestDigSDD.cxx
+++ b/ITS/AliITSBeamTestDigSDD.cxx
@@ -5,9 +5,8 @@
 //                                                // 
 //                                                //
 ////////////////////////////////////////////////////
-#include "AliITS.h"
 #include "AliITSdigitSDD.h"
-#include "AliRawReaderDate.h"
+#include "AliRawReader.h"
 #include "AliVMERawStream.h"
 #include "AliITSRawStreamSDDv2.h"
 #include "AliITSRawStreamSDDv3.h"
@@ -21,27 +20,30 @@
 ClassImp(AliITSBeamTestDigSDD)
 
 //_____________________________________________________________
-  AliITSBeamTestDigSDD::AliITSBeamTestDigSDD(): AliITSBeamTestDig()
-{
+  AliITSBeamTestDigSDD::AliITSBeamTestDigSDD(): AliITSBeamTestDig(),
+fSDDEvType(0),
+fSubEventAttributes(0),
+fBtPer(),
+fThreshold(0),
+fStreamer(0){
   //
   // Constructor
   //
   SetBtPeriod();
-  fSubEventAttributes=0;
-  fThreshold=0;
-  fStreamer=0;
 }
 
 //_____________________________________________________________
-AliITSBeamTestDigSDD::AliITSBeamTestDigSDD(const Text_t* name, const Text_t* title): AliITSBeamTestDig(name,title)
+AliITSBeamTestDigSDD::AliITSBeamTestDigSDD(const Text_t* name, const Text_t* title): AliITSBeamTestDig(name,title),
+fSDDEvType(0),
+fSubEventAttributes(0),
+fBtPer(),
+fThreshold(0),
+fStreamer(0)
 {
   //
   // Constructor
   //
   SetBtPeriod();
-  fSubEventAttributes=0;
-  fThreshold=0;
-  fStreamer=0;
 }
 
 //__________________________________________________________________
@@ -63,17 +65,22 @@ void AliITSBeamTestDigSDD::Exec(Option_t* /*opt*/)
 
   TBranch* branch = fTreeD->GetBranch("ITSDigitsSDD");
   Int_t maxn=0;
-  AliITSgeom* geom = fBt->GetITSgeom();
+
+  if(!fITSgeom){
+    Error("Exec","fITSgeom is null!");
+    return;
+  }
+
   Int_t nsdd=0;
   Int_t nspd=0;
   Int_t nssd=0;
-  for(Int_t nlay=1;nlay<=geom->GetNlayers();nlay++){
-    for(Int_t nlad=1;nlad<=geom->GetNladders(nlay);nlad++){
-      for(Int_t ndet=1;ndet<=geom->GetNdetectors(nlay);ndet++){
-	Int_t index=geom->GetModuleIndex(nlay,nlad,ndet);
-	if(geom->GetModuleTypeName(index)=="kSPD") nspd++;
-	if(geom->GetModuleTypeName(index)=="kSDD") nsdd++;
-	if(geom->GetModuleTypeName(index)=="kSSD") nssd++;
+  for(Int_t nlay=1;nlay<=fITSgeom->GetNlayers();nlay++){
+    for(Int_t nlad=1;nlad<=fITSgeom->GetNladders(nlay);nlad++){
+      for(Int_t ndet=1;ndet<=fITSgeom->GetNdetectors(nlay);ndet++){
+	Int_t index=fITSgeom->GetModuleIndex(nlay,nlad,ndet);
+	if(fITSgeom->GetModuleTypeName(index)=="kSPD") nspd++;
+	if(fITSgeom->GetModuleTypeName(index)=="kSDD") nsdd++;
+	if(fITSgeom->GetModuleTypeName(index)=="kSSD") nssd++;
       }
     }
   }
@@ -88,21 +95,21 @@ void AliITSBeamTestDigSDD::Exec(Option_t* /*opt*/)
 
   switch(fBtPer){
   case kNov04:
-    fStreamer = new AliITSRawStreamSDDv3(fReaderDate);
+    fStreamer = new AliITSRawStreamSDDv3(fReader);
     break;
   case kAug04:
-    AliVMERawStream vmeStreamer(fReaderDate);
-    fReaderDate->RequireHeader(kFALSE);
-    while(fReaderDate->ReadHeader()){
-      fSubEventAttributes = fReaderDate->GetSubEventAttributes();
+    AliVMERawStream vmeStreamer(fReader);
+    fReader->RequireHeader(kFALSE);
+    while(fReader->ReadHeader()){
+      fSubEventAttributes = fReader->GetSubEventAttributes();
     }
     
     fSDDEvType=GetEventType();
     if(fSDDEvType==1) fITSHeader->SetEventTypeSDD(kReal);
     if(fSDDEvType==2) fITSHeader->SetEventTypeSDD(kCalibration1);
     if(fSDDEvType==3) fITSHeader->SetEventTypeSDD(kCalibration2);
-    fReaderDate->Reset();
-    fStreamer = new AliITSRawStreamSDDv2(fReaderDate);
+    fReader->Reset();
+    fStreamer = new AliITSRawStreamSDDv2(fReader);
     break;
   }
 
@@ -114,7 +121,6 @@ void AliITSBeamTestDigSDD::Exec(Option_t* /*opt*/)
   //set compressed fSignal of AliITSdigitSDD to -1000
   //set expanded fSignalExpanded of AliITSdigitSDD equal to fStreamer.GetSignal() 
   while(fStreamer->Next()){   
-
     Int_t ndet =0;
     if(GetBtPeriod()==kNov04) ndet=fStreamer->GetChannel()+nspd;
     if(GetBtPeriod()==kAug04) ndet=fStreamer->GetChannel();
@@ -149,7 +155,7 @@ void AliITSBeamTestDigSDD::Exec(Option_t* /*opt*/)
   }
       
   fTreeD->SetEntries(maxn);
-  fReaderDate->Reset();
+  fReader->Reset();
   fTreeD->AutoSave();
 
   for(Int_t n=0;n<maxn;n++){
@@ -181,24 +187,21 @@ Int_t AliITSBeamTestDigSDD::GetEventType(){
 }
 
 //______________________________________________________________________
-AliITSBeamTestDigSDD::AliITSBeamTestDigSDD(const AliITSBeamTestDigSDD &bt):AliITSBeamTestDig(bt){
+AliITSBeamTestDigSDD::AliITSBeamTestDigSDD(const AliITSBeamTestDigSDD &bt):AliITSBeamTestDig(bt),
+fSDDEvType(bt.fSDDEvType),
+fSubEventAttributes(bt.fSubEventAttributes),
+fBtPer(bt.fBtPer),
+fThreshold(bt.fThreshold),
+fStreamer(bt.fStreamer){
     // Copy constructor. 
 
-  fSDDEvType = bt.fSDDEvType;
-  fSubEventAttributes = bt.fSubEventAttributes;
-  fBtPer = bt.fBtPer;
-  fThreshold = bt.fThreshold;
-  fStreamer = bt.fStreamer;
 }
 //______________________________________________________________________
 AliITSBeamTestDigSDD& AliITSBeamTestDigSDD::operator=(const AliITSBeamTestDigSDD &source){
-    // Assignment operator. This is a function which is not allowed to be
-    // done to the ITS beam test dig. It exits with an error.
-    // Inputs:
-    if(this==&source) return *this;
-    Error("operator=","You are not allowed to make a copy of the AliITSBeamTestDig");
-    exit(1);
-    return *this; //fake return
+    // Assignment operator. 
+  this->~AliITSBeamTestDigSDD();
+  new(this) AliITSBeamTestDigSDD(source);
+  return *this;
 }