X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=PHOS%2FAliPHOS.cxx;h=7825d45c9449729a58ad7b82b1d2386ffac6d6be;hp=b6aa2ba507754153d43450036316eefd8cae5a94;hb=7e88424f201cac746e949f2b58a4b2ce9c1cfcb6;hpb=7cde7f18b8e8b1192d5c8bf4a4abbea7da252a15

diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx
index b6aa2ba5077..7825d45c944 100644
--- a/PHOS/AliPHOS.cxx
+++ b/PHOS/AliPHOS.cxx
@@ -96,9 +96,8 @@ class TFile;
 #include "AliPHOSRawDecoder.h"
 #include "AliPHOSRawDigiProducer.h"
 #include "AliPHOSQAChecker.h"
-#include "AliPHOSRecoParamEmc.h"
+#include "AliPHOSRecoParam.h"
 #include "AliPHOSSimParam.h"
-#include "AliPHOSCpvRawWrite.h"
 
 ClassImp(AliPHOS)
 
@@ -442,7 +441,7 @@ void AliPHOS::Digits2Raw()
   }
 
   // get mapping from OCDB
-  const TObjArray* maps = AliPHOSRecoParamEmc::GetMappings();
+  const TObjArray* maps = AliPHOSRecoParam::GetMappings();
   if(!maps) AliFatal("Cannot retrieve ALTRO mappings!!");
 
   // some digitization constants
@@ -473,15 +472,6 @@ void AliPHOS::Digits2Raw()
   Float_t eMax=-333;
   //!!!for debug!!!
 
-  TObjArray *cpvDigitsAll = new TObjArray();
-  TClonesArray *cpvDigitsModule;
-  Int_t *nCPVdigits = new Int_t[geom->GetNModules()];
-  Int_t module;
-  for (module=0; module<geom->GetNModules(); module++) {
-    cpvDigitsAll->Add(new TClonesArray("AliPHOSDigit",100));
-    nCPVdigits[module] = 0;
-  }
-
   // loop over digits (assume ordered digits)
   for (Int_t iDigit = 0; iDigit < digits->GetEntries(); iDigit++) {
     AliPHOSDigit* digit = dynamic_cast<AliPHOSDigit *>(digits->At(iDigit)) ;
@@ -489,19 +479,13 @@ void AliPHOS::Digits2Raw()
     // Skip small energy below treshold
     if (digit->GetEnergy() < kThreshold) 
       continue;
+    // Skip CPV digits
+    if (digit->GetId() > geom->GetNModules() * geom->GetNCristalsInModule()) 
+      continue;
 
     Int_t relId[4];
     geom->AbsToRelNumbering(digit->GetId(), relId);
-    module = relId[0];
-
-    // Fill TObjArray  of TClonesArray's with CPV digits per module
-    if (digit->GetId() > geom->GetNModules() * geom->GetNCristalsInModule()) {
-      cpvDigitsModule = (TClonesArray*)cpvDigitsAll->At(module-1);
-      new((*cpvDigitsModule)[nCPVdigits[module-1]++]) 
-	AliPHOSDigit(-1,digit->GetId(),digit->GetAmp(),digit->GetTime());
-      continue;
-    }
-
+    Int_t module = relId[0];
  
     // Begin FIXME 
     if (relId[1] != 0) 
@@ -595,16 +579,6 @@ void AliPHOS::Digits2Raw()
 	 modMax,colMax,rowMax,eMax));
 
   delete pulse;
-
-  for (module=0; module<geom->GetNModules(); module++) {
-    AliDebug(2,Form("Number of CPV digits in module %d: %d/%d",
-		    module,
-		    ((TClonesArray*)cpvDigitsAll->At(module))->GetEntriesFast(),
-		    nCPVdigits[module]));
-  }
-  AliPHOSCpvRawWrite *cpvRaw = new AliPHOSCpvRawWrite();
-  cpvRaw->WriteRaw(cpvDigitsAll);
-  delete cpvRaw;
   loader->UnloadDigits();
 }