assert replacet with AliError (Laurent)

diff --git a/MUON/mapping/AliMpSt345Reader.cxx b/MUON/mapping/AliMpSt345Reader.cxx
index cc5e36bc0b9ba2a710e6467e1cfeeed0a39525ed..b6ad2bc26cb36d4d900fa8a0c592b60e66a416fd 100644 (file)
--- a/MUON/mapping/AliMpSt345Reader.cxx
+++ b/MUON/mapping/AliMpSt345Reader.cxx
@@ -36,7 +36,6 @@
 #include "TString.h"
 
 #include <sstream>
-#include <assert.h>
 
 /// 
 /// \class AliMpSt345Reader
@@ -115,7 +114,10 @@ AliMpSt345Reader::ReadPCB(const char* pcbType)
       double pcbSizeX = 0.0;
       double pcbSizeY = 0.0;
       sin >> padSizeX >> padSizeY >> pcbSizeX >> pcbSizeY;
-      assert(pcb==0);
+      if (pcb)
+      {
+        AliError("pcb not null as expected");
+      }
       pcb = new AliMpPCB(&fMotifMap,pcbType,padSizeX,padSizeY,pcbSizeX,pcbSizeY);
     }
     
@@ -140,7 +142,6 @@ AliMpSt345Reader::ReadPCB(const char* pcbType)
         AliDebug(1,Form("Got motifType %s from motifMap",sMotifType.Data()));
       }
       
-      assert(pcb!=0);
       pcb->Add(motifType,ix,iy);
     }
   }

diff --git a/MUON/mapping/AliMpTriggerReader.cxx b/MUON/mapping/AliMpTriggerReader.cxx
index 622709b12527ee7bd274eed95f16d724e91506f8..de9c61543992623bd2e856e284a6c84a5295302d 100644 (file)
--- a/MUON/mapping/AliMpTriggerReader.cxx
+++ b/MUON/mapping/AliMpTriggerReader.cxx
@@ -39,7 +39,6 @@
 #include "TString.h"
 
 #include <sstream>
-#include <assert.h>
 
 /// 
 /// \class AliMpTriggerReader
@@ -634,7 +633,10 @@ AliMpTriggerReader::ReadPCB(const char* pcbType)
       float pcbSizeX = 0.0;
       float pcbSizeY = 0.0;
       sin >> padSizeX >> padSizeY >> pcbSizeX >> pcbSizeY;
-      assert(pcb==0);
+      if (pcb)
+      {
+        AliError("pcb not null as expected");
+      }
       pcb = new AliMpPCB(&fMotifMap,pcbType,padSizeX*scale,padSizeY*scale,
                          pcbSizeX*scale,pcbSizeY*scale);
     }
@@ -675,8 +677,10 @@ AliMpTriggerReader::ReadPCB(const char* pcbType)
       {
         AliDebug(1,Form("Got motifSpecial %s from motifMap",sMotifSpecial.Data()));
       }
-      
-      assert(pcb==0);      
+      if (pcb)
+      {
+        AliError("pcb not null as expected");
+      }
       pcb = new AliMpPCB(pcbType,specialMotif);
     }
     
@@ -701,7 +705,6 @@ AliMpTriggerReader::ReadPCB(const char* pcbType)
         AliDebug(1,Form("Got motifType %s from motifMap",sMotifType.Data()));        
       }
       
-      assert(pcb!=0);
       pcb->Add(motifType,ix,iy);
     }
   }