Minor changes

diff --git a/ZDC/AliZDCDataDCS.cxx b/ZDC/AliZDCDataDCS.cxx
index ac309a3c6f4cfccd44ae5d3bf6c0185d0eb295bb..4a22274b1e50d8b9f716d617ecda248d36e6ff35 100644 (file)
--- a/ZDC/AliZDCDataDCS.cxx
+++ b/ZDC/AliZDCDataDCS.cxx
@@ -43,7 +43,7 @@ AliZDCDataDCS::AliZDCDataDCS(Int_t nRun, UInt_t startTime, UInt_t endTime):
 {
    // Standard constructor
    
-   AliInfo(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
+   AliDebug(2,Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", nRun,
    TTimeStamp(startTime).AsString(),
    TTimeStamp(endTime).AsString()));
 
@@ -68,13 +68,13 @@ void AliZDCDataDCS::ProcessData(TMap& aliasMap)
    for(int j=0; j<kNAliases; j++){
       aliasArr = (TObjArray*) aliasMap.GetValue(fAliasNames[j].Data());
       if(!aliasArr){
-       AliError(Form("Alias %s not found!", fAliasNames[j].Data()));
+       AliWarning(Form("Alias %s not found!", fAliasNames[j].Data()));
        continue;
       }
       Introduce(j, aliasArr);
 
       if(aliasArr->GetEntries()<=2){
-       AliError(Form("Alias %s has just %d entries!",
+       AliWarning(Form("Alias %s has just %d entries!",
                        fAliasNames[j].Data(),aliasArr->GetEntries()));
        continue;
       }
@@ -155,8 +155,8 @@ void AliZDCDataDCS::Introduce(UInt_t numAlias, const TObjArray* aliasArr)
    // Getting array of DCS aliases
    
    int entries = aliasArr->GetEntries();
-   AliInfo(Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
-   AliInfo(Form("         %d DP values collected",entries));
+   AliDebug(2,Form("************ Alias: %s **********",fAliasNames[numAlias].Data()));
+   AliDebug(2,Form("      %d DP values collected",entries));
 
 }
 
@@ -171,7 +171,7 @@ void AliZDCDataDCS::CreateGraph(int i, int dim, const Double_t *x, const Double_
 
    gr->GetXaxis()->SetTimeDisplay(1);
    gr->SetTitle(fAliasNames[i].Data());
-//   AliInfo(Form("Array entries: %d",fGraphs.GetEntriesFast()));
+//   AliDebug(2,Form("Array entries: %d",fGraphs.GetEntriesFast()));
 
 
 }

diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index 1930b49ef891e63a3b4d50a753ba5a6fcde4c01f..e132a69ea40527188243330133f9114dbdbbd311 100644 (file)
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -420,7 +420,7 @@ void AliZDCDigitizer::SpectatorSignal(Int_t SpecType, Int_t numEvents,
   Int_t pl, i, k, iev=0, rnd[125], volume[2];
   for(pl=0;pl<125;pl++) rnd[pl] = 0;
   if(numEvents > 125) {
-    AliWarning(Form("numEvents (%d) is larger than 125", numEvents));
+    AliDebug(2,Form("numEvents (%d) is larger than 125", numEvents));
     numEvents = 125;
   }
   for(pl=0;pl<numEvents;pl++){

diff --git a/ZDC/AliZDCRawStream.cxx b/ZDC/AliZDCRawStream.cxx
index 58a54b0aa3f52f15a3ab04adb2d6a051a3dce37e..9bd0140383154f0f6f05e42c6e54f73229d2fbe5 100644 (file)
--- a/ZDC/AliZDCRawStream.cxx
+++ b/ZDC/AliZDCRawStream.cxx
@@ -395,7 +395,7 @@ Bool_t AliZDCRawStream::Next()
            // Protection manually set since it returns:
            // RawData48 mod. 3 ch. 2048 signal 515
            // to be checked with Pietro!!!!!!!!!!!!!!!!!!!!!!!
-           //AliWarning(" No. of cabled channels > fNChannelsOn!!!");
+           //AliDebug(2," No. of cabled channels > fNChannelsOn!!!");
             fPosition++;
            return kTRUE;
          }
@@ -527,12 +527,12 @@ Bool_t AliZDCRawStream::Next()
        
        // Final checks
        if(fSector[0]<1 || fSector[0]>5){
-          AliError(Form(" No valid detector assignment: %d",fSector[0]));
+          AliWarning(Form(" No valid detector assignment: %d",fSector[0]));
           fRawReader->AddMajorErrorLog(kInvalidSector);
        }
        //
        if(fSector[1]<0 || fSector[1]>5){
-          AliError(Form(" No valid sector assignment: %d",fSector[1]));
+          AliWarning(Form(" No valid sector assignment: %d",fSector[1]));
           fRawReader->AddMajorErrorLog(kInvalidSector);
        }
        //

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 59af75fe3627f2839cee81230f42fe8c2348f635..be127b9250189eccd33d3abc2b3f6f58f25975c3 100644 (file)
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -105,7 +105,7 @@ void AliZDCReconstructor::Init()
   
     TString runType = grpData->GetRunType();
     if(runType==AliGRPObject::GetInvalidString()){
-      AliError("GRP/GRP/Data entry:  missing value for the run type ! Using UNKNOWN");
+      AliWarning("GRP/GRP/Data entry:  missing value for the run type ! Using UNKNOWN");
       runType = "UNKNOWN";
     }
     if((runType.CompareTo("CALIBRATION_MB")) == 0){
@@ -128,7 +128,7 @@ void AliZDCReconstructor::Init()
     
     TString beamType = grpData->GetBeamType();
     if(beamType==AliGRPObject::GetInvalidString()){
-      AliError("GRP/GRP/Data entry:  missing value for the beam energy !");
+      AliWarning("GRP/GRP/Data entry:  missing value for the beam energy !");
       AliError("\t ZDC does not reconstruct event 4 UNKNOWN beam type\n");
       return;
     }
@@ -144,7 +144,7 @@ void AliZDCReconstructor::Init()
     
     fBeamEnergy = grpData->GetBeamEnergy();
     if(fBeamEnergy==AliGRPObject::GetInvalidFloat()){
-      AliError("GRP/GRP/Data entry:  missing value for the beam energy ! Using 0.");
+      AliWarning("GRP/GRP/Data entry:  missing value for the beam energy ! Using 0.");
       fBeamEnergy = 0.;
     }
     

diff --git a/ZDC/AliZDCv3.cxx b/ZDC/AliZDCv3.cxx
index ae43b808d2c933d05de40ca132985803a1060eeb..a986bd2b2402a90fd70478405865301845a66fc6 100644 (file)
--- a/ZDC/AliZDCv3.cxx
+++ b/ZDC/AliZDCv3.cxx
@@ -72,14 +72,11 @@ AliZDCv3::AliZDCv3() :
   fpLostD1C(0), 
   fpDetectedC(0),
   fnDetectedC(0),
-  fnLumiC(0),
   fpLostITA(0), 
   fpLostD1A(0), 
   fpLostTDI(0), 
   fpDetectedA(0),
-  fnDetectedA(0),
-  fnLumiA(0),
-  fnTrou(0)
+  fnDetectedA(0)
 {
   //
   // Default constructor for Zero Degree Calorimeter
@@ -107,14 +104,11 @@ AliZDCv3::AliZDCv3(const char *name, const char *title) :
   fpLostD1C(0), 
   fpDetectedC(0),
   fnDetectedC(0),
-  fnLumiC(0),
   fpLostITA(0), 
   fpLostD1A(0), 
   fpLostTDI(0), 
   fpDetectedA(0),
-  fnDetectedA(0),  
-  fnLumiA(0),
-  fnTrou(0)
+  fnDetectedA(0)  
 {
   //
   // Standard constructor for Zero Degree Calorimeter 
@@ -630,7 +624,7 @@ void AliZDCv3::CreateBeamLine()
   boxpar[0] = 8.0/2.;
   boxpar[1] = 8.0/2.;
   boxpar[2] = 15./2.;
-  gMC->Gsvolu("QLUC", "BOX ", idtmed[6], boxpar, 3);
+  gMC->Gsvolu("QLUC", "BOX ", idtmed[9], boxpar, 3);
   gMC->Gspos("QLUC", 1, "ZDCC", 0., 0.,  fPosZNC[2]+66.+boxpar[2], 0, "ONLY");
   //printf("   QLUC LUMINOMETER from z = %1.2f to z= %1.2f\n",  fPosZNC[2]+66., fPosZNC[2]+66.+2*boxpar[2]);
                 
@@ -1346,7 +1340,7 @@ void AliZDCv3::CreateBeamLine()
   boxpar[0] = 8.0/2.;
   boxpar[1] = 8.0/2.;
   boxpar[2] = 15./2.;
-  gMC->Gsvolu("QLUA", "BOX ", idtmed[6], boxpar, 3);
+  gMC->Gsvolu("QLUA", "BOX ", idtmed[9], boxpar, 3);
   gMC->Gspos("QLUA", 1, "ZDCA", 0., 0.,  fPosZNA[2]-66.-boxpar[2], 0, "ONLY");
   //printf("   QLUA LUMINOMETER from z = %1.2f to z= %1.2f\n\n",  fPosZNA[2]-66., fPosZNA[2]-66.-2*boxpar[2]);
 
@@ -1991,6 +1985,10 @@ void AliZDCv3::CreateMaterials()
   // --- Copper (energy loss taken into account)
   ubuf[0] = 1.10;
   AliMaterial(6, "COPP0", 63.54, 29., 8.96, 1.4, 0., ubuf, 1);
+
+  // --- Copper 
+  ubuf[0] = 1.10;
+  AliMaterial(9, "COPP1", 63.54, 29., 8.96, 1.4, 0., ubuf, 1);
   
   // --- Iron (energy loss taken into account)
   ubuf[0] = 1.1;
@@ -2027,8 +2025,8 @@ void AliZDCv3::CreateMaterials()
   // --- Fibers (SiO2) = 3 ; 
   // --- Fibers (SiO2) = 4 ; 
   // --- Lead = 5 ; 
-  // --- Copper (with energy loss)= 6 ;
-  // --- Copper (with energy loss)= 13 ; 
+  // --- Copper (with high thr.)= 6 ;
+  // --- Copper (with low thr.)=  9;
   // --- Iron (with energy loss) = 7 ; 
   // --- Iron (without energy loss) = 8 ; 
   // --- Vacuum (no field) = 10 
@@ -2059,10 +2057,10 @@ void AliZDCv3::CreateMaterials()
   AliMedium(6, "ZCOPP", 6, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
   AliMedium(7, "ZIRON", 7, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
   AliMedium(8, "ZIRONN",8, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(9, "ZCOPL", 6, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
   AliMedium(10,"ZVOID",10, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(12,"ZAIR", 12, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
-  //
   AliMedium(11,"ZVOIM",11, isvol, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin);
+  AliMedium(12,"ZAIR", 12, isvolActive, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
 
 
 } 
@@ -2107,7 +2105,7 @@ void AliZDCv3::Init()
   Int_t *idtmed = fIdtmed->GetArray();  
   Int_t i;
   // Thresholds for showering in the ZDCs 
-  i = 1; //tantalum
+  i = 1; //Wa lloy
   gMC->Gstpar(idtmed[i], "CUTGAM", .001);
   gMC->Gstpar(idtmed[i], "CUTELE", .001);
   gMC->Gstpar(idtmed[i], "CUTNEU", .01);
@@ -2138,7 +2136,7 @@ void AliZDCv3::Init()
   gMC->Gstpar(idtmed[i], "CUTHAD", 1.);
   
   // Avoid too detailed showering along the beam line 
-  i = 8; //iron with energy loss (ZIRONN)
+  i = 8; //iron without energy loss (ZIRONN)
   gMC->Gstpar(idtmed[i], "CUTGAM", .1);
   gMC->Gstpar(idtmed[i], "CUTELE", .1);
   gMC->Gstpar(idtmed[i], "CUTNEU", 1.);
@@ -2290,9 +2288,6 @@ void AliZDCv3::StepManager()
   Int_t   j, vol[2]={0,0}, ibeta=0, ialfa=0, ibe=0, nphe=0;
   Float_t hits[12], x[3], xdet[3], um[3], ud[3];
   Float_t m=0., ekin=0., destep=0., be=0., out=0.;
-  // Parametrization for light guide uniformity
-  // NEW!!! Light guide tilted @ 51 degrees
-  Float_t guiPar[4]={0.31,-0.0006305,0.01337,0.8895};
   Double_t s[3], p[3];
   const char *knamed;
   //
@@ -2317,7 +2312,6 @@ void AliZDCv3::StepManager()
          else fpLostD1A += 1;
          ipr=1;
        }
-       else if(!strncmp(knamed,"QAL",3)) fnTrou++;
       }
       else if(gMC->CurrentMedium() == fMedSensTDI){ 
         knamed = gMC->CurrentVolName();
@@ -2327,11 +2321,6 @@ void AliZDCv3::StepManager()
          ipr=1;
         }
        else if(!strncmp(knamed,"QTD",3)) fpLostTDI += 1;
-       else if(!strncmp(knamed,"QLU",3)){
-         if(s[2]<0) fnLumiC ++;
-         else fnLumiA++;
-         ipr=1;
-       }
       }
       //
       //gMC->TrackMomentum(p[0], p[1], p[2], p[3]);
@@ -2343,13 +2332,10 @@ void AliZDCv3::StepManager()
         printf("\t ********** Side C **********\n");
         printf("\t # of spectators in IT = %d\n",fpLostITC);
         printf("\t # of spectators in D1 = %d\n",fpLostD1C);
-        printf("\t # of spectators in luminometer = %d\n",fnLumiC);
         printf("\t ********** Side A **********\n");
         printf("\t # of spectators in IT = %d\n",fpLostITA);
         printf("\t # of spectators in D1 = %d\n",fpLostD1A);
         printf("\t # of spectators in TDI = %d\n",fpLostTDI);
-        printf("\t # of spectators in luminometer = %d\n",fnLumiA);
-        printf("\t # of spectators in trousers = %d\n",fnTrou);
         printf("\t **********************************\n");
       }
       gMC->StopTrack();
@@ -2461,7 +2447,7 @@ void AliZDCv3::StepManager()
       }
     }    
     if((vol[1]!=1) && (vol[1]!=2) && (vol[1]!=3) && (vol[1]!=4))
-      AliError(Form("AliZDCv3 -> WRONG tower for det %d: tow %d with xdet=(%f, %f)\n",
+      AliError(Form(" WRONG tower for det %d: tow %d with xdet=(%f, %f)\n",
                vol[0], vol[1], xdet[0], xdet[1]));
     // Ch. debug
     //printf("\t *** det %d vol %d xdet(%f, %f)\n",vol[0], vol[1], xdet[0], xdet[1]);
@@ -2533,13 +2519,13 @@ void AliZDCv3::StepManager()
           hits[7] = 0.;
           hits[8] = 0.;
           AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
-          }
+        }
         else{
           hits[9] = destep;
           hits[7] = 0.;
           hits[8] = 0.;
           AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
-          }
+        }
       }
   }
  
@@ -2646,6 +2632,10 @@ void AliZDCv3::StepManager()
         Float_t z = -xalic[2]+fPosZEM[2]+2*fZEMLength-xalic[1];
         //z = xalic[2]-fPosZEM[2]-fZEMLength-xalic[1]*(TMath::Tan(45.*kDegrad));
          //printf("    fPosZEM[2]+2*fZEMLength = %f", fPosZEM[2]+2*fZEMLength);
+         //
+        // Parametrization for light guide uniformity
+         // NEW!!! Light guide tilted @ 51 degrees
+         Float_t guiPar[4]={0.31,-0.0006305,0.01337,0.8895};
         Float_t guiEff = guiPar[0]*(guiPar[1]*z*z+guiPar[2]*z+guiPar[3]);
         out = out*guiEff;
         nphe = gRandom->Poisson(out);

diff --git a/ZDC/AliZDCv3.h b/ZDC/AliZDCv3.h
index a5b61d63a7c3df6823b84c63e3482dbffd11008a..34c40227c8a46b2092ca01dcf746951bfb179505 100644 (file)
--- a/ZDC/AliZDCv3.h
+++ b/ZDC/AliZDCv3.h
@@ -67,11 +67,11 @@ protected:
   Float_t fZEMLength; // ZEM length
   
   // Parameters for proton accepancy studies
-  Int_t fpLostITC, fpLostD1C, fpDetectedC, fnDetectedC, fnLumiC; // Side C
-  Int_t fpLostITA, fpLostD1A, fpLostTDI, fpDetectedA, fnDetectedA, fnLumiA, fnTrou; // Side A
+  Int_t fpLostITC, fpLostD1C, fpDetectedC, fnDetectedC; // Side C
+  Int_t fpLostITA, fpLostD1A, fpLostTDI, fpDetectedA, fnDetectedA; // Side A
   
   
-   ClassDef(AliZDCv3,3)  // Zero Degree Calorimeter version 1
+   ClassDef(AliZDCv3,4)  // Zero Degree Calorimeter version 1
 }; 
  
 #endif