]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - RICH/AliRICHv1.cxx
all old staff moved to v3
[u/mrichter/AliRoot.git] / RICH / AliRICHv1.cxx
index ce030c1963906fe4a5482fd6156d503bbf3e9841..2a666177901c06828f9ec19267e550362974b7ae 100644 (file)
@@ -27,7 +27,6 @@
 #include "AliConst.h" 
 #include "AliPDG.h" 
 #include "AliRICHGeometry.h"
-#include "AliRICHHit.h"
 #include "AliRICHResponse.h"
 #include "AliRICHResponseV0.h"
 #include "AliRICHSegmentationV1.h"
@@ -38,170 +37,16 @@ ClassImp(AliRICHv1)
 //______________________________________________________________________________
 AliRICHv1::AliRICHv1(const char *name, const char *title)
           :AliRICH(name,title)
-{
-
-// Full version of RICH with hits and diagnostics
-
-  // Version 0
-// Default Segmentation, no hits
-    AliRICHSegmentationV1* segmentation = new AliRICHSegmentationV1;
-//
-//  Segmentation parameters
-    segmentation->SetPadSize(0.84,0.80);
-    segmentation->SetDAnod(0.84/2);
-//
-//  Geometry parameters
-    AliRICHGeometry* geometry = new AliRICHGeometry;
-    geometry->SetGapThickness(8);
-    geometry->SetProximityGapThickness(.4);
-    geometry->SetQuartzLength(133);
-    geometry->SetQuartzWidth(127.9);
-    geometry->SetQuartzThickness(.5);
-    geometry->SetOuterFreonLength(133);
-    geometry->SetOuterFreonWidth(41.3);
-    geometry->SetInnerFreonLength(133);
-    geometry->SetInnerFreonWidth(41.3);
-    geometry->SetFreonThickness(1.5);
-//
-//  Response parameters
-    AliRICHResponseV0*  response   = new AliRICHResponseV0;
-    response->SetSigmaIntegration(5.);
-    response->SetChargeSlope(27.);
-    response->SetChargeSpread(0.18, 0.18);
-    response->SetMaxAdc(4096);
-    response->SetAlphaFeedback(0.036);
-    response->SetEIonisation(26.e-9);
-    response->SetSqrtKx3(0.77459667);
-    response->SetKx2(0.962);
-    response->SetKx4(0.379);
-    response->SetSqrtKy3(0.77459667);
-    response->SetKy2(0.962);
-    response->SetKy4(0.379);
-    response->SetPitch(0.25);
-    response->SetWireSag(1);                     // 1->On, 0->Off
-    response->SetVoltage(2150);                  // Should only be 2000, 2050, 2100 or 2150
-
-//
-//    AliRICH *RICH = (AliRICH *) gAlice->GetDetector("RICH"); 
-    
-    fCkovNumber=0;
-    fFreonProd=0;
-    Int_t i=0;
-    
-    fChambers = new TObjArray(kNCH);
-    for (i=0; i<kNCH; i++) {
-      
-      //PH      (*fChambers)[i] = new AliRICHChamber();  
-      fChambers->AddAt(new AliRICHChamber(), i);  
-      
-    }
-  
-    for (i=0; i<kNCH; i++) {
-      SetGeometryModel(i,geometry);
-      SetSegmentationModel(i, segmentation);
-      SetResponseModel(i, response);
-    }
-
-
-}
-
+{// Full version of RICH with hits and diagnostics
+  if(GetDebug())Info("named ctor","Start.");
+  if(GetDebug())Info("named ctor","Stop.");  
+}//named ctor
+//______________________________________________________________________________
 void AliRICHv1::Init()
-{
-
-  if(fDebug) {
-    printf("%s: *********************************** RICH_INIT ***********************************\n",ClassName());
-    printf("%s: *                                                                               *\n",ClassName());
-    printf("%s: *                        AliRICHv1 Full version started                         *\n",ClassName());
-    printf("%s: *                                                                               *\n",ClassName());
-  }
-
-  
-  AliSegmentation*  segmentation;
-  AliRICHGeometry*  geometry;
-  AliRICHResponse*  response;
-
-
-    // 
-    // Initialize Tracking Chambers
-    //
-    for (Int_t i=0; i<kNCH; i++) {
-       //printf ("i:%d",i);
-      //PH     ( (AliRICHChamber*) (*fChambers)[i])->Init(i);  
-       ( (AliRICHChamber*)fChambers->At(i))->Init(i);  
-    }  
-    
-    //
-    // Set the chamber (sensitive region) GEANT identifier
-    
-    //PH    ((AliRICHChamber*)(*fChambers)[0])->SetGid(1);  
-    //PH    ((AliRICHChamber*)(*fChambers)[1])->SetGid(2);  
-    //PH    ((AliRICHChamber*)(*fChambers)[2])->SetGid(3);  
-    //PH    ((AliRICHChamber*)(*fChambers)[3])->SetGid(4);  
-    //PH    ((AliRICHChamber*)(*fChambers)[4])->SetGid(5);  
-    //PH    ((AliRICHChamber*)(*fChambers)[5])->SetGid(6);  
-    //PH    ((AliRICHChamber*)(*fChambers)[6])->SetGid(7); 
-
-    ((AliRICHChamber*)fChambers->At(0))->SetGid(1);  
-    ((AliRICHChamber*)fChambers->At(1))->SetGid(2);  
-    ((AliRICHChamber*)fChambers->At(2))->SetGid(3);  
-    ((AliRICHChamber*)fChambers->At(3))->SetGid(4);  
-    ((AliRICHChamber*)fChambers->At(4))->SetGid(5);  
-    ((AliRICHChamber*)fChambers->At(5))->SetGid(6);  
-    ((AliRICHChamber*)fChambers->At(6))->SetGid(7);  
-
-
-    segmentation=Chamber(0).GetSegmentationModel(0);
-    geometry=Chamber(0).GetGeometryModel();
-    response=Chamber(0).GetResponseModel();
-    
-    Float_t offset       = 490 + 1.276 - geometry->GetGapThickness()/2;        //distance from center of mother volume to methane
-    Float_t deltaphi     = 19.5;                                               //phi angle between center of chambers - z direction
-    Float_t deltatheta   = 20;                                                 //theta angle between center of chambers - x direction
-    Float_t cosphi       = TMath::Cos(deltaphi*TMath::Pi()/180);
-    Float_t sinphi       = TMath::Sin(deltaphi*TMath::Pi()/180);
-    Float_t costheta     = TMath::Cos(deltatheta*TMath::Pi()/180);
-    Float_t sintheta     = TMath::Sin(deltatheta*TMath::Pi()/180);
-
-    Float_t pos1[3]={0.                , offset*cosphi         , offset*sinphi};
-    Float_t pos2[3]={offset*sintheta   , offset*costheta       , 0. };
-    Float_t pos3[3]={0.                , offset                , 0.};
-    Float_t pos4[3]={-offset*sintheta  , offset*costheta       , 0.};
-    Float_t pos5[3]={offset*sinphi     , offset*costheta*cosphi, -offset*sinphi};
-    Float_t pos6[3]={0.                , offset*cosphi         , -offset*sinphi};
-    Float_t pos7[3]={ -offset*sinphi   , offset*costheta*cosphi, -offset*sinphi};
-
-    Chamber(0).SetChamberTransform(pos1[0],pos1[1],pos1[2],new TRotMatrix("rot993","rot993",90., 0.               , 90. - deltaphi, 90.             , deltaphi, -90.           ));
-    Chamber(1).SetChamberTransform(pos2[0],pos2[1],pos2[2],new TRotMatrix("rot994","rot994",90., -deltatheta      , 90.           , 90.- deltatheta , 0.      , 0.             ));
-    Chamber(2).SetChamberTransform(pos3[0],pos3[1],pos3[2],new TRotMatrix("rot995","rot995",90., 0.               , 90.           , 90.             , 0.      , 0.             ));
-    Chamber(3).SetChamberTransform(pos4[0],pos4[1],pos4[2],new TRotMatrix("rot996","rot996",90.,  deltatheta      , 90.           , 90 + deltatheta , 0.      , 0.             ));
-    Chamber(4).SetChamberTransform(pos5[0],pos5[1],pos5[2],new TRotMatrix("rot997","rot997",90., 360. - deltatheta, 108.2         , 90.- deltatheta ,18.2     , 90 - deltatheta));
-    Chamber(5).SetChamberTransform(pos6[0],pos6[1],pos6[2],new TRotMatrix("rot998","rot998",90., 0.               , 90 + deltaphi , 90.             , deltaphi, 90.            ));
-    Chamber(6).SetChamberTransform(pos7[0],pos7[1],pos7[2],new TRotMatrix("rot999","rot999",90., deltatheta       , 108.2         , 90.+ deltatheta ,18.2     , 90 + deltatheta));   
-     
-    if(GetDebug()) {
-      printf("%s: *                            Pads            : %3dx%3d                          *\n",
-            ClassName(),segmentation->Npx(),segmentation->Npy());
-      printf("%s: *                            Pad size        : %5.2f x%5.2f mm2                 *\n",
-            ClassName(),segmentation->Dpx(),segmentation->Dpy()); 
-      printf("%s: *                            Gap Thickness   : %5.1f cm                         *\n",
-            ClassName(),geometry->GetGapThickness());
-      printf("%s: *                            Radiator Width  : %5.1f cm                         *\n",
-            ClassName(),geometry->GetQuartzWidth());
-      printf("%s: *                            Radiator Length : %5.1f cm                         *\n",
-            ClassName(),geometry->GetQuartzLength());
-      printf("%s: *                            Freon Thickness : %5.1f cm                         *\n",
-            ClassName(),geometry->GetFreonThickness());
-      printf("%s: *                            Charge Slope    : %5.1f ADC                        *\n",
-            ClassName(),response->ChargeSlope());
-      printf("%s: *                            Feedback Prob.  : %5.2f %%                          *\n",
-            ClassName(),response->AlphaFeedback()*100);
-      printf("%s: *                                                                               *\n",
-            ClassName());
-      printf("%s: *********************************************************************************\n",
-            ClassName());
-    }
-}
-
+{//nothing to do here, all the work in ctor or CreateGeometry()
+  if(GetDebug())Info("Init","Start.");
+  if(GetDebug())Info("Init","Stop.");    
+}//void AliRICHv1::Init()
 //______________________________________________________________________________
 void AliRICHv1::StepManager()
 {//Full Step Manager
@@ -222,7 +67,7 @@ void AliRICHv1::StepManager()
     Float_t        theta,phi;
     Float_t        destep, step;
     Double_t        ranf[2];
-    Int_t          nPads;
+    Int_t          nPads=-1;
     Float_t        coscerenkov;
     static Float_t eloss, xhit, yhit, tlength;
     const  Float_t kBig=1.e10;
@@ -230,36 +75,24 @@ void AliRICHv1::StepManager()
     TClonesArray &lhits = *fHits;
     TParticle *current = (TParticle*)(*gAlice->Particles())[gAlice->GetCurrentTrackNumber()];
 
- //if (current->Energy()>1)
-   //{
-        
-    // Only gas gap inside chamber
-    // Tag chambers and record hits when track enters 
     
  
     id=gMC->CurrentVolID(copy);
     idvol = copy-1;
     Float_t cherenkovLoss=0;
-    //gAlice->KeepTrack(gAlice->GetCurrentTrackNumber());
     
     gMC->TrackPosition(position);
     pos[0]=position(0);
     pos[1]=position(1);
     pos[2]=position(2);
-    //bzero((char *)ckovData,sizeof(ckovData)*19);
     ckovData[1] = pos[0];                 // X-position for hit
     ckovData[2] = pos[1];                 // Y-position for hit
     ckovData[3] = pos[2];                 // Z-position for hit
     ckovData[6] = 0;                      // dummy track length
-    //ckovData[11] = gAlice->GetCurrentTrackNumber();
-    
-    //printf("\n+++++++++++\nTrack: %d\n++++++++++++\n",gAlice->GetCurrentTrackNumber());
-
-    //AliRICH *RICH = (AliRICH *) gAlice->GetDetector("RICH"); 
     
     /********************Store production parameters for Cerenkov photons************************/ 
-//is it a Cerenkov photon? 
-    if (gMC->TrackPid() == 50000050) { 
+
+    if (gMC->TrackPid() == 50000050) { //is it a Cerenkov photon? 
 
       //if (gMC->VolId("GAP ")==gMC->CurrentVolID(copy))
         //{                    
@@ -276,7 +109,6 @@ void AliRICHv1::StepManager()
                      //printf("I'm in!\n");
                      Int_t mother = current->GetFirstMother(); 
                      
-                     //printf("Second Mother:%d\n",current->GetSecondMother());
                      
                      ckovData[10] = mother;
                      ckovData[11] = gAlice->GetCurrentTrackNumber();
@@ -284,7 +116,6 @@ void AliRICHv1::StepManager()
                      //printf("Produced in FREO\n");
                      fCkovNumber++;
                      fFreonProd=1;
-                     //printf("Index: %d\n",fCkovNumber);
                    }    //first step question
                  }        //freo question
                
@@ -292,20 +123,15 @@ void AliRICHv1::StepManager()
                  if (gMC->VolId("QUAR")==gMC->CurrentVolID(copy))             //is it in quarz?
                    {
                      ckovData[12] = 2;
-                     //printf("Produced in QUAR\n");
                    }    //quarz question
                }        //first step question
                
-               //printf("Before %d\n",fFreonProd);
              }   //track entering question
              
              if (ckovData[12] == 1)                                        //was it produced in Freon?
                //if (fFreonProd == 1)
                {
                  if (gMC->IsTrackEntering()){                                     //is track entering?
-                   //printf("Track entered (2)\n");
-                   //printf("Current volume (should be META): %s\n",gMC->CurrentVolName());
-                   //printf("VolId: %d, CurrentVolID: %d\n",gMC->VolId("META"),gMC->CurrentVolID(copy));
                    if (gMC->VolId("META")==gMC->CurrentVolID(copy))                //is it in gap?      
                      {
                        //printf("Got in META\n");
@@ -324,14 +150,10 @@ void AliRICHv1::StepManager()
                          gMC->StopTrack();
                          ckovData[13] = 5;
                          AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
-                         //printf("Added One (1)!\n");
-                         //printf("Lost one in grid\n");
                        }
                        /**********************************************************************************/
                      }    //gap
                    
-                   //printf("Current volume (should be CSI) (1): %s\n",gMC->CurrentVolName());
-                   //printf("VolId: %d, CurrentVolID: %d\n",gMC->VolId("CSI "),gMC->CurrentVolID(copy));
                    if (gMC->VolId("CSI ")==gMC->CurrentVolID(copy))             //is it in csi?      
                      {
                        //printf("Got in CSI\n");
@@ -376,8 +198,6 @@ void AliRICHv1::StepManager()
                        ckovData[13]=1;
                      if (gMC->CurrentVolID(copy) == gMC->VolId("QUAR")) 
                        ckovData[13]=2;
-                     //gMC->StopTrack();
-                     //AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
                    } //reflection question
                     
                    //        Absorption loss 
@@ -402,8 +222,6 @@ void AliRICHv1::StepManager()
                      }
                      gMC->StopTrack();
                      AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
-                     //printf("Added One (3)!\n");
-                     //printf("Added cerenkov %d\n",fCkovNumber);
                    } //absorption question 
                    
                    
@@ -412,13 +230,11 @@ void AliRICHv1::StepManager()
                      ckovData[13]=21;
                      gMC->StopTrack();
                      AddCerenkov(gAlice->GetCurrentTrackNumber(),vol,ckovData);
-                     //printf("Added One (4)!\n");
                    }   // energy treshold question         
                  }  //number of mechanisms cycle
                  /**********************End of evaluation************************/
                } //freon production question
            } //energy interval question
-       //}//inside the proximity gap question
     } //cerenkov photon question
       
     /**************************************End of Production Parameters Storing*********************/ 
@@ -427,17 +243,9 @@ void AliRICHv1::StepManager()
     /*******************************Treat photons that hit the CsI (Ckovs and Feedbacks)************/ 
     
     if (gMC->TrackPid() == 50000050 || gMC->TrackPid() == 50000051) {
-      //printf("Cerenkov\n");
-      
-      //if (gMC->TrackPid() == 50000051)
-       //printf("Tracking a feedback\n");
       
       if (gMC->VolId("CSI ")==gMC->CurrentVolID(copy))
        {
-         //printf("Current volume (should be CSI) (2): %s\n",gMC->CurrentVolName());
-         //printf("VolId: %d, CurrentVolID: %d\n",gMC->VolId("CSI "),gMC->CurrentVolID(copy));
-         //printf("Got in CSI\n");
-         //printf("Tracking a %d\n",gMC->TrackPid());
          if (gMC->Edep() > 0.){
                gMC->TrackPosition(position);
                gMC->TrackMomentum(momentum);
@@ -460,26 +268,15 @@ void AliRICHv1::StepManager()
 
                gMC->Gmtod(pos,localPos,1);
 
-               //Chamber(idvol).GlobaltoLocal(pos,localPos);
                                                                     
                gMC->Gmtod(mom,localMom,2);
 
-               //Chamber(idvol).GlobaltoLocal(mom,localMom);
                
                gMC->CurrentVolOffID(2,copy);
                vol[0]=copy;
                idvol=vol[0]-1;
 
-               //Int_t sector=((AliRICHChamber*) (*fChambers)[idvol])
-                       //->Sector(localPos[0], localPos[2]);
-               //printf("Sector:%d\n",sector);
-
-               /*if (gMC->TrackPid() == 50000051){
-                 fFeedbacks++;
-                 printf("Feedbacks:%d\n",fFeedbacks);
-               }*/     
                
-        //PH           ((AliRICHChamber*) (*fChambers)[idvol])
                ((AliRICHChamber*)fChambers->At(idvol))
                    ->SigGenInit(localPos[0], localPos[2], localPos[1]);
                if(idvol<kNCH) {        
@@ -489,7 +286,7 @@ void AliRICHv1::StepManager()
                    ckovData[3] = pos[2];                 // Z-position for hit
                    ckovData[4] = theta;                      // theta angle of incidence
                    ckovData[5] = phi;                      // phi angle of incidence 
-                   ckovData[8] = (Float_t) fNSDigits;      // first sdigit
+                   ckovData[8] = (Float_t) fNsdigits;      // first sdigit
                    ckovData[9] = -1;                       // last pad hit
                    ckovData[13] = 4;                       // photon was detected
                    ckovData[14] = mom[0];
@@ -503,18 +300,14 @@ void AliRICHv1::StepManager()
                    
                    //nPads = Hits2SDigits(localPos[0],localPos[2],cherenkovLoss,idvol,kCerenkov);//for photons in CsI kir
                                    
-                   if (fNSDigits > (Int_t)ckovData[8]) {
+                   if (fNsdigits > (Int_t)ckovData[8]) {
                        ckovData[8]= ckovData[8]+1;
-                       ckovData[9]= (Float_t) fNSDigits;
+                       ckovData[9]= (Float_t) fNsdigits;
                    }
 
-                   //printf("Cerenkov loss: %f\n", cherenkovLoss);
 
                    ckovData[17] = nPads;
-                   //printf("nPads:%d",nPads);
-                   
-                   //TClonesArray *Hits = RICH->Hits();
-                   AliRICHHit *mipHit =  (AliRICHHit*) (fHits->UncheckedAt(0));
+                   AliRICHhit *mipHit =  (AliRICHhit*) (fHits->UncheckedAt(0));
                    if (mipHit)
                      {
                        mom[0] = current->Px();
@@ -555,14 +348,7 @@ void AliRICHv1::StepManager()
 
     /**********************************************Charged particles treatment*************************************/
 
-    else if (gMC->TrackCharge())
-    //else if (1 == 1)
-      {
-//If MIP
-       /*if (gMC->IsTrackEntering())
-         {                
-           hits[13]=20;//is track entering?
-         }*/
+    else if (gMC->TrackCharge()){//is MIP?
        if (gMC->VolId("FRE1")==gMC->CurrentVolID(copy) || gMC->VolId("FRE2")==gMC->CurrentVolID(copy))
          {
            gMC->TrackMomentum(momentum);
@@ -576,17 +362,12 @@ void AliRICHv1::StepManager()
            fFreonProd=1;
          }
 
-       if (gMC->VolId("GAP ")== gMC->CurrentVolID(copy)) {
+       if(gMC->VolId("GAP ")==gMC->CurrentVolID(copy)) {//is in GAP?
 // Get current particle id (ipart), track position (pos)  and momentum (mom)
            
            gMC->CurrentVolOffID(3,copy);
            vol[0]=copy;
            idvol=vol[0]-1;
-
-           //Int_t sector=((AliRICHChamber*) (*fChambers)[idvol])
-                       //->Sector(localPos[0], localPos[2]);
-           //printf("Sector:%d\n",sector);
-           
            gMC->TrackPosition(position);
            gMC->TrackMomentum(momentum);
            pos[0]=position(0);
@@ -598,23 +379,11 @@ void AliRICHv1::StepManager()
            mom[3]=momentum(3);
 
            gMC->Gmtod(pos,localPos,1);
-           
-           //Chamber(idvol).GlobaltoLocal(pos,localPos);
-                                                                    
            gMC->Gmtod(mom,localMom,2);
-
-           //Chamber(idvol).GlobaltoLocal(mom,localMom);
-           
            ipart  = gMC->TrackPid();
-           //
-           // momentum loss and steplength in last step
-           destep = gMC->Edep();
-           step   = gMC->TrackStep();
-  
-           //
-           // record hits when track enters ...
-           if( gMC->IsTrackEntering()) {
-//             gMC->SetMaxStep(fMaxStepGas);
+           destep = gMC->Edep();step   = gMC->TrackStep();// momentum loss and steplength in last step
+           if(gMC->IsTrackEntering()){     // record hits when track enters ...
+
                Double_t tc = mom[0]*mom[0]+mom[1]*mom[1];
                Double_t rt = TMath::Sqrt(tc);
                theta   = Float_t(TMath::ATan2(rt,Double_t(mom[2])))*kRaddeg;
@@ -632,7 +401,7 @@ void AliRICHv1::StepManager()
                hits[3] = localPos[2];                 // Z-position for hit
                hits[4] = localTheta;                  // theta angle of incidence
                hits[5] = localPhi;                    // phi angle of incidence 
-               hits[8] = (Float_t) fNSDigits;    // first sdigit
+               hits[8] = (Float_t) fNsdigits;    // first sdigit
                hits[9] = -1;                     // last pad hit
                hits[13] = fFreonProd;           // did id hit the freon?
                hits[14] = mom[0];
@@ -652,17 +421,13 @@ void AliRICHv1::StepManager()
                yhit    = localPos[2];
                // Only if not trigger chamber
                if(idvol<kNCH) {
-                   //
                    //  Initialize hit position (cursor) in the segmentation model 
-          //PH             ((AliRICHChamber*) (*fChambers)[idvol])
                    ((AliRICHChamber*)fChambers->At(idvol))
                        ->SigGenInit(localPos[0], localPos[2], localPos[1]);
                }
            }
            
-           // 
            // Calculate the charge induced on a pad (disintegration) in case 
-           //
            // Mip left chamber ...
            if( gMC->IsTrackExiting() || gMC->IsTrackStop() || gMC->IsTrackDisappeared()){
                gMC->SetMaxStep(kBig);
@@ -678,30 +443,25 @@ void AliRICHv1::StepManager()
                        printf("\n\n\n\n\n Neutron Making Pad Hit!!! \n\n\n\n");
                      //nPads = Hits2SDigits(xhit,yhit,eloss,idvol,kMip); //for MIP kir
                      hits[17] = nPads;
-                     //printf("nPads:%d",nPads);
                    }
                }
                
                hits[6]=tlength;
                hits[7]=eloss;
-               if (fNSDigits > (Int_t)hits[8]) {
+               if (fNsdigits > (Int_t)hits[8]) {
                    hits[8]= hits[8]+1;
-                   hits[9]= (Float_t) fNSDigits;
+                   hits[9]= (Float_t) fNsdigits;
                }
                
-               //if(sector !=-1)
-               new(lhits[fNhits++]) AliRICHHit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
+               new(lhits[fNhits++]) AliRICHhit(fIshunt,gAlice->GetCurrentTrackNumber(),vol,hits);
                eloss = 0; 
-               //
                // Check additional signal generation conditions 
                // defined by the segmentation
                // model (boundary crossing conditions) 
            } else if 
-          //PH         (((AliRICHChamber*) (*fChambers)[idvol])
                (((AliRICHChamber*)fChambers->At(idvol))
                 ->SigGenCond(localPos[0], localPos[2], localPos[1]))
            {
-          //PH         ((AliRICHChamber*) (*fChambers)[idvol])
                ((AliRICHChamber*)fChambers->At(idvol))
                    ->SigGenInit(localPos[0], localPos[2], localPos[1]);
                if (eloss > 0) 
@@ -722,14 +482,6 @@ void AliRICHv1::StepManager()
                eloss   += destep;
                tlength += step ;
            }
-       }
-      }
-    /*************************************************End of MIP treatment**************************************/
+       }//is in GAP?
+      }//is MIP?
 }//void AliRICHv1::StepManager()
-
-
-
-
-
-
-