o fixes

diff --git a/TPC/Upgrade/AliToyMCEventGenerator.cxx b/TPC/Upgrade/AliToyMCEventGenerator.cxx
index c0f8bc968e3991a4a386e7c00abc6b9d7ba23573..d52aab10f805963aed8cba01a68a14154f199658 100644 (file)
--- a/TPC/Upgrade/AliToyMCEventGenerator.cxx
+++ b/TPC/Upgrade/AliToyMCEventGenerator.cxx
@@ -725,7 +725,6 @@ void AliToyMCEventGenerator::IterateSC(Int_t ipos)
     return;
   }
 
     return;
   }
 

-  SetSCScalingFactor();

 }
 
 //________________________________________________________________
 }
 
 //________________________________________________________________


@@ -772,7 +771,7 @@ void AliToyMCEventGenerator::SetSCScalingFactor()
   // between the fluctuation map and the average map
   //
 
   // between the fluctuation map and the average map
   //
 

-  if ( !(fTPCCorrection && fTPCCorrectionAv && fEvent) ) return;
+  if ( !(HasSCList() && fTPCCorrection && fTPCCorrectionAv && fEvent) ) return;

 
   // loop over several z, r and phi bins and find a factor that minimises
   // the distortions between the current map and the average map
 
   // loop over several z, r and phi bins and find a factor that minimises
   // the distortions between the current map and the average map

diff --git a/TPC/Upgrade/AliToyMCEventGenerator.h b/TPC/Upgrade/AliToyMCEventGenerator.h
index 4cc296caef3734cac599543e71c9f35cd376ea30..7a7a024ae5af2751def0053e6a71d955c0ffa061 100644 (file)
--- a/TPC/Upgrade/AliToyMCEventGenerator.h
+++ b/TPC/Upgrade/AliToyMCEventGenerator.h
@@ -93,7 +93,8 @@ class AliToyMCEventGenerator : public TObject {
   Bool_t CloseOutputFile();
   void FillTree();
   void IterateSC(Int_t ipos=-1);
   Bool_t CloseOutputFile();
   void FillTree();
   void IterateSC(Int_t ipos=-1);

-
+  void SetSCScalingFactor();
+  

   UInt_t fCurrentTrack;                  // unique track id within the current event generation
 
   
   UInt_t fCurrentTrack;                  // unique track id within the current event generation
 
   


@@ -116,7 +117,6 @@ class AliToyMCEventGenerator : public TObject {
   Bool_t fPrereadSCList;                 // preread all SC files from the SC list
 
   void InitSpaceChargeList();
   Bool_t fPrereadSCList;                 // preread all SC files from the SC list
 
   void InitSpaceChargeList();

-  void SetSCScalingFactor();

   
   ClassDef(AliToyMCEventGenerator, 1)
   
   
   ClassDef(AliToyMCEventGenerator, 1)
   

diff --git a/TPC/Upgrade/AliToyMCEventGeneratorSimple.cxx b/TPC/Upgrade/AliToyMCEventGeneratorSimple.cxx
index 3125e7a5a487109a73ed65ddaeca632b190a74f9..8123181b39dffb431461a902d0783c3a823ba097 100644 (file)
--- a/TPC/Upgrade/AliToyMCEventGeneratorSimple.cxx
+++ b/TPC/Upgrade/AliToyMCEventGeneratorSimple.cxx
@@ -190,6 +190,7 @@ void AliToyMCEventGeneratorSimple::RunSimulation(const Int_t nevents/*=10*/, con
   for (Int_t ievent=0; ievent<nevents; ++ievent){
     printf("Generating event %3d (%.3g)\n",ievent,eventTime);
     fEvent = Generate(eventTime);
   for (Int_t ievent=0; ievent<nevents; ++ievent){
     printf("Generating event %3d (%.3g)\n",ievent,eventTime);
     fEvent = Generate(eventTime);

+    SetSCScalingFactor();

     FillTree();
     delete fEvent;
     fEvent=0x0;
     FillTree();
     delete fEvent;
     fEvent=0x0;


@@ -378,6 +379,7 @@ void AliToyMCEventGeneratorSimple::RunSimulationBunchTrain(const Int_t nevents/*
     if(equalSpacing)  {
       printf("Generating event %3d (%.3g)\n",nGeneratedEvents,eventTime);
       fEvent = Generate(eventTime);
     if(equalSpacing)  {
       printf("Generating event %3d (%.3g)\n",nGeneratedEvents,eventTime);
       fEvent = Generate(eventTime);

+      SetSCScalingFactor();

       nGeneratedEvents++;
       FillTree();
       delete fEvent;
       nGeneratedEvents++;
       FillTree();
       delete fEvent;


@@ -389,6 +391,7 @@ void AliToyMCEventGeneratorSimple::RunSimulationBunchTrain(const Int_t nevents/*
       for(Int_t iColl = 0; iColl<nCollsInCrossing; iColl++){
        printf("Generating event %3d (%.3g)\n",nGeneratedEvents,eventTime);
        fEvent = Generate(eventTime);
       for(Int_t iColl = 0; iColl<nCollsInCrossing; iColl++){
        printf("Generating event %3d (%.3g)\n",nGeneratedEvents,eventTime);
        fEvent = Generate(eventTime);

+        SetSCScalingFactor();

        nGeneratedEvents++;
        FillTree();
        delete fEvent;
        nGeneratedEvents++;
        FillTree();
        delete fEvent;