Remove several warnings

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 1edc5120eee65565cbe3e72670c36dee5d278d19..3ee952e8250ba78db0ef60d1c04e0391580ce4de 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -117,7 +117,6 @@ AliMUON::AliMUON()
    fClusters   = 0;
    fNclusters  = 0;
    fDchambers  = 0;
    fClusters   = 0;
    fNclusters  = 0;
    fDchambers  = 0;

-   //   fRecClusters= 0;

    fNdch       = 0;
    fRawClusters= 0;
    fNrawch     = 0;
    fNdch       = 0;
    fRawClusters= 0;
    fNrawch     = 0;


@@ -130,11 +129,6 @@ AliMUON::AliMUON()
    fSSigmaCut  = 0;
    fSXPrec     = 0; 
    fSYPrec     = 0;
    fSSigmaCut  = 0;
    fSXPrec     = 0; 
    fSYPrec     = 0;

-   /*
-   fSSigmaCut = 4.0;
-   fSXPrec    = 0.006; 
-   fSYPrec    = 0.12;
-   */

 }
  
 //___________________________________________
 }
  
 //___________________________________________


@@ -192,11 +186,7 @@ AliMUON::AliMUON(const char *name, const char *title)
    fSSigmaCut = 1.0;
    fSXPrec    = 0.01; 
    fSYPrec    = 0.144;
    fSSigmaCut = 1.0;
    fSXPrec    = 0.01; 
    fSYPrec    = 0.144;

-   /*
-   fSSigmaCut = 4.0;
-   fSXPrec    = 0.006; 
-   fSYPrec    = 0.12;
-   */
+

    SetMarkerColor(kRed);
 }
  
    SetMarkerColor(kRed);
 }
  


@@ -275,19 +265,6 @@ void AliMUON::AddCathCorrel(Int_t id, Int_t *idx, Float_t *x, Float_t *y)
     new(lcorrel[fNcorch[id]++]) AliMUONcorrelation(idx,x,y);
 }
 
     new(lcorrel[fNcorch[id]++]) AliMUONcorrelation(idx,x,y);
 }
 

-
-//_____________________________________________________________________________
-void AliMUON::AddRecCluster(Int_t iCh, Int_t iCat, AliMUONRecCluster* Cluster)
-{
-    //
-    // Add a MUON reconstructed cluster to the list
-    //
-  /*
-    TObjArray* ClusterList = RecClusters(iCh,iCat);
-    ClusterList->Add(Cluster);
-  */
-}
-

 //___________________________________________
 void AliMUON::BuildGeometry()
 {
 //___________________________________________
 void AliMUON::BuildGeometry()
 {


@@ -403,7 +380,7 @@ void AliMUON::MakeBranch(Option_t* option)
       }        
   }
 
       }        
   }
 

-  printf("Make Branch - TreeR address %p\n",gAlice->TreeR());
+  //printf("Make Branch - TreeR address %p\n",gAlice->TreeR());

 
 // one branch for raw clusters per chamber
   for (i=0; i<10 ;i++) {
 
 // one branch for raw clusters per chamber
   for (i=0; i<10 ;i++) {


@@ -415,20 +392,6 @@ void AliMUON::MakeBranch(Option_t* option)
       }        
   }
 
       }        
   }
 

-// Emmanuel's stuff - one branch for rec clusters
-  /*
-  for (i=0; i<20; i++) {
-      sprintf(branchname,"%sRecClus%d",GetName(),i+1);
-      if (fRecClusters   && gAlice->TreeD()) {
-         gAlice->TreeR()
-             ->Branch(branchname,"TObjArray", 
-                      &((*fRecClusters)[i]), buffersize,0);
-         printf("Making Branch %s for clusters in chamber %d\n",
-                branchname,i+1);
-      }
-  }
-  */
-

 }
 
 //___________________________________________
 }
 
 //___________________________________________


@@ -472,18 +435,6 @@ void AliMUON::SetTreeAddress()
       }
   }
 
       }
   }
 

-  // Emmanuel's stuff
-  /*
-  if (treeR) {
-      for (int i=0; i<20; i++) {
-         sprintf(branchname,"%sRecClus%d",GetName(),i+1);
-         if (fRecClusters) {
-             branch = treeR->GetBranch(branchname);
-             if (branch) branch->SetAddress(&((*fRecClusters)[i]));
-         }
-      }
-  }
-  */

 }
 //___________________________________________
 void AliMUON::ResetHits()
 }
 //___________________________________________
 void AliMUON::ResetHits()


@@ -529,18 +480,6 @@ void AliMUON::ResetCorrelation()
     }
 }
 
     }
 }
 

-//____________________________________________
-void AliMUON::ResetRecClusters()
-{
-    //
-    // Reset the rec clusters
-    //
-  /*
-    for ( int i=0;i<20;i++ ) {
-       if ((*fRecClusters)[i])   (*fRecClusters)[i]->Clear();
-    }
-  */
-}

 //___________________________________________
 
 void AliMUON::SetPADSIZ(Int_t id, Int_t isec, Float_t p1, Float_t p2)
 //___________________________________________
 
 void AliMUON::SetPADSIZ(Int_t id, Int_t isec, Float_t p1, Float_t p2)


@@ -640,6 +579,7 @@ void   AliMUON::SetNsec(Int_t id, Int_t nsec)
 void AliMUON::StepManager()
 {
     printf("Dummy version of muon step -- it should never happen!!\n");
 void AliMUON::StepManager()
 {
     printf("Dummy version of muon step -- it should never happen!!\n");

+    /*

     const Float_t kRaddeg = 180/TMath::Pi();
     AliMC* pMC = AliMC::GetMC();
     Int_t nsec, ipart;
     const Float_t kRaddeg = 180/TMath::Pi();
     AliMC* pMC = AliMC::GetMC();
     Int_t nsec, ipart;


@@ -652,7 +592,7 @@ void AliMUON::StepManager()
            if((pMC->TrackPid()==443 || pMC->TrackPid()==553) && !strcmp(proc,"DCAY")) {
                //
                // Check angular acceptance
            if((pMC->TrackPid()==443 || pMC->TrackPid()==553) && !strcmp(proc,"DCAY")) {
                //
                // Check angular acceptance

-               //* --- and have muons from resonance decays in the wanted window --- 
+               // --- and have muons from resonance decays in the wanted window --- 

                if(nsec != 2) {
                    printf(" AliMUON::StepManager: Strange resonance Decay into %d particles\n",nsec);
                    pMC->StopEvent();
                if(nsec != 2) {
                    printf(" AliMUON::StepManager: Strange resonance Decay into %d particles\n",nsec);
                    pMC->StopEvent();


@@ -660,7 +600,7 @@ void AliMUON::StepManager()
                    pMC->GetSecondary(0,ipart,x,p);
                    pt  = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
                    th0 = TMath::ATan2(pt,p[2])*kRaddeg;
                    pMC->GetSecondary(0,ipart,x,p);
                    pt  = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
                    th0 = TMath::ATan2(pt,p[2])*kRaddeg;

-                   pMC->GetSecondary(1,ipart,x,p);
+                   pMC->GetSecondary(1,ipart,x,p);

                    pt  = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
                    th2 = TMath::ATan2(pt,p[2])*kRaddeg;
                    if(!(fAccMin < th0 && th0 < fAccMax) ||
                    pt  = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
                    th2 = TMath::ATan2(pt,p[2])*kRaddeg;
                    if(!(fAccMin < th0 && th0 < fAccMax) ||


@@ -670,6 +610,7 @@ void AliMUON::StepManager()
            }
        }
     }
            }
        }
     }

+    */

 }
 
 void AliMUON::MakePadHits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol)
 }
 
 void AliMUON::MakePadHits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol)


@@ -718,7 +659,7 @@ void AliMUON::MakePadHits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol)
 //    printf("\n %d new clusters added", ic);
 }
 
 //    printf("\n %d new clusters added", ic);
 }
 

-void AliMUON::Digitise(Int_t nev,Int_t bgr_ev,Option_t *option,Option_t *opt,Text_t *filename)
+void AliMUON::Digitise(Int_t nev,Int_t bgr_ev,Option_t *option, Option_t *,Text_t *filename)

 {
     // keep galice.root for signal and name differently the file for 
     // background when add! otherwise the track info for signal will be lost !
 {
     // keep galice.root for signal and name differently the file for 
     // background when add! otherwise the track info for signal will be lost !


@@ -791,16 +732,6 @@ void AliMUON::Digitise(Int_t nev,Int_t bgr_ev,Option_t *option,Option_t *opt,Tex
     AliMUONHitMap* hm;
     Int_t countadr=0;
     for (int icat=0; icat<2; icat++) { 
     AliMUONHitMap* hm;
     Int_t countadr=0;
     for (int icat=0; icat<2; icat++) { 

-/*
-       for (Int_t i=0; i<10; i++) {
-           if (HitMap[i]) {
-               hm=HitMap[i];
-               delete hm;
-               HitMap[i]=0;
-           }
-       }
-*/
-

        Int_t counter=0;
        for (Int_t i =0; i<10; i++) {
            iChamber=(AliMUONchamber*) (*fChambers)[i];
        Int_t counter=0;
        for (Int_t i =0; i<10; i++) {
            iChamber=(AliMUONchamber*) (*fChambers)[i];


@@ -980,13 +911,12 @@ void AliMUON::Digitise(Int_t nev,Int_t bgr_ev,Option_t *option,Option_t *opt,Tex
                    
 //
 // Loop over pad hits
                    
 //
 // Loop over pad hits

-                   //for(int j=0;j<fClusters2->GetEntriesFast();++j)

                    for (AliMUONcluster* mPad=
                             (AliMUONcluster*)MUON->FirstPad(mHit,fClusters2);
                         mPad;
                         mPad=(AliMUONcluster*)MUON->NextPad(fClusters2))
                    {
                    for (AliMUONcluster* mPad=
                             (AliMUONcluster*)MUON->FirstPad(mHit,fClusters2);
                         mPad;
                         mPad=(AliMUONcluster*)MUON->NextPad(fClusters2))
                    {

-                       //                  mPad = (AliMUONcluster*) (*fClusters2)[j];
+

                        Int_t cathode  = mPad->fCathode;    // cathode number
                        Int_t ipx      = mPad->fPadX;       // pad number on X
                        Int_t ipy      = mPad->fPadY;       // pad number on Y
                        Int_t cathode  = mPad->fCathode;    // cathode number
                        Int_t ipx      = mPad->fPadX;       // pad number on X
                        Int_t ipy      = mPad->fPadY;       // pad number on Y


@@ -994,7 +924,7 @@ void AliMUON::Digitise(Int_t nev,Int_t bgr_ev,Option_t *option,Option_t *opt,Tex
 //                     Int_t iqpad    = mPad->fQpad;       // charge per pad
 
                        if (cathode != (icat+1)) continue;
 //                     Int_t iqpad    = mPad->fQpad;       // charge per pad
 
                        if (cathode != (icat+1)) continue;

-//                 if (!HitMap[nch]->CheckBoundary()) continue;
+                       //if (!HitMap[nch]->CheckBoundary()) continue;

                        // fill the info array
                        Float_t thex, they;
                        segmentation=iChamber->GetSegmentationModel(cathode);
                        // fill the info array
                        Float_t thex, they;
                        segmentation=iChamber->GetSegmentationModel(cathode);


@@ -1131,26 +1061,22 @@ void AliMUON::Digitise(Int_t nev,Int_t bgr_ev,Option_t *option,Option_t *opt,Tex
 
            // fill digits
            MUON->AddDigits(ich,tracks,charges,digits);
 
            // fill digits
            MUON->AddDigits(ich,tracks,charges,digits);

-           // delete trlist;
-//         delete address;

        }
        //cout<<"I'm out of the loops for digitisation"<<endl;
        }
        //cout<<"I'm out of the loops for digitisation"<<endl;

-       //      gAlice->GetEvent(nev);

        gAlice->TreeD()->Fill();
        gAlice->TreeD()->Fill();

-       //TTree *TD=gAlice->TreeD();
-       /*
+       TTree *TD=gAlice->TreeD();
+

        Stat_t ndig=TD->GetEntries();
        cout<<"number of digits  "<<ndig<<endl;
        TClonesArray *fDch;
        Stat_t ndig=TD->GetEntries();
        cout<<"number of digits  "<<ndig<<endl;
        TClonesArray *fDch;

-       for (int i=0;i<10;i++) {
-           fDch= MUON->DigitsAddress(i);
+       for (int k=0;k<10;k++) {
+           fDch= MUON->DigitsAddress(k);

            int ndig=fDch->GetEntriesFast();
            int ndig=fDch->GetEntriesFast();

-           printf (" i, ndig %d %d \n",i,ndig);
+           printf (" i, ndig %d %d \n",k,ndig);

        }
        }

-       */
+

        MUON->ResetDigits();
        list->Delete();
        MUON->ResetDigits();
        list->Delete();

-       //printf("Here\n");

        for(Int_t ii=0;ii<10;++ii) {
            if (HitMap[ii]) {
                hm=HitMap[ii];
        for(Int_t ii=0;ii<10;++ii) {
            if (HitMap[ii]) {
                hm=HitMap[ii];


@@ -1170,14 +1096,6 @@ void AliMUON::Digitise(Int_t nev,Int_t bgr_ev,Option_t *option,Option_t *opt,Tex
        //Int_t nadr=p_adr->GetEntriesFast();
        // printf(" \n \n nadr %d \n",nadr);
 
        //Int_t nadr=p_adr->GetEntriesFast();
        // printf(" \n \n nadr %d \n",nadr);
 

-       // start filling the digits
-       /*
-       for (Int_t nent=0;nent<nadr;nent++) {
-           TVector *pv=(TVector*)p_adr->At(nent);
-            pv->Delete();
-           //delete pv;
-       }
-       */

        p_adr->Clear();
        // gObjectTable->Print();
        
        p_adr->Clear();
        // gObjectTable->Print();
        


@@ -1260,15 +1178,13 @@ void AliMUON::FindClusters(Int_t nev,Int_t last_entry)
          AliMUONresponse* response = iChamber->GetResponseModel();
          AliMUONsegmentation*  seg = iChamber->GetSegmentationModel(icat+1);
          AliMUONClusterFinder* rec = iChamber->GetReconstructionModel();
          AliMUONresponse* response = iChamber->GetResponseModel();
          AliMUONsegmentation*  seg = iChamber->GetSegmentationModel(icat+1);
          AliMUONClusterFinder* rec = iChamber->GetReconstructionModel();

-//       if (icat==1 && (ich==4 || ich==5)) continue;
-//       printf("icat, ich, seg - %d %d %p\n",icat,ich,seg);
+         //printf("icat, ich, seg - %d %d %p\n",icat,ich,seg);

          if (seg) {      
              rec->SetSegmentation(seg);
              rec->SetResponse(response);
              rec->SetDigits(MUONdigits);
              rec->SetChamber(ich);
              if (nev==0) rec->CalibrateCOG(); 
          if (seg) {      
              rec->SetSegmentation(seg);
              rec->SetResponse(response);
              rec->SetDigits(MUONdigits);
              rec->SetChamber(ich);
              if (nev==0) rec->CalibrateCOG(); 

-//           rec->CalibrateCOG(); 

              rec->FindRawClusters();
          }  
           //printf("Finish FindRawClusters for cathode %d in chamber %d\n",icat,ich);
              rec->FindRawClusters();
          }  
           //printf("Finish FindRawClusters for cathode %d in chamber %d\n",icat,ich);


@@ -1281,10 +1197,10 @@ void AliMUON::FindClusters(Int_t nev,Int_t last_entry)
 
       } // for ich
       // fill the tree
 
       } // for ich
       // fill the tree

-      //TTree *TR=gAlice->TreeR();
+      TTree *TR=gAlice->TreeR();

 
       gAlice->TreeR()->Fill();
 
       gAlice->TreeR()->Fill();

-      /*
+

       Stat_t nent=TR->GetEntries();
       cout<<"number of entries  "<<nent<<endl;
       TClonesArray *fRch;
       Stat_t nent=TR->GetEntries();
       cout<<"number of entries  "<<nent<<endl;
       TClonesArray *fRch;


@@ -1293,7 +1209,6 @@ void AliMUON::FindClusters(Int_t nev,Int_t last_entry)
          int nraw=fRch->GetEntriesFast();
          printf (" i, nraw %d %d \n",i,nraw);
       }
          int nraw=fRch->GetEntriesFast();
          printf (" i, nraw %d %d \n",i,nraw);
       }

-      */

       ResetRawClusters();
 
   } // for icat
       ResetRawClusters();
 
   } // for icat


@@ -1647,7 +1562,6 @@ void AliMUON::Streamer(TBuffer &R__b)
       R__b.ReadArray(fNdch);
       R__b.ReadArray(fNrawch);
       R__b.ReadArray(fNcorch);
       R__b.ReadArray(fNdch);
       R__b.ReadArray(fNrawch);
       R__b.ReadArray(fNcorch);

-      //      R__b >> fRecClusters;

       //
       R__b >> fAccCut;
       R__b >> fAccMin;
       //
       R__b >> fAccCut;
       R__b >> fAccMin;


@@ -1694,7 +1608,6 @@ void AliMUON::Streamer(TBuffer &R__b)
       R__b.WriteArray(fNdch, 10);
       R__b.WriteArray(fNrawch, 10);
       R__b.WriteArray(fNcorch, 10);
       R__b.WriteArray(fNdch, 10);
       R__b.WriteArray(fNrawch, 10);
       R__b.WriteArray(fNcorch, 10);

-      //      R__b << fRecClusters;

       //
       R__b << fAccCut;
       R__b << fAccMin;
       //
       R__b << fAccCut;
       R__b << fAccMin;


@@ -1708,12 +1621,6 @@ void AliMUON::Streamer(TBuffer &R__b)
       //
       R__b << fChambers;
 //  Stream chamber related information
       //
       R__b << fChambers;
 //  Stream chamber related information

-      /*
-      for (Int_t i =0; i<20; i++) {
-         clustaddress=(TObjArray*) (*fRecClusters)[i];
-         clustaddress->Streamer(R__b);
-      }
-      */

       for (Int_t i =0; i<10; i++) {
          iChamber=(AliMUONchamber*) (*fChambers)[i];
          iChamber->Streamer(R__b);
       for (Int_t i =0; i<10; i++) {
          iChamber=(AliMUONchamber*) (*fChambers)[i];
          iChamber->Streamer(R__b);


@@ -1866,7 +1773,7 @@ void AliMUON::Reconst(Int_t &ifit, Int_t &idebug, Int_t bgd_ev, Int_t &nev, Int_
 }
 
 
 }
 
 

-void AliMUON::Init(Double_t &seff, Double_t &sb0, Double_t &sbl3)
+void AliMUON::InitTracking(Double_t &seff, Double_t &sb0, Double_t &sbl3)

 {
   //
   // introduce in fortran program somme parameters and cuts for tracking 
 {
   //
   // introduce in fortran program somme parameters and cuts for tracking 


@@ -1886,14 +1793,14 @@ void AliMUON::FinishEvent()
     file1->cd();
 }
 
     file1->cd();
 }
 

-void AliMUON::Close()
+void AliMUON::CloseTracking()

 {
   //
   // write histos and ntuple to "reconst.root" file
     reco_term();
 }
 
 {
   //
   // write histos and ntuple to "reconst.root" file
     reco_term();
 }
 

-void chfill(Int_t &id, Float_t &x, Float_t &y, Float_t &w)
+void chfill(Int_t &id, Float_t &x, Float_t &, Float_t &)

 {
   //
   // fill histo like hfill in fortran
 {
   //
   // fill histo like hfill in fortran


@@ -2358,18 +2265,12 @@ void trackf_read_geant(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t *p
                     if (id==kMuonPlus) itypg[maxidg]  = 5;
                    else  itypg[maxidg]  = 6;
 
                     if (id==kMuonPlus) itypg[maxidg]  = 5;
                    else  itypg[maxidg]  = 6;
 

-
-
-                    //printf("ich, itypg[maxidg] %d %d\n",izch[maxidg],itypg[maxidg]);
-

                    ptotg[maxidg]  = mHit->fPTot;          // P of hit 
                    
                    Part = (TParticle*) fPartArray->UncheckedAt(ftrack);
                    Float_t thet = Part->Theta();
                    thet = thet*180./3.1416;
                    
                    ptotg[maxidg]  = mHit->fPTot;          // P of hit 
                    
                    Part = (TParticle*) fPartArray->UncheckedAt(ftrack);
                    Float_t thet = Part->Theta();
                    thet = thet*180./3.1416;
                    

-                   //cout<<"chambre "<<izch[maxidg]<<"  ptot="<<ptotg[maxidg]<<"   theta="<<thet<<"   phi="<<mHit->fPhi<<" z="<<zz<<endl;          
-                   

                    Int_t iparent = Part->GetFirstMother();
                    if (iparent >= 0) {
                        Int_t ip;
                    Int_t iparent = Part->GetFirstMother();
                    if (iparent >= 0) {
                        Int_t ip;


@@ -2400,11 +2301,6 @@ void trackf_read_geant(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t *p
                    pvert2g[maxidg] = Part->Px();      // Py vertex  
                    pvert3g[maxidg] = Part->Pz();      // Pz vertex
                    zvertg[maxidg]  = Part->Vz();      // z vertex 
                    pvert2g[maxidg] = Part->Px();      // Py vertex  
                    pvert3g[maxidg] = Part->Pz();      // Pz vertex
                    zvertg[maxidg]  = Part->Vz();      // z vertex 

-           
-                   //      cout<<"x="<<xgeant[maxidg]<<endl;
-                   //cout<<"y="<<ygeant[maxidg]<<endl;
-                   //cout<<"typ="<<itypg[maxidg]<<endl;
-

                    maxidg ++;
 
                }
                    maxidg ++;
 
                }


@@ -2451,6 +2347,7 @@ void trackf_read_geant(Int_t *itypg, Double_t *xtrg, Double_t *ytrg, Double_t *p
            
            TClonesArray *fPartArray = fParticles2;
            TParticle *Part;
            
            TClonesArray *fPartArray = fParticles2;
            TParticle *Part;

+           Part = (TParticle*) fPartArray->UncheckedAt(ftrack);

            Int_t id = ((TParticle*) fPartArray->UncheckedAt(ftrack))->GetPdgCode();
            if (id==kMuonPlus||id==kMuonMinus) {
                if (id==kMuonPlus) itypg[maxidg]  = 5;
            Int_t id = ((TParticle*) fPartArray->UncheckedAt(ftrack))->GetPdgCode();
            if (id==kMuonPlus||id==kMuonMinus) {
                if (id==kMuonPlus) itypg[maxidg]  = 5;

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index b13b3fee41328a26ac20e32232a33b8e1f9cbe57..26d99a8be198ae66ac497dfd1175831d651fb6bd 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -19,7 +19,6 @@ typedef enum {simple, medium, big} Cluster_t;
 static const int NCH=14;
 
 class AliMUONcluster;
 static const int NCH=14;
 
 class AliMUONcluster;

-class AliMUONRecCluster;

 class AliMUONRawCluster;
 class AliMUONClusterFinder;
 class AliMUONcorrelation;
 class AliMUONRawCluster;
 class AliMUONClusterFinder;
 class AliMUONcorrelation;


@@ -61,7 +60,7 @@ public:
 
 public:
    AliMUONreccluster() {
 
 public:
    AliMUONreccluster() {

-       fTracks[0]=fTracks[1]=fTracks[2]=0; 
+       fTracks[0]=fTracks[1]=fTracks[2]=-1; 

        fQ=0; fX=fY=0; 
    }
    virtual ~AliMUONreccluster() {;}
        fQ=0; fX=fY=0; 
    }
    virtual ~AliMUONreccluster() {;}


@@ -143,8 +142,6 @@ class AliMUON : public  AliDetector {
     virtual void   AddCluster(Int_t*);
     virtual void   AddDigits(Int_t, Int_t*, Int_t*, Int_t*);
     virtual void   AddRawCluster(Int_t, const AliMUONRawCluster&);
     virtual void   AddCluster(Int_t*);
     virtual void   AddDigits(Int_t, Int_t*, Int_t*, Int_t*);
     virtual void   AddRawCluster(Int_t, const AliMUONRawCluster&);

-    virtual void   AddRecCluster(Int_t iCh, Int_t iCat,
-                                AliMUONRecCluster* Cluster);

     virtual void   AddCathCorrel(Int_t, Int_t*, Float_t*, Float_t*);
     virtual void   BuildGeometry();
     virtual void   CreateGeometry() {}
     virtual void   AddCathCorrel(Int_t, Int_t*, Float_t*, Float_t*);
     virtual void   BuildGeometry();
     virtual void   CreateGeometry() {}


@@ -161,7 +158,6 @@ class AliMUON : public  AliDetector {
     virtual void   ResetHits();
     virtual void   ResetDigits();
     virtual void   ResetRawClusters();
     virtual void   ResetHits();
     virtual void   ResetDigits();
     virtual void   ResetRawClusters();

-    virtual void   ResetRecClusters();

     virtual void   ResetCorrelation();
     virtual void   FindClusters(Int_t,Int_t);
     virtual void   Digitise(Int_t,Int_t,Option_t *opt1=" ",Option_t *opt2=" ",Text_t *name=" ");
     virtual void   ResetCorrelation();
     virtual void   FindClusters(Int_t,Int_t);
     virtual void   Digitise(Int_t,Int_t,Option_t *opt1=" ",Option_t *opt2=" ",Text_t *name=" ");


@@ -170,10 +166,10 @@ class AliMUON : public  AliDetector {
 //
 // modifs perso
 
 //
 // modifs perso
 

-    void     Init(Double_t &, Double_t &, Double_t &);
+    void     InitTracking(Double_t &, Double_t &, Double_t &);

     void     Reconst(Int_t &,Int_t &,Int_t,Int_t &,Int_t&,Int_t&, Option_t *option,Text_t *filename);
     void     FinishEvent();
     void     Reconst(Int_t &,Int_t &,Int_t,Int_t &,Int_t&,Int_t&, Option_t *option,Text_t *filename);
     void     FinishEvent();

-    void     Close();
+    void     CloseTracking();

     void     SetCutPxz(Double_t p) {fSPxzCut=p;}
     void     SetSigmaCut(Double_t p) {fSSigmaCut=p;}
     void     SetXPrec(Double_t p) {fSXPrec=p;}
     void     SetCutPxz(Double_t p) {fSPxzCut=p;}
     void     SetSigmaCut(Double_t p) {fSSigmaCut=p;}
     void     SetXPrec(Double_t p) {fSXPrec=p;}


@@ -219,9 +215,6 @@ class AliMUON : public  AliDetector {
     Int_t                *Ndch() {return fNdch;}
     virtual TClonesArray *DigitsAddress(Int_t id) {return ((TClonesArray *) (*fDchambers)[id]);}
 // Return pointers to reconstructed clusters
     Int_t                *Ndch() {return fNdch;}
     virtual TClonesArray *DigitsAddress(Int_t id) {return ((TClonesArray *) (*fDchambers)[id]);}
 // Return pointers to reconstructed clusters

-  //    virtual TObjArray *RecClusters(Int_t iCh, Int_t iCat) 
-  //   {return ( (TObjArray*) (*fRecClusters)[iCh+iCat*10]);}
-

     TObjArray            *RawClusters() {return fRawClusters;}
     Int_t                *Nrawch() {return fNrawch;}
     virtual TClonesArray *RawClustAddress(Int_t id) {return ((TClonesArray *) (*fRawClusters)[id]);}
     TObjArray            *RawClusters() {return fRawClusters;}
     Int_t                *Nrawch() {return fNrawch;}
     virtual TClonesArray *RawClustAddress(Int_t id) {return ((TClonesArray *) (*fRawClusters)[id]);}


@@ -236,10 +229,6 @@ class AliMUON : public  AliDetector {
     virtual TClonesArray *CathCorrelAddress(Int_t id)
        {return ((TClonesArray *) (*fCathCorrel)[id]);}
 
     virtual TClonesArray *CathCorrelAddress(Int_t id)
        {return ((TClonesArray *) (*fCathCorrel)[id]);}
 

-// modifs perso
-//  virtual TClonesArray *CathCorrelAddress2(Int_t id)
-//     {return ((TClonesArray *) (*fCathCorrel2)[id]);}    
-    

 // Return pointer to TreeC
     TTree      *TreeC() {return fTreeC;} 
  protected:
 // Return pointer to TreeC
     TTree      *TreeC() {return fTreeC;} 
  protected:


@@ -249,7 +238,6 @@ class AliMUON : public  AliDetector {
     TObjArray            *fDchambers;          // List of digits
     Int_t                *fNdch;               // Number of digits
 
     TObjArray            *fDchambers;          // List of digits
     Int_t                *fNdch;               // Number of digits
 

-  //    TObjArray            *fRecClusters;        // List of clusters

 
     TObjArray            *fRawClusters;            // List of raw clusters
     Int_t                *fNrawch;                 // Number of raw clusters
 
     TObjArray            *fRawClusters;            // List of raw clusters
     Int_t                *fNrawch;                 // Number of raw clusters


@@ -283,35 +271,6 @@ class AliMUON : public  AliDetector {
    ClassDef(AliMUON,1)  //Hits manager for set:MUON
 };
 //___________________________________________
    ClassDef(AliMUON,1)  //Hits manager for set:MUON
 };
 //___________________________________________

-class AliMUONRecCluster : public TObject {
-public:
-   AliMUONRecCluster() ;
-   AliMUONRecCluster(Int_t FirstDigit,Int_t Ichamber, Int_t Icathod) ;
-   virtual ~AliMUONRecCluster();
-   virtual void  AddDigit(Int_t Digit);
-   virtual Int_t FirstDigitIndex();
-   virtual Int_t NextDigitIndex();
-   virtual Int_t InvalidDigitIndex() {return -1;}
-
-   virtual Int_t NDigits();
-   virtual void  Finish();    // Nothing yet ...
-   virtual Int_t GetCathod()  {return fCathod;}
-   virtual Int_t GetChamber() {return fChamber;}
-
-public:
-   Float_t fX; // reconstructed x
-   Float_t fY; // reconstructed y
-
-protected:
-   TArrayI *fDigits;    // List of digits indexes for that cluster
-   Int_t fNdigit;       // Number of digits indexes stored;
-   Int_t fCathod;       // Number of the cathod to be used;
-   Int_t fChamber;      // Number of the chamber to be used;
-   Int_t fCurrentDigit; // Current Digit inside an iteration
-
-   ClassDef(AliMUONRecCluster,1)  //Cluster object for set:MUON
-};
-//___________________________________________

 
 class AliMUONRawCluster : public TObject {
 public:
 
 class AliMUONRawCluster : public TObject {
 public:

diff --git a/MUON/AliMUONClusterFinder.cxx b/MUON/AliMUONClusterFinder.cxx
index 472c8a13cb4e0dbe88a4b1c2999a39042466b9d3..3ee726f72c6296d1521ff1a96c9fe54f5833e090 100644 (file)
--- a/MUON/AliMUONClusterFinder.cxx
+++ b/MUON/AliMUONClusterFinder.cxx
@@ -8,8 +8,7 @@
 #include <TPostScript.h> 
 #include <TMinuit.h> 
 
 #include <TPostScript.h> 
 #include <TMinuit.h> 
 

-ClassImp(AliMUONRecCluster)
-//_____________________________________________________________________
+//----------------------------------------------------------

 static AliMUONsegmentation* gSegmentation;
 static AliMUONresponse*     gResponse;
 static Int_t                gix[500];
 static AliMUONsegmentation* gSegmentation;
 static AliMUONresponse*     gResponse;
 static Int_t                gix[500];


@@ -21,76 +20,8 @@ static TMinuit *gMyMinuit ;
 void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag);
 static Int_t                gChargeTot;
 
 void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag);
 static Int_t                gChargeTot;
 

-
-AliMUONRecCluster::AliMUONRecCluster()
-
-{
-    fDigits=0;
-    fNdigit=-1;
-}
-
-AliMUONRecCluster::
-AliMUONRecCluster(Int_t FirstDigit,Int_t Ichamber, Int_t Icathod)
-{
-    fX = 0.;
-    fY = 0.;
-    fDigits = new TArrayI(10);
-    fNdigit=0;
-    AddDigit(FirstDigit);
-    fChamber=Ichamber;
-    fCathod=Icathod;
-}
-
-void AliMUONRecCluster::AddDigit(Int_t Digit)
-{
-    if (fNdigit==fDigits->GetSize()) {
-       //enlarge the list by hand!
-       Int_t *array= new Int_t[fNdigit*2];
-       for(Int_t i=0;i<fNdigit;i++)
-           array[i] = fDigits->At(i);
-       fDigits->Adopt(fNdigit*2,array);
-    }
-    fDigits->AddAt(Digit,fNdigit);
-    fNdigit++;
-}
-
-
-AliMUONRecCluster::~AliMUONRecCluster()
-{
-    if (fDigits)
-       delete fDigits;
-}
-
-Int_t AliMUONRecCluster::FirstDigitIndex()
-{
-    fCurrentDigit=0;
-    return fDigits->At(fCurrentDigit);
-}
-
-Int_t AliMUONRecCluster::NextDigitIndex()
-{
-    fCurrentDigit++;
-    if (fCurrentDigit<fNdigit)
-       return fDigits->At(fCurrentDigit);
-    else 
-       return InvalidDigitIndex();
-}
-
-Int_t AliMUONRecCluster::NDigits()
-{
-    return fNdigit;
-}
-void AliMUONRecCluster::Finish()
-{
-    // In order to reconstruct coordinates, one has to
-    // get back to the digits which is not trivial here,
-    // because we don't know where digits are stored!
-    // Center Of Gravity, or other method should be
-    // a property of AliMUON class!
-}
-
-

 //----------------------------------------------------------
 //----------------------------------------------------------

+

 ClassImp(AliMUONClusterFinder)
 
     AliMUONClusterFinder::AliMUONClusterFinder
 ClassImp(AliMUONClusterFinder)
 
     AliMUONClusterFinder::AliMUONClusterFinder


@@ -315,7 +246,7 @@ void AliMUONClusterFinder::SplitByLocalMaxima(AliMUONRawCluster *c)
        fSegmentation->Neighbours(ix[i], iy[i], &nn, X, Y);
        IsLocal[i]=kTRUE;
        for (j=0; j<nn; j++) {
        fSegmentation->Neighbours(ix[i], iy[i], &nn, X, Y);
        IsLocal[i]=kTRUE;
        for (j=0; j<nn; j++) {

-           if (fHitMap->TestHit(X[j], Y[j])==empty) continue;
+           if (fHitMap->TestHit(X[j],Y[j])==empty) continue;

            digt=(AliMUONdigit*) fHitMap->GetHit(X[j], Y[j]);
            if (digt->fSignal > q[i]) {
                IsLocal[i]=kFALSE;
            digt=(AliMUONdigit*) fHitMap->GetHit(X[j], Y[j]);
            if (digt->fSignal > q[i]) {
                IsLocal[i]=kFALSE;


@@ -755,10 +686,12 @@ void AliMUONClusterFinder::FindRawClusters()
   // simple MUON cluster finder from digits -- finds neighbours and 
   // fill the tree with raw clusters
   //
   // simple MUON cluster finder from digits -- finds neighbours and 
   // fill the tree with raw clusters
   //

+

     if (!fNdigits) return;
 
     fHitMap = new AliMUONHitMapA1(fSegmentation, fDigits);
 
     if (!fNdigits) return;
 
     fHitMap = new AliMUONHitMapA1(fSegmentation, fDigits);
 

+

     AliMUONdigit *dig;
 
     Int_t ndig;
     AliMUONdigit *dig;
 
     Int_t ndig;


@@ -1078,7 +1011,7 @@ Float_t DiscrCharge(Int_t i,Double_t *par)
 
 //
 // Minimisation function
 
 //
 // Minimisation function

-void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag)
+void fcn(Int_t &, Double_t *, Double_t &f, Double_t *par, Int_t )

 {
     Int_t i;
     Float_t delta;
 {
     Int_t i;
     Float_t delta;

diff --git a/MUON/AliMUONClusterFinderv0.h b/MUON/AliMUONClusterFinderv0.h
index 6cdf6107d392d92fcab96ac9f0421e52e2d445ed..292f3bd2f579e486f794c5a3ae856ea067ee7b6e 100644 (file)
--- a/MUON/AliMUONClusterFinderv0.h
+++ b/MUON/AliMUONClusterFinderv0.h
@@ -62,7 +62,7 @@ public AliMUONClusterFinder {
     virtual Bool_t Centered(AliMUONRawCluster *cluster);
     virtual void   SplitByLocalMaxima(AliMUONRawCluster *cluster);
 //    virtual void   FillCluster(AliMUONRawCluster *cluster);
     virtual Bool_t Centered(AliMUONRawCluster *cluster);
     virtual void   SplitByLocalMaxima(AliMUONRawCluster *cluster);
 //    virtual void   FillCluster(AliMUONRawCluster *cluster);

-    void AliMUONClusterFinderv0::DumpCluster(class AliMUONRawCluster *);
+    void DumpCluster(AliMUONRawCluster *cluster);

     
     
     TClonesArray* RawClusters(){return fRawClusters;}
     
     
     TClonesArray* RawClusters(){return fRawClusters;}

diff --git a/MUON/AliMUONHitMap.cxx b/MUON/AliMUONHitMap.cxx
index 297cba63996aef8ae74d381c2f0434bbfc271fc5..209c762b7756538488e8ed0c8fec8c2c22b80006 100644 (file)
--- a/MUON/AliMUONHitMap.cxx
+++ b/MUON/AliMUONHitMap.cxx
@@ -12,7 +12,7 @@ AliMUONHitMapA1::AliMUONHitMapA1(AliMUONsegmentation *seg, TObjArray *dig)
     fHitMap = new Int_t[fMaxIndex];
     fDigits =  dig;
     fNdigits = fDigits->GetEntriesFast();
     fHitMap = new Int_t[fMaxIndex];
     fDigits =  dig;
     fNdigits = fDigits->GetEntriesFast();

-    Clear();
+    ClearMap();

 }
 
 
 }
 
 


@@ -22,7 +22,7 @@ AliMUONHitMapA1::~AliMUONHitMapA1()
     if (fHitMap) delete[] fHitMap;
 }
 
     if (fHitMap) delete[] fHitMap;
 }
 

-void AliMUONHitMapA1::Clear()
+void AliMUONHitMapA1::ClearMap()

 {
     memset(fHitMap,0,sizeof(int)*fMaxIndex);
 }
 {
     memset(fHitMap,0,sizeof(int)*fMaxIndex);
 }

diff --git a/MUON/AliMUONHitMap.h b/MUON/AliMUONHitMap.h
index 49dff3cd96f67192c9bb8f16bd4491456c146706..25268a80ddc657393e86ed38280c3a694af5e2e5 100644 (file)
--- a/MUON/AliMUONHitMap.h
+++ b/MUON/AliMUONHitMap.h
@@ -10,7 +10,7 @@ class AliMUONHitMap :
 public TObject {
  public:
     virtual  void  FillHits()                                      =0;
 public TObject {
  public:
     virtual  void  FillHits()                                      =0;

-    virtual  void  Clear()                                         =0;
+    virtual  void  ClearMap()                                         =0;

     virtual  void  SetHit(Int_t ix, Int_t iy, Int_t idigit)        =0;
     virtual  void  DeleteHit(Int_t ix, Int_t iy)                   =0;
     virtual Int_t  GetHitIndex(Int_t ix, Int_t iy)                 =0;
     virtual  void  SetHit(Int_t ix, Int_t iy, Int_t idigit)        =0;
     virtual  void  DeleteHit(Int_t ix, Int_t iy)                   =0;
     virtual Int_t  GetHitIndex(Int_t ix, Int_t iy)                 =0;


@@ -37,7 +37,7 @@ public AliMUONHitMap
     AliMUONHitMapA1(AliMUONsegmentation *seg, TObjArray *dig);
     virtual ~AliMUONHitMapA1();
     virtual  void  FillHits();
     AliMUONHitMapA1(AliMUONsegmentation *seg, TObjArray *dig);
     virtual ~AliMUONHitMapA1();
     virtual  void  FillHits();

-    virtual  void  Clear();    
+    virtual  void  ClearMap();    

     virtual  void  SetHit(Int_t ix, Int_t iy, Int_t idigit);
     virtual  void  DeleteHit(Int_t ix, Int_t iy);
     virtual Int_t  GetHitIndex(Int_t ix, Int_t iy);
     virtual  void  SetHit(Int_t ix, Int_t iy, Int_t idigit);
     virtual  void  DeleteHit(Int_t ix, Int_t iy);
     virtual Int_t  GetHitIndex(Int_t ix, Int_t iy);

diff --git a/MUON/AliMUONSegRes.h b/MUON/AliMUONSegRes.h
index 57b64bacbdaf980fe86f9caafab3cf970969d068..56b1bd729a7151ea35467493daae06892ac3dc82 100644 (file)
--- a/MUON/AliMUONSegRes.h
+++ b/MUON/AliMUONSegRes.h
@@ -4,7 +4,6 @@
 #include "TClonesArray.h"
 #include "TF1.h"
 class AliMUONchamber;
 #include "TClonesArray.h"
 #include "TF1.h"
 class AliMUONchamber;

-class AliMUONRecCluster;

 
 //----------------------------------------------
 //
 
 //----------------------------------------------
 //


@@ -68,9 +67,6 @@ public TObject {
     // Get next neighbours 
     virtual void Neighbours
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])     =0;
     // Get next neighbours 
     virtual void Neighbours
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])     =0;

-    // Provisory RecCluster coordinates reconstructor
-    virtual void FitXY(AliMUONRecCluster* Cluster,TClonesArray* MUONdigits)    =0;
-    //

     // Current pad cursor during disintegration
     // x-coordinate
     virtual Int_t  Ix()                                =0;
     // Current pad cursor during disintegration
     // x-coordinate
     virtual Int_t  Ix()                                =0;


@@ -91,7 +87,7 @@ public TObject {
     // Test points for auto calibration
     virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) = 0;
     // Debug utilities
     // Test points for auto calibration
     virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y) = 0;
     // Debug utilities

-    virtual void Draw()                                           = 0;
+    virtual void Draw(Option_t *)                             = 0;

     // Function for systematic corrections
     virtual void SetCorrFunc(Int_t, TF1*)                         = 0;
     virtual TF1* CorrFunc(Int_t)                                  = 0;
     // Function for systematic corrections
     virtual void SetCorrFunc(Int_t, TF1*)                         = 0;
     virtual TF1* CorrFunc(Int_t)                                  = 0;

diff --git a/MUON/AliMUONSegResV0.cxx b/MUON/AliMUONSegResV0.cxx
index c23c625c9fd575b14c1f94a8ec2a35c3d92c9118..cb8db5656adbf75563c379befdbafd096040286e 100644 (file)
--- a/MUON/AliMUONSegResV0.cxx
+++ b/MUON/AliMUONSegResV0.cxx
@@ -122,7 +122,7 @@ Int_t AliMUONsegmentationV0::MorePads()
     }
 }
 
     }
 }
 

-void AliMUONsegmentationV0::SigGenInit(Float_t x,Float_t y,Float_t z)
+void AliMUONsegmentationV0::SigGenInit(Float_t x,Float_t y,Float_t)

 {
 //
 //  Initialises pad and wire position during stepping
 {
 //
 //  Initialises pad and wire position during stepping


@@ -132,7 +132,7 @@ void AliMUONsegmentationV0::SigGenInit(Float_t x,Float_t y,Float_t z)
     fiwt= (x>0) ? Int_t(x/fWireD)+1 : Int_t(x/fWireD)-1 ;
 }
 
     fiwt= (x>0) ? Int_t(x/fWireD)+1 : Int_t(x/fWireD)-1 ;
 }
 

-Int_t AliMUONsegmentationV0::SigGenCond(Float_t x,Float_t y,Float_t z)
+Int_t AliMUONsegmentationV0::SigGenCond(Float_t x,Float_t y,Float_t)

 {
 //
 //  Signal will be generated if particle crosses pad boundary or
 {
 //
 //  Signal will be generated if particle crosses pad boundary or


@@ -186,7 +186,7 @@ Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[7], Int_t Ylist[7])
 }
 
 Float_t AliMUONsegmentationV0::Distance2AndOffset(Int_t iX, Int_t iY, Float_t X, Float_t Y
 }
 
 Float_t AliMUONsegmentationV0::Distance2AndOffset(Int_t iX, Int_t iY, Float_t X, Float_t Y

-, Int_t *dummy)
+, Int_t *)

 // Returns the square of the distance between 1 pad
 // labelled by its Channel numbers and a coordinate
 {
 // Returns the square of the distance between 1 pad
 // labelled by its Channel numbers and a coordinate
 {


@@ -195,14 +195,6 @@ Float_t AliMUONsegmentationV0::Distance2AndOffset(Int_t iX, Int_t iY, Float_t X,
   return (x-X)*(x-X) + (y-Y)*(y-Y);
 }
 
   return (x-X)*(x-X) + (y-Y)*(y-Y);
 }
 

-
-void AliMUONsegmentationV0::
-FitXY(AliMUONRecCluster* Cluster,TClonesArray* MUONdigits)
-    // Default : Centre of gravity method
-{
-    ;
-}
-

 void  AliMUONsegmentationV0::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
 {
     n=1;
 void  AliMUONsegmentationV0::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
 {
     n=1;


@@ -210,7 +202,7 @@ void  AliMUONsegmentationV0::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
     y[0]=x[0];
 }
 
     y[0]=x[0];
 }
 

-void AliMUONsegmentationV0::Draw()
+void AliMUONsegmentationV0::Draw(Option_t *)

 {
     TArc *circle;
     Float_t scale=0.95/fRmax/2.;
 {
     TArc *circle;
     Float_t scale=0.95/fRmax/2.;

diff --git a/MUON/AliMUONSegResV0.h b/MUON/AliMUONSegResV0.h
index 7e714a97efd118b7e76d0f91b816b5d2600f3fb8..64391c646fe89b7953447c25c81bef6828f74f10 100644 (file)
--- a/MUON/AliMUONSegResV0.h
+++ b/MUON/AliMUONSegResV0.h
@@ -59,14 +59,11 @@ public AliMUONsegmentation {
 dummy);
     // Number of pads read in parallel and offset to add to x 
     // (specific to LYON, but mandatory for display)
 dummy);
     // Number of pads read in parallel and offset to add to x 
     // (specific to LYON, but mandatory for display)

-    virtual void GetNParallelAndOffset(Int_t iX, Int_t iY,
+    virtual void GetNParallelAndOffset(Int_t, Int_t ,

         Int_t *Nparallel, Int_t *Offset) {*Nparallel=1;*Offset=0;}
     // Get next neighbours 
     virtual void Neighbours
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]);
         Int_t *Nparallel, Int_t *Offset) {*Nparallel=1;*Offset=0;}
     // Get next neighbours 
     virtual void Neighbours
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]);

-    // Provisory RecCluster coordinates reconstructor
-    virtual void FitXY(AliMUONRecCluster* Cluster,TClonesArray* MUONdigits);
-    //

     // Current Pad during Integration
     // x-coordinaten
     virtual Int_t  Ix(){return fix;}
     // Current Pad during Integration
     // x-coordinaten
     virtual Int_t  Ix(){return fix;}


@@ -75,7 +72,7 @@ dummy);
     // current sector
     virtual Int_t  ISector(){return 1;}
     // calculate sector from pad coordinates
     // current sector
     virtual Int_t  ISector(){return 1;}
     // calculate sector from pad coordinates

-    virtual Int_t  Sector(Int_t ix, Int_t iy) {return 1;}
+    virtual Int_t  Sector(Int_t , Int_t ) {return 1;}

     //
     // Signal Generation Condition during Stepping
     virtual Int_t SigGenCond(Float_t x, Float_t y, Float_t z);
     //
     // Signal Generation Condition during Stepping
     virtual Int_t SigGenCond(Float_t x, Float_t y, Float_t z);


@@ -87,9 +84,9 @@ dummy);
     // Test points for auto calibration
     virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
     // Debugging utilities
     // Test points for auto calibration
     virtual void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
     // Debugging utilities

-    virtual void Draw();
+    virtual void Draw(Option_t *);

     // Function for systematic corrections
     // Function for systematic corrections

-    virtual void SetCorrFunc(Int_t dum, TF1* func) {fCorr=func;}
+    virtual void SetCorrFunc(Int_t, TF1* func) {fCorr=func;}

     
     virtual TF1* CorrFunc(Int_t) {return fCorr;} 
 
     
     virtual TF1* CorrFunc(Int_t) {return fCorr;} 
 

diff --git a/MUON/AliMUONSegResV01.cxx b/MUON/AliMUONSegResV01.cxx
index 5a60360ea491a38d51f322bcb753ad49b471b791..cc3cd886c50415933be3f48299d24932f461bceb 100644 (file)
--- a/MUON/AliMUONSegResV01.cxx
+++ b/MUON/AliMUONSegResV01.cxx
@@ -20,7 +20,7 @@ Float_t AliMUONsegmentationV01::Dpx(Int_t isec)
    return fDpxD[isec];
 }
 
    return fDpxD[isec];
 }
 

-Float_t AliMUONsegmentationV01::Dpy(Int_t isec)
+Float_t AliMUONsegmentationV01::Dpy(Int_t )

 {
    return fDpy;
 }
 {
    return fDpy;
 }


@@ -44,7 +44,7 @@ void   AliMUONsegmentationV01::SetSegRadii(Float_t  r[4])
 {
     for (Int_t i=0; i<4; i++) {
        fRSec[i]=r[i];
 {
     for (Int_t i=0; i<4; i++) {
        fRSec[i]=r[i];

-       printf("\n R %d %f \n",i,fRSec[i]);
+       //printf("\n R %d %f \n",i,fRSec[i]);

        
     }
 }
        
     }
 }


@@ -57,13 +57,13 @@ void AliMUONsegmentationV01::SetPadDivision(Int_t ndiv[4])
 //
     for (Int_t i=0; i<4; i++) {
        fNDiv[i]=ndiv[i];
 //
     for (Int_t i=0; i<4; i++) {
        fNDiv[i]=ndiv[i];

-       printf("\n Ndiv %d %d \n",i,fNDiv[i]);
+       //printf("\n Ndiv %d %d \n",i,fNDiv[i]);

     }
     ndiv[0]=ndiv[1];
 }
 
 
     }
     ndiv[0]=ndiv[1];
 }
 
 

-void AliMUONsegmentationV01::Init(AliMUONchamber* Chamber)
+void AliMUONsegmentationV01::Init(AliMUONchamber* )

 {
 //
 //  Fill the arrays fCx (x-contour) and fNpxS (ix-contour) for each sector
 {
 //
 //  Fill the arrays fCx (x-contour) and fNpxS (ix-contour) for each sector


@@ -71,14 +71,14 @@ void AliMUONsegmentationV01::Init(AliMUONchamber* Chamber)
 //  vice versa
 //
     Int_t isec;
 //  vice versa
 //
     Int_t isec;

-    printf("\n Initialise segmentation v01 -- test !!!!!!!!!!!!!! \n");
+    //printf("\n Initialise segmentation v01 -- test !!!!!!!!!!!!!! \n");

     fNpy=Int_t(fRSec[fNsec-1]/fDpy)+1;
 
     fDpxD[fNsec-1]=fDpx;
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
            fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];
     fNpy=Int_t(fRSec[fNsec-1]/fDpy)+1;
 
     fDpxD[fNsec-1]=fDpx;
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
            fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];

-           printf("\n test ---dx %d %f \n",i,fDpxD[i]);
+           //printf("\n test ---dx %d %f \n",i,fDpxD[i]);

        }
     }
 //
        }
     }
 //


@@ -124,7 +124,7 @@ void AliMUONsegmentationV01::Init(AliMUONchamber* Chamber)
     //   
     // for debugging only 
    
     //   
     // for debugging only 
    

-    printf("segmentationv01 - I was here ! \n");
+    //printf("segmentationv01 - I was here ! \n");

 }
 
 Int_t AliMUONsegmentationV01::Sector(Int_t ix, Int_t iy)
 }
 
 Int_t AliMUONsegmentationV01::Sector(Int_t ix, Int_t iy)


@@ -382,33 +382,6 @@ Neighbours(Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10])
     *Nlist=i;
 }
 
     *Nlist=i;
 }
 

-//___________________________________________
-void AliMUONsegmentationV01::
-FitXY(AliMUONRecCluster* Cluster,TClonesArray* MUONdigits)
-    // Default : Centre of gravity method
-{
-    Float_t x=0;
-    Float_t y=0;
-    Float_t q=0;
-    Float_t xToAdd;
-    Float_t yToAdd;
-    
-    if (gAlice->TreeD()->GetReadEvent() != Cluster->GetCathod()+1)
-       // next line warns if in the future cathod 1 is not event 2 !
-       printf("ClusterFillXY : not reading the right cathod !\n");
-    for(Int_t clusDigit=Cluster->FirstDigitIndex();
-       clusDigit!=Cluster->InvalidDigitIndex();
-       clusDigit=Cluster->NextDigitIndex()) {
-       AliMUONdigit* pDigit=(AliMUONdigit*)MUONdigits->UncheckedAt(clusDigit);
-       GetPadCxy(pDigit->fPadX,pDigit->fPadY,xToAdd,yToAdd);
-       x+= xToAdd*pDigit->fSignal;
-       y+= yToAdd*pDigit->fSignal;
-       q+= (Float_t) pDigit->fSignal;
-    }
-    Cluster->fX=x/q;
-    Cluster->fY=y/q;
-}
-

 void AliMUONsegmentationV01::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
 {
     n=3;
 void AliMUONsegmentationV01::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
 {
     n=3;


@@ -420,7 +393,7 @@ void AliMUONsegmentationV01::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
     y[2]=x[2];
 }
 
     y[2]=x[2];
 }
 

-void AliMUONsegmentationV01::Draw()
+void AliMUONsegmentationV01::Draw(Option_t *)

 {
     TBox *box;
     
 {
     TBox *box;
     

diff --git a/MUON/AliMUONSegResV01.h b/MUON/AliMUONSegResV01.h
index c072d37e498aa76e0df80b3719bbe7de30790bd9..d357ff5d75ad2fc154fafe53f18accc372d79d9a 100644 (file)
--- a/MUON/AliMUONSegResV01.h
+++ b/MUON/AliMUONSegResV01.h
@@ -53,9 +53,6 @@ public AliMUONsegmentationV0 {
     // Get next neighbours 
     virtual void Neighbours
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]);
     // Get next neighbours 
     virtual void Neighbours
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t Xlist[10], Int_t Ylist[10]);

-    // Provisory RecCluster coordinates reconstructor
-    virtual void FitXY(AliMUONRecCluster* Cluster,TClonesArray* MUONdigits);
-    //

     // Current Pad during Integration
     // current sector
     virtual Int_t ISector()  {return fSector;}
     // Current Pad during Integration
     // current sector
     virtual Int_t ISector()  {return fSector;}


@@ -70,7 +67,7 @@ public AliMUONsegmentationV0 {
     void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
     //
     // Debugging utilities
     void GiveTestPoints(Int_t &n, Float_t *x, Float_t *y);
     //
     // Debugging utilities

-    virtual void Draw();
+    virtual void Draw(Option_t *);

     // Function for systematic corrections
     virtual void SetCorrFunc(Int_t dum, TF1* func);
     virtual TF1* CorrFunc(Int_t);
     // Function for systematic corrections
     virtual void SetCorrFunc(Int_t dum, TF1* func);
     virtual TF1* CorrFunc(Int_t);

diff --git a/MUON/AliMUONSegResV02.cxx b/MUON/AliMUONSegResV02.cxx
index b0a3871c019139c8a9292209c9f40c7fa44cb91a..94ddd7c8d64fd8672b40a523783ef66c79612b14 100644 (file)
--- a/MUON/AliMUONSegResV02.cxx
+++ b/MUON/AliMUONSegResV02.cxx
@@ -26,7 +26,7 @@ Int_t AliMUONsegmentationV02::Npy()
 {return AliMUONsegmentationV01::Npx();}
 
 
 {return AliMUONsegmentationV01::Npx();}
 
 

-Float_t AliMUONsegmentationV02::Dpx(Int_t isec)
+Float_t AliMUONsegmentationV02::Dpx(Int_t)

 {return fDpy;}
 
 Float_t AliMUONsegmentationV02::Dpy(Int_t isec)
 {return fDpy;}
 
 Float_t AliMUONsegmentationV02::Dpy(Int_t isec)

diff --git a/MUON/AliMUONSegResV04.cxx b/MUON/AliMUONSegResV04.cxx
index 06c372a0f200686103483a6cc280b1af31a59535..162e494f0e7b7515132ab9310c7b1c67c1796a3a 100644 (file)
--- a/MUON/AliMUONSegResV04.cxx
+++ b/MUON/AliMUONSegResV04.cxx
@@ -15,9 +15,9 @@
 ClassImp(AliMUONsegmentationV04)
 
 
 ClassImp(AliMUONsegmentationV04)
 
 

-void AliMUONsegmentationV04::Init(AliMUONchamber* Chamber)
+void AliMUONsegmentationV04::Init(AliMUONchamber* )

 {
 {

-    printf("\n Initialise segmentation v04 \n");
+    //printf("\n Initialise segmentation v04 \n");

 //
 //  Fill the arrays fCx (x-contour) and fNpxS (ix-contour) for each sector
 //  These arrays help in converting from real to pad co-ordinates and
 //
 //  Fill the arrays fCx (x-contour) and fNpxS (ix-contour) for each sector
 //  These arrays help in converting from real to pad co-ordinates and


@@ -65,7 +65,7 @@ void AliMUONsegmentationV04::Init(AliMUONchamber* Chamber)
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
            fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
            fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];

-           printf("\n test ---dx %d %f \n",i,fDpxD[i]);
+           //printf("\n test ---dx %d %f \n",i,fDpxD[i]);

        }
     }
 //
        }
     }
 //

diff --git a/MUON/AliMUONSegResV05.cxx b/MUON/AliMUONSegResV05.cxx
index e4815f86b0e118006af284c6f4fe7f1ead00636e..040d61f3ce9a8a459242cb22ee8d9175b70db3c2 100644 (file)
--- a/MUON/AliMUONSegResV05.cxx
+++ b/MUON/AliMUONSegResV05.cxx
@@ -15,9 +15,9 @@
 ClassImp(AliMUONsegmentationV05)
 
 
 ClassImp(AliMUONsegmentationV05)
 
 

-void AliMUONsegmentationV05::Init(AliMUONchamber* Chamber)
+void AliMUONsegmentationV05::Init(AliMUONchamber* )

 {
 {

-    printf("\n Initialise segmentation v05 \n");
+  //printf("\n Initialise segmentation v05 \n");

 //
 //  Fill the arrays fCx (x-contour) and fNpxS (ix-contour) for each sector
 //  These arrays help in converting from real to pad co-ordinates and
 //
 //  Fill the arrays fCx (x-contour) and fNpxS (ix-contour) for each sector
 //  These arrays help in converting from real to pad co-ordinates and


@@ -65,7 +65,7 @@ void AliMUONsegmentationV05::Init(AliMUONchamber* Chamber)
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
            fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];
     if (fNsec > 1) {
        for (Int_t i=fNsec-2; i>=0; i--){
            fDpxD[i]=fDpxD[fNsec-1]/fNDiv[i];

-           printf("\n test ---dx %d %f \n",i,fDpxD[i]);
+           //printf("\n test ---dx %d %f \n",i,fDpxD[i]);

        }
     }
 //
        }
     }
 //

diff --git a/MUON/AliMUONSegResV1.cxx b/MUON/AliMUONSegResV1.cxx
index 78e64479fdf9d5475df50083ffa5c4cb66807b3c..bb543777acda707e1e30c91647485258bc56b7c0 100644 (file)
--- a/MUON/AliMUONSegResV1.cxx
+++ b/MUON/AliMUONSegResV1.cxx
@@ -246,7 +246,7 @@ if (iY%3==1) return 0;
 return (iX%9)/3+1 - (iY%3==2 && iX%3==0);
 }
 
 return (iX%9)/3+1 - (iY%3==2 && iX%3==0);
 }
 

-Int_t AliMUONsegmentationV1::NParallel2(Int_t iX, Int_t iY)
+Int_t AliMUONsegmentationV1::NParallel2(Int_t , Int_t iY)

 // returns the number of pads connected in parallel for zone 2
 // iX and iY are assumed to be positive and starting at 0 numbering (cF. iX)
 //
 // returns the number of pads connected in parallel for zone 2
 // iX and iY are assumed to be positive and starting at 0 numbering (cF. iX)
 //


@@ -313,7 +313,7 @@ Int_t AliMUONsegmentationV1::ISector()
 return GetZone(fix,fiy);
 }
 
 return GetZone(fix,fiy);
 }
 

-void AliMUONsegmentationV1::SigGenInit(Float_t x,Float_t y,Float_t z)
+void AliMUONsegmentationV1::SigGenInit(Float_t x,Float_t y,Float_t )

 {
 //
 //  Initialises pad and wire position during stepping
 {
 //
 //  Initialises pad and wire position during stepping


@@ -324,7 +324,7 @@ void AliMUONsegmentationV1::SigGenInit(Float_t x,Float_t y,Float_t z)
 
 }
 
 
 }
 

-Int_t AliMUONsegmentationV1::SigGenCond(Float_t x,Float_t y,Float_t z)
+Int_t AliMUONsegmentationV1::SigGenCond(Float_t x,Float_t y,Float_t )

 {
 //
 //  Signal will be generated if particle crosses pad boundary or
 {
 //
 //  Signal will be generated if particle crosses pad boundary or


@@ -480,13 +480,6 @@ void AliMUONsegmentationV1::Neighbours(Int_t iX, Int_t iY, Int_t* Nlist,
 {NeighboursDiag(iX,iY,Nlist,Xlist,Ylist);}
 
 
 {NeighboursDiag(iX,iY,Nlist,Xlist,Ylist);}
 
 

-void AliMUONsegmentationV1::
-FitXY(AliMUONRecCluster* Cluster,TClonesArray* MUONdigits)
-    // Default : Centre of gravity method
-{
-printf (" AliMUONsegmentationV1::FitXY called!\n");
-    ;
-}

 
 void AliMUONsegmentationV1::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
 {
 
 void AliMUONsegmentationV1::GiveTestPoints(Int_t &n, Float_t *x, Float_t *y)
 {

diff --git a/MUON/AliMUONSegResV1.h b/MUON/AliMUONSegResV1.h
index a9ae947fa7793c984bf38d71eec05b266ad89bb4..90cbbe0444632493e819872b4a32c89fdb2b1657 100644 (file)
--- a/MUON/AliMUONSegResV1.h
+++ b/MUON/AliMUONSegResV1.h
@@ -33,11 +33,11 @@ public AliMUONsegmentation {
     // Get member data
     virtual Float_t Dpx(){return fDpx;}
     virtual Float_t Dpy(){return fDpy;}
     // Get member data
     virtual Float_t Dpx(){return fDpx;}
     virtual Float_t Dpy(){return fDpy;}

-    virtual Float_t Dpx(Int_t i){return fDpx;}
-    virtual Float_t Dpy(Int_t i){return fDpy;}
+    virtual Float_t Dpx(Int_t ){return fDpx;}
+    virtual Float_t Dpy(Int_t ){return fDpy;}

     virtual Int_t   Npx(){return fNpx;}
     virtual Int_t   Npy(){return fNpy;}
     virtual Int_t   Npx(){return fNpx;}
     virtual Int_t   Npy(){return fNpy;}

-    virtual Float_t GetRealDpx(Int_t isec) {return fDpx;}
+    virtual Float_t GetRealDpx(Int_t ) {return fDpx;}

     //
     // know the zone of segmentation
     virtual Int_t GetZone(Float_t X, Float_t Y);
     //
     // know the zone of segmentation
     virtual Int_t GetZone(Float_t X, Float_t Y);


@@ -66,16 +66,13 @@ public AliMUONsegmentation {
     virtual void NeighboursNonDiag // without diagonal elements
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t *Xlist, Int_t *Ylist);
     void CleanNeighbours(Int_t* Nlist, Int_t *Xlist, Int_t *Ylist);
     virtual void NeighboursNonDiag // without diagonal elements
        (Int_t iX, Int_t iY, Int_t* Nlist, Int_t *Xlist, Int_t *Ylist);
     void CleanNeighbours(Int_t* Nlist, Int_t *Xlist, Int_t *Ylist);

-    // Provisory RecCluster coordinates reconstructor
-    virtual void FitXY(AliMUONRecCluster* Cluster,TClonesArray* MUONdigits);
-    //

     // Channel number expressed in pad coordinates (stored in Cluster)
     virtual Int_t Ix(Int_t trueX, Int_t trueY);
     virtual Int_t Ix();
     virtual Int_t Iy(){return fiy;}
     // Actual number of pad in the chain
     virtual Int_t ISector();
     // Channel number expressed in pad coordinates (stored in Cluster)
     virtual Int_t Ix(Int_t trueX, Int_t trueY);
     virtual Int_t Ix();
     virtual Int_t Iy(){return fiy;}
     // Actual number of pad in the chain
     virtual Int_t ISector();

-    virtual Int_t Sector(Int_t ix, Int_t iy) {return 1;}
+    virtual Int_t Sector(Int_t , Int_t ) {return 1;}

     // Position of pad in perellel read-out
     virtual Int_t IsParallel2(Int_t iX, Int_t iY);
     virtual Int_t IsParallel3(Int_t iX, Int_t iY);
     // Position of pad in perellel read-out
     virtual Int_t IsParallel2(Int_t iX, Int_t iY);
     virtual Int_t IsParallel3(Int_t iX, Int_t iY);


@@ -96,9 +93,9 @@ public AliMUONsegmentation {
     virtual void IntegrationLimits
        (Float_t& x1, Float_t& x2, Float_t& y1, Float_t& y2);
     //
     virtual void IntegrationLimits
        (Float_t& x1, Float_t& x2, Float_t& y1, Float_t& y2);
     //

-    virtual void Draw(){;}
+    virtual void Draw(Option_t *){;}

     // Function for systematic corrections
     // Function for systematic corrections

-    virtual void SetCorrFunc(Int_t dum, TF1* func) {fCorr=func;}
+    virtual void SetCorrFunc(Int_t , TF1* func) {fCorr=func;}

     virtual TF1* CorrFunc(Int_t) {return fCorr;} 
 
     //
     virtual TF1* CorrFunc(Int_t) {return fCorr;} 
 
     //

diff --git a/MUON/AliMUONchamber.cxx b/MUON/AliMUONchamber.cxx
index b670ee3c86df2fe8e3bdcbb2cf10b4c6ab9f1ab8..76cbdb3bcbc12a31d04921151445d454a5564e61 100644 (file)
--- a/MUON/AliMUONchamber.cxx
+++ b/MUON/AliMUONchamber.cxx
@@ -72,7 +72,7 @@ void AliMUONchamber::DisIntegration(Float_t eloss, Float_t xhit, Float_t yhit,
 
 
 
 
 
 

-    void AliMUONchamber::InitGeo(Float_t zpos)
+    void AliMUONchamber::InitGeo(Float_t)

 {
 //    sensitive gas gap
       fdGas= 0.5;
 {
 //    sensitive gas gap
       fdGas= 0.5;

diff --git a/MUON/AliMUONdisplay.h b/MUON/AliMUONdisplay.h
index 8f4f62e7914fdb56197bf2e4b5213db6e4aff646..94d1dba3662ec4bd679b2ba058360eee3b8461eb 100644 (file)
--- a/MUON/AliMUONdisplay.h
+++ b/MUON/AliMUONdisplay.h
@@ -80,7 +80,6 @@ public:
    
    virtual void      DrawTitle(Option_t *option="");
    virtual void      DrawView(Float_t theta, Float_t phi, Float_t psi=0);
    
    virtual void      DrawTitle(Option_t *option="");
    virtual void      DrawView(Float_t theta, Float_t phi, Float_t psi=0);

-   virtual void      DrawP(Float_t,Float_t,Float_t,Float_t,Float_t,Int_t){}

    virtual void      ExecuteEvent(Int_t event, Int_t px, Int_t py);
    Int_t             GetZoomMode() {return fZoomMode;}
    Int_t             GetChamber() {return fChamber;}
    virtual void      ExecuteEvent(Int_t event, Int_t px, Int_t py);
    Int_t             GetZoomMode() {return fZoomMode;}
    Int_t             GetChamber() {return fChamber;}

diff --git a/MUON/MUONLinkDef.h b/MUON/MUONLinkDef.h
index 18a17cbb06d03a2650d3a3684437cee345629420..59a6bb3a55b228ee7480e0a15a9256dd7388d84e 100644 (file)
--- a/MUON/MUONLinkDef.h
+++ b/MUON/MUONLinkDef.h
@@ -10,7 +10,6 @@
 #pragma link C++ class  AliMUONlist;
 #pragma link C++ class  AliMUONcluster;
 #pragma link C++ class  AliMUONreccluster;
 #pragma link C++ class  AliMUONlist;
 #pragma link C++ class  AliMUONcluster;
 #pragma link C++ class  AliMUONreccluster;

-#pragma link C++ class  AliMUONRecCluster;

 #pragma link C++ class  AliMUONsegmentation;
 #pragma link C++ class  AliMUONresponse;
 #pragma link C++ class  AliMUONsegmentationV0;
 #pragma link C++ class  AliMUONsegmentation;
 #pragma link C++ class  AliMUONresponse;
 #pragma link C++ class  AliMUONsegmentationV0;

diff --git a/MUON/reco_muon.F b/MUON/reco_muon.F
index cd188f0d775c821d6098768de5637269dc632811..e7e0a0950a34317fefdeceded63adac56d5e059c 100644 (file)
--- a/MUON/reco_muon.F
+++ b/MUON/reco_muon.F
@@ -841,7 +841,7 @@
   
       DIMENSION DIST(2),NMUON(2),NHITMUON(2,5),NMUONGOOD(2)
 
   
       DIMENSION DIST(2),NMUON(2),NHITMUON(2,5),NMUONGOOD(2)
 

-      REAL*4 RNDM,RN,RN1,RN2,R1,R2
+*      REAL*4 RNDM,RN,RN1,RN2,R1,R2

 
 * Chambre 10 deg.      
       DATA RMAX1/91.5,91.5,122.5,122.5,158.3,158.3,260.,260.,260.,260./
 
 * Chambre 10 deg.      
       DATA RMAX1/91.5,91.5,122.5,122.5,158.3,158.3,260.,260.,260.,260./


@@ -2372,7 +2372,7 @@
 *
       COMMON/DEBEVT/IDEBUG
 *
 *
       COMMON/DEBEVT/IDEBUG
 *

-      CHARACTER*50 FILEBKG,FILERES,FILEOUT,FILEMIN
+*      CHARACTER*50 FILEBKG,FILERES,FILEOUT,FILEMIN

 *
       IF (IDEBUG.GE.1) THEN
          PRINT *,'    '
 *
       IF (IDEBUG.GE.1) THEN
          PRINT *,'    '


@@ -2823,7 +2823,7 @@
       END
 
 ********************************************************************************
       END
 
 ********************************************************************************

-       SUBROUTINE OLDFOLLOW(ZSTR,PEST,IFLAG,XPL,YPL,PHPL,ALPL)
+       SUBROUTINE FOLLOW(ZSTR,PEST,IFLAG,XPL,YPL,PHPL,ALPL)

 ********************************************************************************
 *   Calculate the particle trajectory in the spectrometer and
 *   (XPL,YPL,PHPL,ALPL)
 ********************************************************************************
 *   Calculate the particle trajectory in the spectrometer and
 *   (XPL,YPL,PHPL,ALPL)


@@ -2949,7 +2949,7 @@
        RETURN
        END
 ********************************************************************************
        RETURN
        END
 ********************************************************************************

-       SUBROUTINE FOLLOW(ZSTR,PEST,IFLAG,XPL,YPL,PHPL,ALPL)
+       SUBROUTINE NEWFOLLOW(ZSTR,PEST,IFLAG,XPL,YPL,PHPL,ALPL)

 ********************************************************************************
 *   Calculate the particle trajectory in the spectrometer 
 *   (XPL,YPL,PHPL,ALPL)
 ********************************************************************************
 *   Calculate the particle trajectory in the spectrometer 
 *   (XPL,YPL,PHPL,ALPL)


@@ -3597,6 +3597,9 @@
 * $Id$
 *
 * $Log$
 * $Id$
 *
 * $Log$

+* Revision 1.1  1999/07/30 10:53:20  fca
+* New version of MUON from M.Bondila & A.Morsch
+*

 * Revision 1.1.1.1  1996/02/15 17:48:35  mclareni
 * Kernlib
 *
 * Revision 1.1.1.1  1996/02/15 17:48:35  mclareni
 * Kernlib
 *