Warnings potentially serious in compilation fixed.
authordibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 May 2008 07:26:50 +0000 (07:26 +0000)
committerdibari <dibari@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 May 2008 07:26:50 +0000 (07:26 +0000)
HMPID/AliHMPIDDigit.h
HMPID/AliHMPIDDigitizer.cxx
HMPID/AliHMPIDPreprocessor.cxx
HMPID/AliHMPIDQADataMakerRec.cxx

index b6400fa..1e1c644 100644 (file)
@@ -55,8 +55,8 @@ public:
          Float_t Q           (                               )const{return fQ;}                                                        //charge, [QDC]
   inline void    Raw(UInt_t &w32,Int_t &ddl,Int_t &r,Int_t &d,Int_t &a)const;
   inline Bool_t  Set         (Int_t c,Int_t p,Int_t x,Int_t y,Int_t tid=0);                                                            //manual creation 
-         void    SetQ        (Float_t q                      )     {fQ=q;if(fQ>4095)fQ=4095;}                                          //manual creation 
-
+         void    SetQ        (Float_t q                      )     {fQ=q;if(fQ>4095)fQ=4095;}                                          //setter for charge 
+         void    SetPad      (Int_t pad                      )     {fPad=pad;}                                                         //setter for pad
  
 protected:                                                                   //AliDigit has fTracks[3]
                                                                                
index 7040e99..6431850 100644 (file)
@@ -122,12 +122,12 @@ void AliHMPIDDigitizer::Sdi2Dig(TClonesArray *pSdiLst,TObjArray *pDigLst)
 // add noise pad above threshold with no signal merged...if any
   if(!fgDoNoise) return;
   aTids[0]=aTids[1]=aTids[2]=-1;
-  for (Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++)
+  for (Int_t iChCurr=AliHMPIDParam::kMinCh;iChCurr<=AliHMPIDParam::kMaxCh;iChCurr++)
     for (Int_t iPc=AliHMPIDParam::kMinPc;iPc<=AliHMPIDParam::kMaxPc;iPc++)
       for(Int_t iPx=AliHMPIDParam::kMinPx;iPx<=AliHMPIDParam::kMaxPx;iPx++)
         for(Int_t iPy=AliHMPIDParam::kMinPy;iPy<=AliHMPIDParam::kMaxPy;iPy++) {
-          Float_t q = arrNoise[iCh][iPc][iPx][iPy];
-          if(AliHMPIDParam::IsOverTh(q)) new((*pLst[iCh])[iCnt[iCh]++]) AliHMPIDDigit(AliHMPIDParam::Abs(iCh,iPc,iPx,iPy),(Int_t)q,aTids);
+          Float_t qNoise = arrNoise[iChCurr][iPc][iPx][iPy];
+          if(AliHMPIDParam::IsOverTh(qNoise)) new((*pLst[iChCurr])[iCnt[iChCurr]++]) AliHMPIDDigit(AliHMPIDParam::Abs(iChCurr,iPc,iPx,iPy),(Int_t)qNoise,aTids);
         }
         
 }//Sdi2Dig()
index be5c0d3..da38a9c 100644 (file)
@@ -192,8 +192,9 @@ Bool_t AliHMPIDPreprocessor::ProcPed()
     infile>>tName>>nBadEvPer;
     infile>>tName>>nSigCut; pM->SetUniqueID(nSigCut); //n. of pedestal distribution sigmas used to create zero suppresion table
     while(!infile.eof()){
-      infile>>dec>>r>>d>>a>>mean>>sigma>>hex>>hard;     
-      AliHMPIDDigit dig(rs.GetPad(iddl,r,d,a),(Int_t)mean);
+      infile>>dec>>r>>d>>a>>mean>>sigma>>hex>>hard;
+      dig.SetPad(rs.GetPad(iddl,r,d,a));
+      dig.SetQ((Int_t)mean);
       (*pM)(dig.PadChX(),dig.PadChY()) = sigma;
     }
     infile.close();
index e806a40..13d5ae1 100644 (file)
@@ -47,7 +47,7 @@
 
 ClassImp(AliHMPIDQADataMakerRec)
            
-//____________________________________________________________________________ 
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   AliHMPIDQADataMakerRec::AliHMPIDQADataMakerRec() : 
   AliQADataMakerRec(AliQA::GetDetName(AliQA::kHMPID), "HMPID Quality Assurance Data Maker")
 {
@@ -55,7 +55,7 @@ ClassImp(AliHMPIDQADataMakerRec)
   // ctor
 }
 
-//____________________________________________________________________________ 
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDQADataMakerRec::AliHMPIDQADataMakerRec(const AliHMPIDQADataMakerRec& qadm) :
   AliQADataMakerRec() 
 {
@@ -64,7 +64,7 @@ AliHMPIDQADataMakerRec::AliHMPIDQADataMakerRec(const AliHMPIDQADataMakerRec& qad
   SetTitle((const char*)qadm.GetTitle()); 
 }
 
-//__________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AliHMPIDQADataMakerRec& AliHMPIDQADataMakerRec::operator = (const AliHMPIDQADataMakerRec& qadm )
 {
   // Equal operator.
@@ -73,8 +73,7 @@ AliHMPIDQADataMakerRec& AliHMPIDQADataMakerRec::operator = (const AliHMPIDQAData
   return *this;
 }
  
-//____________________________________________________________________________ 
-
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDQADataMakerRec::InitRecPoints()
 {
   // create cluster histograms in RecPoint subdir
@@ -106,8 +105,7 @@ void AliHMPIDQADataMakerRec::InitRecPoints()
     }  
   }
 }
-//____________________________________________________________________________
-
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDQADataMakerRec::InitRaws()
 {
 //
@@ -144,7 +142,7 @@ void AliHMPIDQADataMakerRec::InitRaws()
   }//Ch loop  
   
 }
-//____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDQADataMakerRec::InitESDs()
 {
   //
@@ -160,15 +158,15 @@ void AliHMPIDQADataMakerRec::InitESDs()
    hPid[3] = new TH1F("PidK" ,"K response"                     , 101, -0.005,1.005)             ;
    hPid[4] = new TH1F("PidP" ,"p response"                     , 101, -0.005,1.005)             ;
 
-Add2ESDsList(hCkovP,0);
-Add2ESDsList(hSigP ,1);
-Add2ESDsList(hDifXY,2);
-Add2ESDsList(hMvsP,3);
-for(Int_t i=0; i< 5; i++) Add2ESDsList(hPid[i],i+4);
+   Add2ESDsList(hCkovP,0);
+   Add2ESDsList(hSigP ,1);
+   Add2ESDsList(hDifXY,2);
+   Add2ESDsList(hMvsP,3);
+   for(Int_t i=0; i< 5; i++) Add2ESDsList(hPid[i],i+4);
 
 
 }
-//____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDQADataMakerRec::MakeRaws(AliRawReader *rawReader)
 {
 //
@@ -197,7 +195,7 @@ void AliHMPIDQADataMakerRec::MakeRaws(AliRawReader *rawReader)
    stream.Delete();
    
 }
-//___________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDQADataMakerRec::MakeRecPoints(TTree * clustersTree)
 {
   //
@@ -230,8 +228,7 @@ void AliHMPIDQADataMakerRec::MakeRecPoints(TTree * clustersTree)
   clusters->Clear();
   
 }
-
-//____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDQADataMakerRec::MakeESDs(AliESDEvent * esd)
 {
   //
@@ -260,12 +257,13 @@ void AliHMPIDQADataMakerRec::MakeESDs(AliESDEvent * esd)
     for(Int_t i = 0 ; i < 5 ; i++) GetESDsData(4+i)->Fill(pid[i]) ;
   }
 }
-//____________________________________________________________________________
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDQADataMakerRec::StartOfDetectorCycle()
 {
   //Detector specific actions at start of cycle
   
 }
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 void AliHMPIDQADataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray *histos)
 {