Removed unnecessary calls to SetEquipmentId (F. Prino)

diff --git a/ITS/AliITSQASDDDataMakerRec.cxx b/ITS/AliITSQASDDDataMakerRec.cxx
index 4b3a29df66ed26303b2b684610f70c058fb3d343..24f1fef16ddf7db7f480dd9244eb181ec1665f5e 100644 (file)
--- a/ITS/AliITSQASDDDataMakerRec.cxx
+++ b/ITS/AliITSQASDDDataMakerRec.cxx
@@ -305,7 +305,6 @@ void AliITSQASDDDataMakerRec::MakeRaws(AliRawReader* rawReader)
   }
   if(rawReader->GetType() != 7) return;  // skips non physical triggers
   AliDebug(1,"entering MakeRaws\n");                 
-  rawReader->SelectEquipment(17,fgkeqOffset,fgkeqOffset + fgkDDLidRange); 
 
   rawReader->Reset();       
   AliITSRawStream *stream;

diff --git a/ITS/AliITSQASDDDataMakerRec.h b/ITS/AliITSQASDDDataMakerRec.h
index 83c0e9ee8e81e14f487183f708b6dee8052b3e53..3bdd9e379c17a037e97ed3d9478af9abec0edc7c 100644 (file)
--- a/ITS/AliITSQASDDDataMakerRec.h
+++ b/ITS/AliITSQASDDDataMakerRec.h
@@ -48,8 +48,6 @@ private:
   static const Int_t fgkmodoffset = 240;   // number of SPD modules
   static const Int_t fgknAnode = 256;      // anode per half-module
   static const Int_t fgknSide =2;          // side per module
-  static const Int_t fgkeqOffset = 256;    // DDL offset
-  static const Int_t fgkDDLidRange = 24;   // number of DDL:so DDL range is 257-280
   static const Int_t fgkDDLIDshift = 0;    // necessary option until RawStream Table is complete
   static const Int_t fgkLADDonLAY3 = 14;   // number of ladder on layer 3
   static const Int_t fgkLADDonLAY4 = 22;   // number of ladder on layer 4
@@ -64,7 +62,7 @@ private:
   Bool_t fHLTMode;                            // kTRUE mode C kFALSE mode A 
                                               // Used in online mode only
   AliITSHLTforSDD *fHLTSDD;                   // used for offline QA as the HLT mode flag
-  ClassDef(AliITSQASDDDataMakerRec,5)         // description 
+  ClassDef(AliITSQASDDDataMakerRec,6)         // description 
 
 };
 

diff --git a/ITS/AnalyzeSDDGainAllMod.C b/ITS/AnalyzeSDDGainAllMod.C
index 5d3ab2e45be7f013479a5e7c13b8c5c56f706876..aac4f9ddaf7b261e06e952268f3ffe36e0810b61 100644 (file)
--- a/ITS/AnalyzeSDDGainAllMod.C
+++ b/ITS/AnalyzeSDDGainAllMod.C
@@ -25,10 +25,6 @@
 
 void AnalyzeSDDGainAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t lastEv=16, Float_t pascalDAC=100){
 
-  Int_t eqOffset = 256;
-  Int_t DDLid_range = 24;
-  //  Int_t eqOffset = 100;
-  //  Int_t DDLid_range = 1;
   const Int_t kTotDDL=24;
   const Int_t kModPerDDL=12;
   const Int_t kSides=2;
@@ -71,8 +67,6 @@ void AnalyzeSDDGainAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t l
     c0->Clear();
     c0->Divide(4,6,0.001,0.001);
     printf("Event # %d\n",iev);
-    //rd->SelectEvents(7);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     rd->Reset();
     for(Int_t iddl=0; iddl<kTotDDL;iddl++){
       for(Int_t imod=0; imod<kModPerDDL;imod++){
@@ -83,7 +77,6 @@ void AnalyzeSDDGainAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t l
       }
     }
     AliITSRawStreamSDD s(rd);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     while(s.Next()){
       Int_t iDDL=rd->GetDDLID();
       Int_t iCarlos=s.GetCarlosId();

diff --git a/ITS/AnalyzeSDDInjectorsAllMod.C b/ITS/AnalyzeSDDInjectorsAllMod.C
index de468876b168531f6ea5c7a340f6f08d4c6eb12c..6101c4fdd59453ea74b65c2e3105e724602d83a8 100644 (file)
--- a/ITS/AnalyzeSDDInjectorsAllMod.C
+++ b/ITS/AnalyzeSDDInjectorsAllMod.C
@@ -26,10 +26,7 @@
 
 
 void AnalyzeSDDInjectorsAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t lastEv=15){
-  Int_t eqOffset = 256;
-  Int_t DDLid_range = 24;
-  //  Int_t eqOffset = 100;
-  //  Int_t DDLid_range = 1;
+
   const Int_t kTotDDL=24;
   const Int_t kModPerDDL=12;
   const Int_t kSides=2;
@@ -50,6 +47,12 @@ void AnalyzeSDDInjectorsAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, In
        sprintf(hisnam,"h%02dc%02ds%d",iddl,imod,isid);
        histo[index]=new TH2F(hisnam,"",256,-0.5,255.5,256,-0.5,255.5);
        anal[index]=new AliITSOnlineSDDInjectors(iddl,imod,isid);
+/* Uncomment these lines for analysis of runs with 40 MHz sapling */
+//     anal[index]->SetInjLineRange(0,20,50);
+//     anal[index]->SetInjLineRange(1,90,160);
+//     anal[index]->SetInjLineRange(2,170,240);
+//     anal[index]->SetTimeStep(25.);
+/* END of lines to be uncommented */
        nWrittenEv[index]=0;
       }
     }
@@ -84,8 +87,6 @@ void AnalyzeSDDInjectorsAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, In
     c1->Divide(4,6,0.001,0.001);
     printf("Event # %d\n",iev);
     UInt_t timeSt=rd->GetTimestamp();
-    //rd->SelectEvents(7);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     rd->Reset();
     for(Int_t iddl=0; iddl<kTotDDL;iddl++){
       for(Int_t imod=0; imod<kModPerDDL;imod++){
@@ -97,7 +98,6 @@ void AnalyzeSDDInjectorsAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, In
     }
 
     AliITSRawStreamSDD s(rd);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     while(s.Next()){
       Int_t iDDL=rd->GetDDLID();
       Int_t iCarlos=s.GetCarlosId();

diff --git a/ITS/AnalyzeSDDNoiseAllMod.C b/ITS/AnalyzeSDDNoiseAllMod.C
index 3d7ba89294ae8a87c6dbcfa885f7e2e1eff70ad1..78d64d35129b7ec8956a87c55f7105e9e8f54aba 100644 (file)
--- a/ITS/AnalyzeSDDNoiseAllMod.C
+++ b/ITS/AnalyzeSDDNoiseAllMod.C
@@ -24,10 +24,7 @@
 // Origin: F. Prino (prino@to.infn.it)
 
 void AnalyzeSDDNoiseAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t lastEv=12){
-  Int_t eqOffset = 256;
-  Int_t DDLid_range = 24;
-  //  Int_t eqOffset = 100;
-  //  Int_t DDLid_range = 1;
+
   const Int_t kTotDDL=24;
   const Int_t kModPerDDL=12;
   const Int_t kSides=2;
@@ -68,8 +65,6 @@ void AnalyzeSDDNoiseAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t
     c0->Clear();
     c0->Divide(4,6,0.001,0.001);
     printf("Event # %d ",iev);
-    //rd->SelectEvents(7);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     rd->Reset();
     for(Int_t iddl=0; iddl<kTotDDL;iddl++){
       for(Int_t imod=0; imod<kModPerDDL;imod++){
@@ -80,7 +75,6 @@ void AnalyzeSDDNoiseAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t
       }
     }
     AliITSRawStreamSDD s(rd);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     while(s.Next()){
       Int_t iDDL=rd->GetDDLID();
       Int_t iCarlos=s.GetCarlosId();
@@ -147,8 +141,6 @@ void AnalyzeSDDNoiseAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t
     c0->Clear();
     c0->Divide(4,6,0.001,0.001);
     printf("Event # %d ",iev);
-    rd2->SelectEquipment(17,eqOffset,eqOffset+DDLid_range);
-    //    rd2->SelectEvents(7); 
     rd2->Reset();
     for(Int_t iddl=0; iddl<kTotDDL;iddl++){
       for(Int_t imod=0; imod<kModPerDDL;imod++){
@@ -160,7 +152,6 @@ void AnalyzeSDDNoiseAllMod(Char_t *datafil, Int_t nDDL, Int_t firstEv=10, Int_t
     }
     
     AliITSRawStreamSDD s(rd2);
-    rd2->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     while(s.Next()){
       Int_t iDDL=rd2->GetDDLID();
       Int_t iCarlos=s.GetCarlosId();

diff --git a/ITS/DisplaySDDRawData.C b/ITS/DisplaySDDRawData.C
index 5a184e4ed0effc25dbe2a20cebc6b8139cdbd43d..6022982c28ad090eaa1e1ef003a5e5a979605fd9 100644 (file)
--- a/ITS/DisplaySDDRawData.C
+++ b/ITS/DisplaySDDRawData.C
@@ -15,8 +15,6 @@
 
 void DisplaySDDRawData(Char_t *datafil, Int_t firstEv=0, Int_t lastEv=5){
 
-  Int_t eqOffset = 256;
-  Int_t DDLid_range= 24;
 
   AliITSDDLModuleMapSDD* ddlmap=new AliITSDDLModuleMapSDD();
   ddlmap->SetJun08Map();
@@ -70,12 +68,10 @@ void DisplaySDDRawData(Char_t *datafil, Int_t firstEv=0, Int_t lastEv=5){
 
     evtime->Start();
     printf("Event # %d\n",iev);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     rd->Reset();
     hzphi3->Reset();
     hzphi4->Reset();
     AliITSRawStreamSDD s(rd);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     Int_t iCountNext=0;    
     while(s.Next()){
       iCountNext++;

diff --git a/ITS/ITSSDDBASda.cxx b/ITS/ITSSDDBASda.cxx
index 67016265d58c01eb1516efb5bc9ddce3611ec563..0bf6deea1842eda850b18d12669ccd55dba518bb 100644 (file)
--- a/ITS/ITSSDDBASda.cxx
+++ b/ITS/ITSSDDBASda.cxx
@@ -75,8 +75,6 @@ int main(int argc, char **argv) {
   }
 
 
-  Int_t eqOffset = 256;
-  Int_t DDLrange = 24;
   Int_t maxNEvents=18; // maximum number of events to be analyzed
   const Int_t kTotDDL=24;
   const Int_t kModPerDDL=12;
@@ -171,7 +169,6 @@ int main(int argc, char **argv) {
        case PHYSICS_EVENT: // uncomment this line for test raw data
          printf(" event number = %i \n",iev);
          AliRawReader *rawReader = new AliRawReaderDate((void*)event);
-         rawReader->SelectEquipment(17,eqOffset+1,eqOffset+DDLrange);
 
 
          Int_t evtyp=0;

diff --git a/ITS/ITSSDDGAINda.cxx b/ITS/ITSSDDGAINda.cxx
index 132cfc90e954f2c6d861c741c2952ea675664fb9..694c5fc1fc873d04500defcd3b8b51b43941329a 100644 (file)
--- a/ITS/ITSSDDGAINda.cxx
+++ b/ITS/ITSSDDGAINda.cxx
@@ -74,8 +74,6 @@ int main(int argc, char **argv) {
   }
 
 
-  Int_t eqOffset = 256;
-  Int_t DDLrange = 24;
   Int_t maxNEvents=15; // maximum number of events to be analyzed
   const Int_t kTotDDL=24;
   const Int_t kModPerDDL=12;
@@ -156,7 +154,6 @@ int main(int argc, char **argv) {
       case PHYSICS_EVENT: // uncomment this line for test raw data
        printf(" event number = %i \n",iev);
        AliRawReader *rawReader = new AliRawReaderDate((void*)event);
-       rawReader->SelectEquipment(17,eqOffset+1,eqOffset+DDLrange);
 
        Int_t evtyp=0;
        while(rawReader->ReadHeader()){

diff --git a/ITS/ITSSDDINJda.cxx b/ITS/ITSSDDINJda.cxx
index b5359536f83b7392861c27a50315aaabb6d89890..915a4da096b5e89243d918a7f4c60cf7091543ed 100644 (file)
--- a/ITS/ITSSDDINJda.cxx
+++ b/ITS/ITSSDDINJda.cxx
@@ -74,8 +74,6 @@ int main(int argc, char **argv) {
   }
 
 
-  Int_t eqOffset = 256;
-  Int_t DDLrange = 24;
   Int_t maxNEvents=10; // maximum number of events to be analyzed
   const Int_t kTotDDL=24;
   const Int_t kModPerDDL=12;
@@ -158,7 +156,6 @@ int main(int argc, char **argv) {
       case PHYSICS_EVENT: // uncomment this line for test raw data
        printf(" event number = %i \n",iev);
        AliRawReader *rawReader = new AliRawReaderDate((void*)event);
-       rawReader->SelectEquipment(17,eqOffset+1,eqOffset+DDLrange);
 
        UInt_t timeSt=rawReader->GetTimestamp();
        //UInt_t timeSt=iev*5000+12;  // fake timestamp for test

diff --git a/ITS/ITSSDDQA.C b/ITS/ITSSDDQA.C
index 10e0c6afc2edd968eaa37063d4dc69943ea4866b..1a068fa4296d54670152e573b2ddbd9d92e6ef47 100644 (file)
--- a/ITS/ITSSDDQA.C
+++ b/ITS/ITSSDDQA.C
@@ -70,15 +70,12 @@ delete [] cindex;
     delete initgeom;
   */
 
-  Int_t eqOffset = 256;
-  Int_t DDLid_range = 24;
   do{       // start loop on events
     if(++evCounter > MaxEvts) { cout << MaxEvts << " events read, stop" << endl; evCounter--; break; }  
      cout << "Read Event: " << evCounter+FirstEvt-1 << endl;
 
     rd->RequireHeader(kFALSE);             
 
-    rd->SelectEquipment(17,eqOffset+1,eqOffset+DDLid_range);
 
     rd->Reset();    // reset the current position to the beginning of the event
     AliITSRawStreamSDD s(rd);    //This class provides access to ITS SDD digits in raw data.

diff --git a/ITS/ITSSDDQAMaker.C b/ITS/ITSSDDQAMaker.C
index b673f0727a4bf91c65d27a033f285b4a22e6cfff..daad3fd802ff035dd4ba7abb689584061c23b4a3 100644 (file)
--- a/ITS/ITSSDDQAMaker.C
+++ b/ITS/ITSSDDQAMaker.C
@@ -54,14 +54,11 @@ Char_t *hisnam3 = new Char_t[50];
   strFile += "?EventType=7";
   AliRawReader *rd = new AliRawReaderDate(strFile.Data(),FirstEvt);  // open run
   Int_t evCounter = 0;
-  Int_t eqOffset = 256;
-  Int_t DDLid_range = 24;
   do{                       // start loop on events
     if(++evCounter > MaxEvts) { cout << MaxEvts << " events read, stop" << endl; evCounter--; break; }  
     cout << "Read Event: " << evCounter+FirstEvt-1 << endl;
 
     rd->RequireHeader(kFALSE);             
-    rd->SelectEquipment(17,eqOffset+1,eqOffset+DDLid_range);  //17 states for "DRorc acquisition"
     rd->Reset();                           // reset the current position to the beginning of the event
  
     Int_t nSkip = 0;                     // number of skipped signals

diff --git a/ITS/PlotSDDRawData.C b/ITS/PlotSDDRawData.C
index 552469e83140f6652e77608cce5aca4e16cb27a6..049fa63e6a75d4f7968fc74a6d272bb0bf16deaa 100644 (file)
--- a/ITS/PlotSDDRawData.C
+++ b/ITS/PlotSDDRawData.C
@@ -13,8 +13,6 @@
 
 void PlotSDDRawData(Char_t datafil[100], Int_t nDDL, Int_t firstEv=0, Int_t lastEv=5){
 
-  Int_t eqOffset = 256;
-  Int_t DDLid_range= 24;
   const Int_t nHybrids=24;
 
   TH2F** histo = new TH2F*[nHybrids];
@@ -42,11 +40,9 @@ void PlotSDDRawData(Char_t datafil[100], Int_t nDDL, Int_t firstEv=0, Int_t last
 
     evtime->Start();
     printf("Event # %d\n",iev);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     rd->Reset();
     for(Int_t i=0;i<nHybrids;i++) histo[i]->Reset();
     AliITSRawStreamSDD s(rd);
-    rd->SelectEquipment(17,eqOffset,eqOffset+DDLid_range); 
     Int_t iCountNext=0;    
     while(s.Next()){
       iCountNext++;