]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - EMCAL/AliEMCALDigitizer.cxx
add individual wagons switch mechanism
[u/mrichter/AliRoot.git] / EMCAL / AliEMCALDigitizer.cxx
index 7ebb516f08daba8c2d41195ed86e2cf6d58e724d..57201d7c304abff067661883f9225561b1d1a845 100644 (file)
@@ -66,6 +66,7 @@
 #include <TBrowser.h>
 #include <TObjectTable.h>
 #include <TRandom.h>
+#include <TF1.h>
 #include <cassert>
 
 // --- AliRoot header files ---
 #include "AliEMCALDigitizer.h"
 #include "AliEMCALSDigitizer.h"
 #include "AliEMCALGeometry.h"
-#include "AliEMCALTick.h"
+//#include "AliEMCALTick.h"
 #include "AliEMCALCalibData.h"
 #include "AliEMCALSimParam.h"
+#include "AliEMCALRawDigit.h"
+
+namespace
+{
+       Double_t HeavisideTheta(Double_t x)
+       {
+               Double_t signal = 0.;
+               
+               if (x > 0.) signal = 1.;  
+               
+               return signal;  
+       }
+       
+       Double_t AnalogFastORFunction(Double_t *x, Double_t *par)
+       {
+               Double_t v0 = par[0];
+               Double_t t0 = par[1];
+               Double_t tr = par[2];
+               
+               Double_t R1 = 1000.;
+               Double_t C1 = 33e-12;
+               Double_t R2 = 1800;
+               Double_t C2 = 22e-12;
+               
+               Double_t t  =   x[0];
+               
+               return (((0.8*(-((TMath::Power(C1,2)*C2*TMath::Power(TMath::E(),(-t + t0)/(C1*R1))*
+                                                 TMath::Power(R1,2)*R2)/(C1*R1 - C2*R2)) + 
+                                          C1*C2*R1*R2*(1 - (C2*TMath::Power(TMath::E(),(-t + t0)/(C2*R2))*R2)/(-(C1*R1) + C2*R2)))*v0*
+                                 HeavisideTheta(t - t0))/tr 
+                                - (0.8*(C1*C2*R1*R2 - 
+                                                (TMath::Power(C1,2)*C2*TMath::Power(TMath::E(),(-1.*t + t0 + 1.25*tr)/(C1*R1))*
+                                                 TMath::Power(R1,2)*R2)/(C1*R1 - C2*R2) + 
+                                                (C1*TMath::Power(C2,2)*TMath::Power(TMath::E(),(-1.*t + t0 + 1.25*tr)/(C2*R2))*
+                                                 R1*TMath::Power(R2,2))/(C1*R1 - C2*R2))*v0*
+                                       HeavisideTheta(t - t0 - 1.25*tr))/tr)/(C2*R1));
+       }
+}
 
 ClassImp(AliEMCALDigitizer)
 
@@ -102,6 +141,7 @@ AliEMCALDigitizer::AliEMCALDigitizer()
 //    fPedestal(0), //Not used, remove?
 //    fSlope(0),    //Not used, remove?
     fPinNoise(0),
+    fTimeDelay(0),
     fTimeResolution(0),
 //    fTimeThreshold(0),    //Not used, remove?
 //    fTimeSignalLength(0), //Not used, remove?
@@ -132,6 +172,7 @@ AliEMCALDigitizer::AliEMCALDigitizer(TString alirunFileName, TString eventFolder
 //    fPedestal(0),//Not used, remove?
 //    fSlope(0),   //Not used, remove?
     fPinNoise(0),
+       fTimeDelay(0),
     fTimeResolution(0),
 //    fTimeThreshold(0),    //Not used, remove?
 //    fTimeSignalLength(0), //Not used, remove?
@@ -163,6 +204,7 @@ AliEMCALDigitizer::AliEMCALDigitizer(const AliEMCALDigitizer & d)
 //    fPedestal(d.fPedestal), //Not used, remove?
 //    fSlope(d.fSlope),       //Not used, remove?
     fPinNoise(d.fPinNoise),
+    fTimeDelay(d.fTimeDelay),
     fTimeResolution(d.fTimeResolution),
 //    fTimeThreshold(d.fTimeThreshold),       //Not used, remove?
 //    fTimeSignalLength(d.fTimeSignalLength), //Not used, remove?
@@ -186,11 +228,12 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd)
     fInput(0),
     fInputFileNames(0),
     fEventNames(0),
-    fDigitThreshold(0.),
+    fDigitThreshold(0),
     fMeanPhotonElectron(0),
 //    fPedestal(0), //Not used, remove?
 //    fSlope(0.),   //Not used, remove?
-    fPinNoise(0),
+    fPinNoise(0.),
+    fTimeDelay(0.),
     fTimeResolution(0.),
 //    fTimeThreshold(0),    //Not used, remove?
 //    fTimeSignalLength(0), //Not used, remove?
@@ -330,7 +373,7 @@ void AliEMCALDigitizer::Digitize(Int_t event)
   for(absID = 0; absID < nEMC; absID++){ // Nov 30, 2006 by PAI; was from 1 to nEMC
     Float_t energy = 0 ;
     // amplitude set to zero, noise will be added later
-    new((*digits)[absID]) AliEMCALDigit( -1, -1, absID, 0, TimeOfNoise() ); // absID-1->absID
+    new((*digits)[absID]) AliEMCALDigit( -1, -1, absID, 0., TimeOfNoise(),kFALSE); // absID-1->absID
     //look if we have to add signal?
     digit = dynamic_cast<AliEMCALDigit *>(digits->At(absID)); // absID-1->absID
     
@@ -342,7 +385,7 @@ void AliEMCALDigitizer::Digitize(Int_t event)
       //Follow PHOS and comment out this timing model til a better one
       //can be developed - JLK 28-Apr-2008
 
-      //Float_t a = digit->GetAmp() ;
+      //Float_t a = digit->GetAmplitude() ;
       //Float_t b = TMath::Abs( a /fTimeSignalLength) ;
       //Mark the beginning of the signal
       //new((*ticks)[contrib++]) AliEMCALTick(digit->GetTime(),0, b);  
@@ -351,7 +394,7 @@ void AliEMCALDigitizer::Digitize(Int_t event)
 
       // Calculate time as time of the largest digit
       Float_t time = digit->GetTime() ;
-      Float_t aTime= digit->GetAmp() ;
+      Float_t aTime= digit->GetAmplitude() ;
       
       // loop over input
       for(i = 0; i< fInput ; i++){  //loop over (possible) merge sources
@@ -370,12 +413,12 @@ void AliEMCALDigitizer::Digitize(Int_t event)
          curSDigit->ShiftPrimary(primaryoffset) ;
 
          //Remove old timing model - JLK 28-April-2008
-         //a = curSDigit->GetAmp() ;
+         //a = curSDigit->GetAmplitude() ;
          //b = a /fTimeSignalLength ;
          //new((*ticks)[contrib++]) AliEMCALTick(curSDigit->GetTime(),0, b);  
          //new((*ticks)[contrib++]) AliEMCALTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b); 
-         if(curSDigit->GetAmp()>aTime) {
-           aTime = curSDigit->GetAmp();
+         if(curSDigit->GetAmplitude()>aTime) {
+           aTime = curSDigit->GetAmplitude();
            time = curSDigit->GetTime();
          }
 
@@ -389,7 +432,7 @@ void AliEMCALDigitizer::Digitize(Int_t event)
        }
       }
       //Here we convert the summed amplitude to an energy in GeV
-      energy = sDigitizer->Calibrate(digit->GetAmp()) ; // GeV
+      energy = sDigitizer->Calibrate(digit->GetAmplitude()) ; // GeV
       // add fluctuations for photo-electron creation
       energy *= static_cast<Float_t>(gRandom->Poisson(fMeanPhotonElectron)) / static_cast<Float_t>(fMeanPhotonElectron) ;
   
@@ -415,7 +458,7 @@ void AliEMCALDigitizer::Digitize(Int_t event)
     //Now digitize the energy according to the sDigitizer method,
     //which merely converts the energy to an integer.  Later we will
     //check that the stored value matches our allowed dynamic ranges
-    digit->SetAmp(sDigitizer->Digitize(energy)) ;  
+    digit->SetAmplitude(sDigitizer->Digitize(energy)) ;  
     AliDebug(10,Form(" absID %5i energy %f nextSig %5i\n",
                     absID, energy, nextSig));
   } // for(absID = 0; absID < nEMC; absID++)
@@ -433,10 +476,10 @@ void AliEMCALDigitizer::Digitize(Int_t event)
   for(i = 0 ; i < nEMC ; i++){
     digit = dynamic_cast<AliEMCALDigit*>( digits->At(i) ) ;
     //First get the energy in GeV units.
-    energy = sDigitizer->Calibrate(digit->GetAmp()) ;
+    energy = sDigitizer->Calibrate(digit->GetAmplitude()) ;
     //Then digitize using the calibration constants of the ocdb
-    Int_t ampADC = DigitizeEnergy(energy, digit->GetId())  ;     
-    //if(ampADC>2)printf("Digit energy %f, amp %d, amp cal %d, threshold %d\n",energy,digit->GetAmp(),ampADC,fDigitThreshold);
+    Float_t ampADC = DigitizeEnergy(energy, digit->GetId())  ;           
+    //if(ampADC>2)printf("Digit energy %f, amp %d, amp cal %d, threshold %d\n",energy,digit->GetAmplitude(),ampADC,fDigitThreshold);
     if(ampADC < fDigitThreshold)
       digits->RemoveAt(i) ;
     else 
@@ -454,14 +497,17 @@ void AliEMCALDigitizer::Digitize(Int_t event)
   for (i = 0 ; i < ndigits ; i++) { 
     digit = dynamic_cast<AliEMCALDigit *>( digits->At(i) ) ; 
     digit->SetIndexInList(i) ; 
-    energy = sDigitizer->Calibrate(digit->GetAmp()) ;
-    digit->SetAmp(DigitizeEnergy(energy, digit->GetId()) ) ;
+    energy = sDigitizer->Calibrate(digit->GetAmplitude()) ;
+    digit->SetAmplitude(DigitizeEnergy(energy, digit->GetId()) ) ;
+       //Add delay to time
+       digit->SetTime(digit->GetTime()+fTimeDelay) ;
+        // printf("digit amplitude set at end: i %d, amp %f\n",i,digit->GetAmplitude());
   }
 
 }
 
 // //_____________________________________________________________________
-Int_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy, Int_t AbsId)
+Float_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy, Int_t AbsId)
 { 
   // JLK 26-June-2008
   // Returns digitized value of the energy in a cell absId
@@ -482,7 +528,7 @@ Int_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy, Int_t AbsId)
   Int_t nIeta   = -1;
   Int_t iphi    = -1;
   Int_t ieta    = -1;
-  Int_t channel = -999; 
+  Float_t channel = -999; 
 
   Bool_t bCell = geom->GetCellIndex(AbsId, iSupMod, nModule, nIphi, nIeta) ;
   if(!bCell)
@@ -494,8 +540,9 @@ Int_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy, Int_t AbsId)
     fADCchannelEC = fCalibData->GetADCchannel(iSupMod,ieta,iphi);
   }
   
-  channel = static_cast<Int_t> (TMath::Ceil( (energy + fADCpedestalEC)/fADCchannelEC ))  ;
-  
+  //channel = static_cast<Int_t> (TMath::Floor( (energy + fADCpedestalEC)/fADCchannelEC ))  ;
+  channel = (energy + fADCpedestalEC)/fADCchannelEC   ;
+
   if(channel > fNADCEC ) 
     channel =  fNADCEC ; 
   return channel ;
@@ -540,6 +587,8 @@ void AliEMCALDigitizer::Exec(Option_t *option)
   Int_t nEvents   = fLastEvent - fFirstEvent + 1;
   Int_t ievent;
 
+  TClonesArray* digitsTRG = new TClonesArray("AliEMCALRawDigit", 32 * 96);
+  TClonesArray* digitsTMP = new TClonesArray("AliEMCALDigit",    32 * 96);
   rl->LoadSDigits("EMCAL");
   for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
     
@@ -548,6 +597,23 @@ void AliEMCALDigitizer::Exec(Option_t *option)
     Digitize(ievent) ; //Add prepared SDigits to digits and add the noise
 
     WriteDigits() ;
+         
+       //Trigger Digits
+       //-------------------------------------
+       Digits2FastOR(digitsTMP, digitsTRG);  
+         
+       WriteDigits(digitsTRG);
+         
+       (emcalLoader->TreeD())->Fill();
+         
+       emcalLoader->WriteDigits(   "OVERWRITE");
+       emcalLoader->WriteDigitizer("OVERWRITE");
+         
+       Unload();
+         
+       digitsTRG->Clear();
+       digitsTMP->Clear();
+       //-------------------------------------
 
     if(strstr(option,"deb"))
       PrintDigits(option);
@@ -566,6 +632,144 @@ void AliEMCALDigitizer::Exec(Option_t *option)
   } 
 }
 
+//____________________________________________________________________________ 
+void AliEMCALDigitizer::Digits2FastOR(TClonesArray* digitsTMP, TClonesArray* digitsTRG)
+{
+       // FEE digits afterburner to produce TRG digits 
+       // we are only interested in the FEE digit deposited energy
+       // to be converted later into a voltage value
+       
+       // push the FEE digit to its associated FastOR (numbered from 0:95)
+       // TRU is in charge of summing module digits
+       
+       AliRunLoader *runLoader = AliRunLoader::Instance();
+       
+       AliRun* run = runLoader->GetAliRun();
+       
+       AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(runLoader->GetDetectorLoader("EMCAL"));
+       
+       AliEMCALGeometry* geom = dynamic_cast<AliEMCAL*>(run->GetDetector("EMCAL"))->GetGeometry();
+       
+       // build FOR from simulated digits
+       // and xfer to the corresponding TRU input (mapping)
+       
+       TClonesArray* digits = emcalLoader->Digits();
+       
+       TIter NextDigit(digits);
+       while (AliEMCALDigit* digit = (AliEMCALDigit*)NextDigit())
+       {
+               Int_t id = digit->GetId();
+               
+               Int_t iSupMod, nModule, nIphi, nIeta, iphi, ieta, iphim, ietam;
+               
+               geom->GetCellIndex(              id, iSupMod, nModule, nIphi, nIeta );
+               geom->GetModulePhiEtaIndexInSModule( iSupMod, nModule, iphim, ietam );          
+               geom->GetCellPhiEtaIndexInSModule(   iSupMod, nModule, nIphi, nIeta, iphi, ieta); 
+               
+               // identify to which TRU this FEE digit belong
+               //Int_t itru = (iSupMod < 11) ? iphim / 4 + 3 * iSupMod : 31;
+               Int_t itru = -1;
+               if (iSupMod < 11)
+                       itru = (iSupMod % 2) ? (2 - int(iphim / 4)) + 3 * iSupMod : iphim / 4 + 3 * iSupMod;
+               else 
+                       itru = 31;
+               
+               //---------
+               //
+               // FIXME: bad numbering solution to deal w/ the last 2 SM which have only 1 TRU each
+               // using the AliEMCALGeometry official numbering
+               // only 1 TRU/SM in SM 10 & SM 11
+               //
+               //---------
+               if ((itru == 31 && iphim < 2) || (itru == 30 && iphim > 5)) continue;
+               
+               // to be compliant with %4 per TRU
+               if (itru == 31) iphim -= 2;
+               
+               Int_t trgid;
+               Bool_t isOK = geom->GetAbsFastORIndexFromPositionInTRU(itru, ietam, iphim % 4, trgid);
+               
+               AliDebug(2,Form("trigger digit id: %d itru: %d isOK: %d\n",trgid,itru,isOK));
+               
+               if (isOK) 
+               {
+                       AliEMCALDigit* d = static_cast<AliEMCALDigit*>(digitsTMP->At(trgid));
+                       
+                       if (!d)
+                       {
+                               new((*digitsTMP)[trgid]) AliEMCALDigit(*digit);
+                               d = (AliEMCALDigit*)digitsTMP->At(trgid);
+                               d->SetId(trgid);
+                       }       
+                       else
+                       {
+                               *d = *d + *digit;
+                       }
+               }
+       }
+       
+       Int_t    nSamples = 32;
+       Int_t *timeSamples = new Int_t[nSamples];
+       
+       NextDigit = TIter(digitsTMP);
+       while (AliEMCALDigit* digit = (AliEMCALDigit*)NextDigit())
+       {
+               if (digit)
+               {
+                       Int_t     id = digit->GetId();
+                       Float_t time = digit->GetTime();
+                                               
+                       Double_t depositedEnergy = 0.;
+                       for (Int_t j = 1; j <= digit->GetNprimary(); j++) depositedEnergy += digit->GetDEPrimary(j);
+                       
+                       // FIXME: Check digit time!
+                       if (depositedEnergy)
+                       {
+                               DigitalFastOR(time, depositedEnergy, timeSamples, nSamples);
+                               
+                               for (Int_t j=0;j<nSamples;j++) 
+                               {
+                                       timeSamples[j] = ((j << 12) & 0xFF000) | (timeSamples[j] & 0xFFF);
+                               }
+                               
+                               new((*digitsTRG)[digitsTRG->GetEntriesFast()]) AliEMCALRawDigit(id, timeSamples, nSamples);
+                       }
+               }
+       }
+
+       delete [] timeSamples;
+}
+
+//____________________________________________________________________________ 
+void AliEMCALDigitizer::DigitalFastOR( Double_t time, Double_t dE, Int_t timeSamples[], Int_t nSamples )
+{
+       // parameters:  
+       // id: 0..95
+       const Int_t    reso = 11;      // 11-bit resolution ADC
+       const Double_t vFSR = 1;       // Full scale input voltage range
+       const Double_t Ne   = 125;     // signal of the APD per MeV of energy deposit in a tower: 125 photo-e-/MeV @ M=30
+       const Double_t vA   = .136e-6; // CSP output range: 0.136uV/e-
+       const Double_t rise = 40e-9;   // rise time (10-90%) of the FastOR signal before shaping
+       
+       const Double_t kTimeBinWidth = 25E-9; // sampling frequency (40MHz)
+       
+       Double_t vV = 1000. * dE * Ne * vA; // GeV 2 MeV
+       
+       TF1 signalF("signal", AnalogFastORFunction, 0, nSamples * kTimeBinWidth, 3);
+       signalF.SetParameter( 0,   vV ); 
+       signalF.SetParameter( 1, time ); // FIXME: when does the signal arrive? Might account for cable lengths
+       signalF.SetParameter( 2, rise );
+       
+       for (Int_t iTime=0; iTime<nSamples; iTime++) 
+       {
+               // FIXME: add noise (probably not simply Gaussian) according to DA measurements
+               // probably plan an access to OCDB
+               
+               timeSamples[iTime] = int((TMath::Power(2, reso) / vFSR) * signalF.Eval(iTime * kTimeBinWidth) + 0.5);
+       }
+}
+
+
 //____________________________________________________________________________ 
 //Float_t AliEMCALDigitizer::FrontEdgeTime(TClonesArray * ticks) 
 //{ 
@@ -632,22 +836,34 @@ Bool_t AliEMCALDigitizer::Init()
 void AliEMCALDigitizer::InitParameters()
 { 
   // Parameter initialization for digitizer
-  fMeanPhotonElectron = AliEMCALSimParam::GetInstance()->GetMeanPhotonElectron();//4400;  // electrons per GeV 
-  fPinNoise           = AliEMCALSimParam::GetInstance()->GetPinNoise();//0.012; // pin noise in GeV from analysis test beam data 
+  
+  // Get the parameters from the OCDB via the loader
+  AliRunLoader *rl = AliRunLoader::Instance();
+  AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(rl->GetDetectorLoader("EMCAL"));
+  AliEMCALSimParam * simParam = 0x0;
+  if(emcalLoader) simParam = emcalLoader->SimulationParameters();
+       
+  if(!simParam){
+         simParam = AliEMCALSimParam::GetInstance();
+         AliWarning("Simulation Parameters not available in OCDB?");
+  }
+       
+  fMeanPhotonElectron = simParam->GetMeanPhotonElectron();//4400;  // electrons per GeV 
+  fPinNoise           = simParam->GetPinNoise();//0.012; // pin noise in GeV from analysis test beam data 
   if (fPinNoise < 0.0001 ) 
     Warning("InitParameters", "No noise added\n") ; 
-  fDigitThreshold     = AliEMCALSimParam::GetInstance()->GetDigitThreshold(); //fPinNoise * 3; // 3 * sigma
-  fTimeResolution     = AliEMCALSimParam::GetInstance()->GetTimeResolution(); //0.6e-9 ; // 600 psc
+  fDigitThreshold     = simParam->GetDigitThreshold(); //fPinNoise * 3; // 3 * sigma
+  fTimeResolution     = simParam->GetTimeResolution(); //0.6e-9 ; // 600 pc
+  fTimeDelay          = simParam->GetTimeDelay(); //600e-9 ; // 600 ns
 
   // These defaults are normally not used. 
   // Values are read from calibration database instead
   fADCchannelEC       = 0.0153; // Update 24 Apr 2007: 250./16/1024 - width of one ADC channel in GeV
   fADCpedestalEC      = 0.0 ;  // GeV
 
-  fNADCEC          = AliEMCALSimParam::GetInstance()->GetNADCEC();//(Int_t) TMath::Power(2,16) ;  // number of channels in Tower ADC - 65536
+  fNADCEC          = simParam->GetNADCEC();//(Int_t) TMath::Power(2,16) ;  // number of channels in Tower ADC - 65536
 
-  AliDebug(2,Form("Mean Photon Electron %d, Noise %f, E Threshold %f,Time Resolution %g,NADCEC %d",
+  AliDebug(2,Form("Mean Photon Electron %d, Noise %f, Digit Threshold %d,Time Resolution %g,NADCEC %d",
                fMeanPhotonElectron,fPinNoise,fDigitThreshold,fTimeResolution,fNADCEC));
 
   // Not used anymore, remove?
@@ -780,8 +996,8 @@ void AliEMCALDigitizer::PrintDigits(Option_t * option)
     Int_t index ;
     for (index = 0 ; index < digits->GetEntries() ; index++) {
       digit = dynamic_cast<AliEMCALDigit *>(digits->At(index)) ;
-      printf("\n%6d  %8d    %6.5e %4d      %2d : ",
-             digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ;  
+      printf("\n%6d  %8f    %6.5e %4d      %2d : ",
+             digit->GetId(), digit->GetAmplitude(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ;  
       Int_t iprimary;
       for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {
        printf("%d ",digit->GetPrimary(iprimary+1) ) ; 
@@ -847,13 +1063,42 @@ void AliEMCALDigitizer::WriteDigits()
   else
     treeD->Branch("EMCAL","TClonesArray",&digits,bufferSize);
   //digitsBranch->SetTitle(fEventFolderName);
-  treeD->Fill() ;
-  
+
+//     treeD->Fill() ;
+/*  
   emcalLoader->WriteDigits("OVERWRITE");
   emcalLoader->WriteDigitizer("OVERWRITE");
 
   Unload() ; 
+*/
+}
 
+//__________________________________________________________________
+void AliEMCALDigitizer::WriteDigits(TClonesArray* digits, const char* branchName)
+{
+       //
+       AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
+       
+       TTree* treeD = emcalLoader->TreeD(); 
+       if (!treeD) 
+       {
+               emcalLoader->MakeDigitsContainer();
+               treeD = emcalLoader->TreeD(); 
+       }
+       
+       // -- create Digits branch
+       Int_t bufferSize = 32000;
+       
+       if (TBranch* triggerBranch = treeD->GetBranch(branchName)) 
+       {
+               triggerBranch->SetAddress(&digits);
+       }
+       else
+       {
+               treeD->Branch(branchName,"TClonesArray",&digits,bufferSize);
+       }
+       
+//     treeD->Fill();
 }
 
 //__________________________________________________________________