Merge pull request alisw#302 from hcab14/master

STARLIGHT+AD update
sevdokim · Jul 2, 2017 · e99bfd2 · e99bfd2
2 parents 2c51844 + 09ee4d2
commit e99bfd2
Show file tree

Hide file tree

Showing 13 changed files with 280 additions and 249 deletions.
diff --git a/AD/ADsim/AliADDigitizer.cxx b/AD/ADsim/AliADDigitizer.cxx
@@ -563,7 +563,10 @@ void AliADDigitizer::DigitizeSDigits()
 
 void AliADDigitizer::AdjustPulseShapeADC()
 {
-  TClonesArray *f_Int[2] = { NULL, NULL };
+  TClonesArray *f_Int[2] = {
+    new TClonesArray("TF1", 21),
+    new TClonesArray("TF1", 21)
+  };
   Float_t extrapolationThresholds[kADNClocks];
   Bool_t  doExtrapolation[kADNClocks];
   fTS->SetBranchAddress("f_Int0", &f_Int[0]);

diff --git a/STARLIGHT/AliStarLight/AliGenStarLight.h b/STARLIGHT/AliStarLight/AliGenStarLight.h
@@ -61,7 +61,7 @@ class AliGenStarLight : public AliGenMC {
 
   AliSLEventHeader *fHeader;      //!
 
-  ClassDef(AliGenStarLight,5);
+  ClassDef(AliGenStarLight,6);
 } ;
 
 #endif
diff --git a/STARLIGHT/starlight/TStarLight/TStarLight.h b/STARLIGHT/starlight/TStarLight/TStarLight.h
@@ -135,7 +135,7 @@ class TStarLight : public TGenerator {
   inputParameters  fInputParameters;  //   simulation input information.
   upcEvent         fEvent;            //!  object holding STARlight simulated event.
 
-  ClassDef(TStarLight,2); // STARlight interface to ROOT's Virtual Monte Carlo
+  ClassDef(TStarLight,3); // STARlight interface to ROOT's Virtual Monte Carlo
 } ;
 
 #endif
diff --git a/STARLIGHT/starlight/include/incoherentVMCrossSection.h b/STARLIGHT/starlight/include/incoherentVMCrossSection.h
@@ -50,6 +50,8 @@ class incoherentVMCrossSection : public photonNucleusCrossSection {
 private:
 
 	double _Ep;
+	double _gamma1;
+	double _gamma2;
 	double _narrowYmax;
 	double _narrowYmin;
 	int    _narrowNumY;

diff --git a/STARLIGHT/starlight/include/inputParameters.h b/STARLIGHT/starlight/include/inputParameters.h
@@ -20,9 +20,9 @@
 ///////////////////////////////////////////////////////////////////////////
 //
 // File and Version Information:
-// $Rev:: 276                         $: revision of last commit
+// $Rev:: 284                         $: revision of last commit
 // $Author:: jnystrand                $: author of last commit
-// $Date:: 2016-09-13 20:54:42 +0200 #$: date of last commit
+// $Date:: 2017-04-25 22:08:11 +0200 #$: date of last commit
 //
 // Description:
 //
@@ -200,6 +200,7 @@ class inputParameters : public inputParametersBase {
 	double       bslopeValue           () const { return _bslopeValue.value();            }  ///< returns the value of b-slope
         double       bslope0               () const { return _bslope0.value();                }  ///<
         double       bslope_alphaprime     () const { return _bslope_alphaprime.value();      }  ///<
+	int          impulseVM             () const { return _impulseVM.value();              }  ///< returns the impulseVM value
 	starlightConstants::particleTypeEnum    prodParticleType     () const { return _particleType;    }  ///< returns type of produced particle
 	starlightConstants::decayTypeEnum       prodParticleDecayType() const { return _decayType;       }  ///< returns decay type of produced particle
 	starlightConstants::interactionTypeEnum interactionType      () const { return _interactionType; }  ///< returns interaction type
@@ -248,6 +249,7 @@ class inputParameters : public inputParametersBase {
 
 	int  printVM                  () const { return _printVM.value();         }  ///< returns the printVM value
 	void setprintVM               (int v)  {  _printVM = v;                   }  ///< sets the value of _printVM
+        void setimpulseVM             (int v)  {  _impulseVM = v;                 }  ///< sets the value of _impulseVM
 
 	void setProdParticleType      (starlightConstants::particleTypeEnum v)    { _particleType = v;    }  ///< sets type of produced particle
 	void setProdParticleDecayType (starlightConstants::decayTypeEnum v)       { _decayType = v;       }  ///< sets decay type of produced particle
@@ -260,10 +262,8 @@ class inputParameters : public inputParametersBase {
 
 	std::ostream& print(std::ostream& out) const;  ///< prints parameter summary
 	std::ostream& write(std::ostream& out) const;  ///< writes parameters back to an ostream
-
 private:
 
-
 // To indicate if the crossection table should be re-calculated if parameter changes
 #define VALIDITY_CHECK true
 #define NO_VALIDITY_CHECK false
@@ -325,6 +325,7 @@ class inputParameters : public inputParametersBase {
         parameter<double, VALIDITY_CHECK>          _bslope0;                 ///< Parameterization of slope parameter when _bslopeDefinition is set to 3
         parameter<double, VALIDITY_CHECK>          _bslope_alphaprime;       ///< Parameterization of slope parameter when _bslopeDefinition is set to 3
 	parameter<unsigned int, VALIDITY_CHECK>    _printVM;                 ///< Optional parameter to set printing options for VM cross section
+        parameter<unsigned int, VALIDITY_CHECK>    _impulseVM;               ///< Optional parameter to use impulse approximation (no nuclear effects) for VM cross section.
 
 	starlightConstants::particleTypeEnum       _particleType;
 	starlightConstants::decayTypeEnum          _decayType;

diff --git a/STARLIGHT/starlight/include/narrowResonanceCrossSection.h b/STARLIGHT/starlight/include/narrowResonanceCrossSection.h
@@ -20,9 +20,9 @@
 ///////////////////////////////////////////////////////////////////////////
 //
 // File and Version Information:
-// $Rev:: 211                         $: revision of last commit
-// $Author:: butter                   $: author of last commit
-// $Date:: 2015-08-10 04:05:09 +0200 #$: date of last commit
+// $Rev:: 286                         $: revision of last commit
+// $Author:: jnystrand                $: author of last commit
+// $Date:: 2017-05-03 22:32:03 +0200 #$: date of last commit
 //
 // Description:
 //
@@ -50,6 +50,8 @@ class narrowResonanceCrossSection : public photonNucleusCrossSection {
 private:
 
 	double _Ep;
+	double _gamma1;
+	double _gamma2;
 	double _narrowYmax;
 	double _narrowYmin;
 	int    _narrowNumY;

diff --git a/STARLIGHT/starlight/include/photonNucleusCrossSection.h b/STARLIGHT/starlight/include/photonNucleusCrossSection.h
@@ -20,9 +20,9 @@
 ///////////////////////////////////////////////////////////////////////////
 //
 // File and Version Information:
-// $Rev:: 280                         $: revision of last commit
+// $Rev:: 284                         $: revision of last commit
 // $Author:: jnystrand                $: author of last commit
-// $Date:: 2016-12-12 20:38:20 +0100 #$: date of last commit
+// $Date:: 2017-04-25 22:08:11 +0200 #$: date of last commit
 //
 // Description:
 //
@@ -87,6 +87,7 @@ class photonNucleusCrossSection {
 	double _photonNucleusSigma; 
 
         int    _printDef; 
+        int    _impulseSelected;
 
 private:
 

diff --git a/STARLIGHT/starlight/include/wideResonanceCrossSection.h b/STARLIGHT/starlight/include/wideResonanceCrossSection.h
@@ -20,9 +20,9 @@
 ///////////////////////////////////////////////////////////////////////////
 //
 // File and Version Information:
-// $Rev:: 280                         $: revision of last commit
+// $Rev:: 286                         $: revision of last commit
 // $Author:: jnystrand                $: author of last commit
-// $Date:: 2016-12-12 20:38:20 +0100 #$: date of last commit
+// $Date:: 2017-05-03 22:32:03 +0200 #$: date of last commit
 //
 // Description:
 //
@@ -50,6 +50,8 @@ class wideResonanceCrossSection : public photonNucleusCrossSection {
 private:
 
 	double _Ep;  // Proton Energy
+        double _gamma1;
+        double _gamma2;
 	double _wideWmax;
 	double _wideWmin;
 	double _wideYmax;