Bug fix

[u/mrichter/AliRoot.git] / ITS / AliITSOnlineSDDBase.cxx

diff --git a/ITS/AliITSOnlineSDDBase.cxx b/ITS/AliITSOnlineSDDBase.cxx
index 683b62e4b6b034192cf724ab2479a9360e821c3a..58a62ead7d2cfd8798755884355faec5037b19d4 100644 (file)
--- a/ITS/AliITSOnlineSDDBase.cxx
+++ b/ITS/AliITSOnlineSDDBase.cxx
@@ -39,7 +39,7 @@ ClassImp(AliITSOnlineSDDBase)
   SetNSigmaNoise();
 }
 //______________________________________________________________________
-  AliITSOnlineSDDBase::AliITSOnlineSDDBase(Int_t mod, Int_t sid):AliITSOnlineSDD(mod,sid),fNEvents(0),fMinBaseline(0.),fMaxBaseline(0.),fMinRawNoise(0.),fMaxRawNoise(0.),fNSigmaNoise(0.)
+  AliITSOnlineSDDBase::AliITSOnlineSDDBase(Int_t nddl, Int_t ncarlos, Int_t sid):AliITSOnlineSDD(nddl,ncarlos,sid),fNEvents(0),fMinBaseline(0.),fMaxBaseline(0.),fMinRawNoise(0.),fMaxRawNoise(0.),fNSigmaNoise(0.)
 {
   // default constructor
   Reset();
@@ -70,8 +70,8 @@ void  AliITSOnlineSDDBase::ValidateAnodes(){
   for(Int_t ian=0;ian<fgkNAnodes;ian++){
     fGoodAnode[ian]=1;
     if(GetAnodeBaseline(ian)>fMaxBaseline || GetAnodeBaseline(ian)<fMinBaseline) fGoodAnode[ian]=0;
-    if(GetAnodeRawNoise(ian)>fMaxRawNoise || GetAnodeRawNoise(ian)<fMinRawNoise) fGoodAnode[ian]=0;
-    if(GetAnodeRawNoise(ian)>fNSigmaNoise*CalcMeanRawNoise()) fGoodAnode[ian]=0;
+    else if(GetAnodeRawNoise(ian)>fMaxRawNoise || GetAnodeRawNoise(ian)<fMinRawNoise) fGoodAnode[ian]=0;
+    else if(GetAnodeRawNoise(ian)>fNSigmaNoise*CalcMeanRawNoise()) fGoodAnode[ian]=0;
   }
 }
 
@@ -92,9 +92,9 @@ void AliITSOnlineSDDBase::AddEvent(TH2F* hrawd){
     sumQ/=(Float_t)kTimeBins;
     fSumBaseline[ian]+=sum[ian];
     fSumRawNoise[ian]+=sumQ;
-    if(fNEvents==1) ValidateAnodes();
   }
 
+  if(fNEvents==1) ValidateAnodes();
 
   Float_t *cmnEven = new Float_t[kTimeBins];
   Float_t *cmnOdd  = new Float_t[kTimeBins];
@@ -156,7 +156,7 @@ void AliITSOnlineSDDBase::WriteToASCII(){
   //
   Char_t outfilnam[100];
   Float_t basMin=GetMinimumBaseline();
-  sprintf(outfilnam,"SDDbase_step1_mod%03d_sid%d.data",fModuleId,fSide);
+  sprintf(outfilnam,"SDDbase_step1_ddl%02dc%02d_sid%d.data",fDDL,fCarlos,fSide);
   FILE* outf=fopen(outfilnam,"w");
   Float_t corrnoise=2.;
   for(Int_t ian=0;ian<fgkNAnodes;ian++){