Renaming method Getand Set DetElemId in RawCluster class (Gines)

diff --git a/MUON/AliMUONClusterFinderVS.cxx b/MUON/AliMUONClusterFinderVS.cxx
index 810f05df2af7e185e092616f590e5346e7c36790..47da52fd24790fa0c266dcaacfbfd90995fcf9b4 100644 (file)
--- a/MUON/AliMUONClusterFinderVS.cxx
+++ b/MUON/AliMUONClusterFinderVS.cxx
@@ -183,7 +183,7 @@ void AliMUONClusterFinderVS::SplitByLocalMaxima(AliMUONRawCluster *c)
          c->SetX(0, fSeg2[0]->GetAnod(fInput->DetElemId(), c->GetX(0)));
          c->SetX(1, fSeg2[1]->GetAnod(fInput->DetElemId(), c->GetX(1)));
        }
-       //      c->SetDetElementID(fInput->DetElemId());
+       //      c->SetDetElemId(fInput->DetElemId());
        // If reasonable chi^2 add result to the list of rawclusters
        if (chi2 < 0.3) {
            AddRawCluster(*c);
@@ -988,7 +988,7 @@ void AliMUONClusterFinderVS::SplitByLocalMaxima(AliMUONRawCluster *c)
                    FillCluster(&cnew,cath);
                } 
                cnew.SetClusterType(cnew.PhysicsContribution());
-               //              cnew.SetDetElementID(fInput->DetElemId());
+               //              cnew.SetDetElemId(fInput->DetElemId());
                AddRawCluster(cnew);
                fNPeaks++;
            }
@@ -2343,7 +2343,7 @@ void AliMUONClusterFinderVS::AddRawCluster(AliMUONRawCluster& c)
   
   // Setting detection element in raw cluster for alignment
   // BB 19/05/05
-  c.SetDetElementID(fInput->DetElemId());
+  c.SetDetElemId(fInput->DetElemId());
   
   TClonesArray &lrawcl = *fRawClusters;
   new(lrawcl[fNRawClusters++]) AliMUONRawCluster(c);

diff --git a/MUON/AliMUONRawCluster.cxx b/MUON/AliMUONRawCluster.cxx
index 70e56aa4deecc2a52b8039957568c478242a2bdf..5bb8b5d8f4983c442534c243dd18b10761203022 100644 (file)
--- a/MUON/AliMUONRawCluster.cxx
+++ b/MUON/AliMUONRawCluster.cxx
@@ -50,7 +50,7 @@ AliMUONRawCluster::AliMUONRawCluster()
     }
     fNcluster[0]=fNcluster[1]=-1;
     fGhost=0;
-    fDetElementID = 0;
+    fDetElemId = 0;
 }
 //____________________________________________________
 Int_t AliMUONRawCluster::Compare(const TObject *obj) const

diff --git a/MUON/AliMUONRawCluster.h b/MUON/AliMUONRawCluster.h
index 02ae22d0cc266237d33378d79bda586e8239c44f..36a13803fba06274604bbdc0702e05322d6d2b8d 100644 (file)
--- a/MUON/AliMUONRawCluster.h
+++ b/MUON/AliMUONRawCluster.h
@@ -48,13 +48,13 @@ public:
    Int_t        GetOffset(Int_t i, Int_t j) const;
    Float_t      GetContrib(Int_t i, Int_t j) const;
    Int_t        GetPhysics(Int_t i) const;
-   Int_t        GetDetElementID() const ; // BB added
+   Int_t        GetDetElemId() const ; 
 
    Int_t        SetCharge(Int_t i,Int_t Q);
    Int_t        SetX(Int_t i, Float_t X);
    Int_t        SetY(Int_t i, Float_t Y);
    Int_t        SetZ(Int_t i, Float_t Z);
-   void         SetDetElementID(Int_t ID); // BB Added
+   void         SetDetElemId(Int_t Id); 
    Int_t        SetTrack(Int_t i, Int_t track);
    Int_t        SetPeakSignal(Int_t i, Int_t peaksignal);
    Int_t        SetMultiplicity(Int_t i, Int_t mul);
@@ -88,7 +88,7 @@ private:
                                   // 2 none give satisfactory chi2
    Int_t       fNcluster[2];      // Number of clusters
    Float_t     fChi2[2];          // Chi**2 of fit
-   Int_t       fDetElementID;         // ID number of the detection element (slat) on which the cluster is found. 
+   Int_t       fDetElemId;        // ID number of the detection element (slat) on which the cluster is found. 
    ClassDef(AliMUONRawCluster,1)  //Cluster class for MUON
 };
 
@@ -118,11 +118,11 @@ inline  void  AliMUONRawCluster::SetContrib(Int_t i, Int_t j, Float_t contrib)
 inline  void  AliMUONRawCluster::SetPhysics(Int_t i, Int_t physics)
 { fPhysicsMap[i] = physics; }
 
-inline void AliMUONRawCluster::SetDetElementID(Int_t ID)
-{ fDetElementID = ID; }
+inline void AliMUONRawCluster::SetDetElemId(Int_t Id)
+{ fDetElemId = Id; }
 
-inline Int_t AliMUONRawCluster::GetDetElementID() const
-{ return fDetElementID;}
+inline Int_t AliMUONRawCluster::GetDetElemId() const
+{ return fDetElemId;}
 #endif
 
 

diff --git a/MUON/Config.C b/MUON/Config.C
index 7ce5eb3ed721da5c2f228d8feeeda2cff6fcb433..fb91d0e889375b8bd6db969a7196781909ebc19e 100644 (file)
--- a/MUON/Config.C
+++ b/MUON/Config.C
@@ -6,13 +6,12 @@ void Config(char directory[100]="", char option[6]="param")
 {
   //
   // Config file for MUON test
-  // Gines MARTINEZ, Subatech, mai 2003, august 2003
-  // 
+  //
 
   //=====================================================================
   //  Libraries required by geant321
   gSystem->Load("libgeant321.so");
-  new TGeant3("C++ Interface to Geant3");
+  new TGeant3TGeo("C++ Interface to Geant3");
   //=======================================================================
   //  Create the output file    
   Text_t filename[100];
@@ -153,17 +152,16 @@ void Config(char directory[100]="", char option[6]="param")
   // New MUONv1 version (geometry defined via builders)
   AliMUON *MUON = new AliMUONv1("MUON", "default");
   
+  // If align = true, the detection elements transformations
+  // are taken from the input files and not from the code
   //MUON->SetAlign(true);
-         // If align = true, the detection elements transformations
-        // are taken from the input files and not from the code
-  
-//   ((AliMUONv1*)MUON)->SetStepManagerVersionDE(true);
-        // To save detection element Id in the hits
-  MUON->SetSegmentationType(1);// default wise to old (1), new (2)
-  
-  //MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilder(MUON));
+
+   // To save detection element Id in the hits
+  ((AliMUONv1*)MUON)->SetStepManagerVersionDE(true);
+ 
+  MUON->SetSegmentationType(2);// default wise to old (1), new (2)  
   MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(MUON));
-  MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilder(MUON));
+  MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilderV2(MUON));
   MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
   MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
 }

diff --git a/MUON/MUONCheck.C b/MUON/MUONCheck.C
index 1e880323b1e69fb6d499f1895254d6638fa5b508..dc8cb7d55a93c56af2526b17fcf5db2fd1201a83 100644 (file)
--- a/MUON/MUONCheck.C
+++ b/MUON/MUONCheck.C
@@ -277,11 +277,9 @@ void MUONrecpoints(char * filename="galice.root", Int_t event2Check=0) {
        Float_t z1 = mRecPoint->GetZ(1);
        Float_t chi2_0 =  mRecPoint->GetChi2(0);
        Float_t chi2_1 =  mRecPoint->GetChi2(1);
-       Int_t de = mRecPoint->GetDetElementID();
-       //      printf(">>> RecPoint %4d x %6.3f %6.3f y %6.3f %6.3f z %6.3f %6.3f Q0 %4d  Q1 %4d Hit %4d Track1 %4d Track2 %4d Chi2 %6.3f %6.3f \n",
-       //irecpoint, x0, x1, y0, y1, z0, z1, Q0, Q1, Track0, Track1, Track2, chi2_0, chi2_1);
-       cout << mRecPoint->GetDetElemId() << endl;
-       printf(">>> RecPoint %4d x %6.3f y %6.3f z %6.3f DetElem %2d \n",irecpoint,x0,y0,z0,de);
+       Int_t de = mRecPoint->GetDetElemId();
+       printf(">>> RecPoint %4d  DetElem %2d x %6.3f %6.3f y %6.3f %6.3f z %6.3f %6.3f Q0 %4d  Q1 %4d Hit %4d Track1 %4d Track2 %4d Chi2 %6.3f %6.3f \n",
+              irecpoint,de,x0,x1,y0,y1,z0,z1,Q0,Q1,Track0, Track1, Track2, chi2_0, chi2_1);
       } // end recpoint loop
     } // end chamber loop
     muondata.ResetRawClusters();

diff --git a/MUON/README b/MUON/README
index 688d8f30ec9cb3a0c8eb9971c779e8204b663c62..885c8c0e4d1151857184e077f132d9fcd47c4c2e 100644 (file)
--- a/MUON/README
+++ b/MUON/README
@@ -49,7 +49,6 @@ If you want to change the option or to define a new directory
 for hits, you have to do the following before:
 root [0] gAlice->SetConfigFunction("Config( \"/home/martinez/aliroot/work_NewIO/test/\" , \"box\" );"); 
 
-
 ============================================================
  How to run MUONCheck macro
 ============================================================
@@ -82,12 +81,20 @@ MUONTestTrigger() or MUONTestTrigger("galice.root",##) for the event number ##
 
 
 ============================================================
- How to check the Geometry
+ How to check the Geometry 
 ============================================================
 gAlice->Init("$ALICE_ROOT/MUON/Config.C");
 .L $ALICE/geant3/TGeant3/G3GUI.C
 G3GUI()
 
+============================================================
+ How to check the Geometry with the new Geometrical modeler
+ ftp://root.cern.ch/root/doc/chapter16.pdf
+ http://agenda.cern.ch/fullAgenda.php?ida=a05212
+============================================================
+gAlice->Init("$ALICE_ROOT/MUON/Config.C");
+gGeoManager->GetMasterVolume()->Draw();
+
 
 ============================================================
  How to run MUONdisplay
@@ -164,34 +171,8 @@ gener->Init();
 ===========================================================
  csh Script for the full reconstruction with raw data generator
 ===========================================================
-
-
-aliroot -b << EOF  
-AliSimulation MuonSim("YourConfig.C")
-MuonSim.SetWriteRawData("MUON");
-MuonSim.Run(XXX)
-.q
-EOF
-
-aliroot -b << EOF 
-TPluginManager* pluginManager = gROOT->GetPluginManager();
-pluginManager->AddHandler("AliReconstructor", "MUON","AliMUONReconstructor", "MUON","AliMUONReconstructor()")
-AliReconstruction MuonRec("galice.root") 
-MuonRec.SetRunTracking("")
-MuonRec.SetRunVertexFinder(kFALSE)
-MuonRec.SetRunLocalReconstruction("MUON")
-MuonRec.SetFillESD("MUON")
-MuonRec.Run() 
-.q
-EOF
-
-aliroot -b << EOF  
-.includepath $ALICE_ROOT/STEER
-.includepath $ALICE_ROOT/MUON
-.L $ALICE_ROOT/MUON/MUONmassPlot_ESD.C++
-MUONmassPlot("galice.root",0,99999);
-.q
-EOF
+See file AlirootRun_MUONtest.script
+in $ALICE_ROOT/MUON
 
 
 ============================================================