PreShower pos/neg

src/THcShower.cxx

@@ -372,8 +372,10 @@ Int_t THcShower::ReadDatabase( const TDatime& date )
   Double_t hcal_neg_cal_const[fNTotBlocks];
   Double_t hcal_neg_gain_cor[fNTotBlocks];
 
-  fAdcTimeWindowMin = new Double_t [fNTotBlocks];
-  fAdcTimeWindowMax = new Double_t [fNTotBlocks];
+  fPosAdcTimeWindowMin = new Double_t [fNTotBlocks];
+  fNegAdcTimeWindowMin = new Double_t [fNTotBlocks];
+  fPosAdcTimeWindowMax = new Double_t [fNTotBlocks];
+  fNegAdcTimeWindowMax = new Double_t [fNTotBlocks];
 
   DBRequest list[]={
     {"cal_pos_cal_const", hcal_pos_cal_const, kDouble, fNTotBlocks},
@@ -382,16 +384,20 @@ Int_t THcShower::ReadDatabase( const TDatime& date )
     {"cal_neg_cal_const", hcal_neg_cal_const, kDouble, fNTotBlocks},
     {"cal_neg_ped_limit", fShNegPedLimit, kInt,    fNTotBlocks,1},
     {"cal_neg_gain_cor",  hcal_neg_gain_cor,  kDouble, fNTotBlocks},
-    {"cal_AdcTimeWindowMin", fAdcTimeWindowMin, kDouble, static_cast<UInt_t>(fNTotBlocks),1},
-    {"cal_AdcTimeWindowMax", fAdcTimeWindowMax, kDouble, static_cast<UInt_t>(fNTotBlocks),1},
+    {"cal_pos_AdcTimeWindowMin", fPosAdcTimeWindowMin, kDouble, static_cast<UInt_t>(fNTotBlocks),1},
+    {"cal_neg_AdcTimeWindowMin", fNegAdcTimeWindowMin, kDouble, static_cast<UInt_t>(fNTotBlocks),1},
+    {"cal_pos_AdcTimeWindowMax", fPosAdcTimeWindowMax, kDouble, static_cast<UInt_t>(fNTotBlocks),1},
+    {"cal_neg_AdcTimeWindowMax", fNegAdcTimeWindowMax, kDouble, static_cast<UInt_t>(fNTotBlocks),1},
     {"cal_min_peds", &fShMinPeds, kInt,0,1},
     {0}
   };
   fShMinPeds=0.;
 
   for(UInt_t ip=0;ip<fNTotBlocks;ip++) {
-    fAdcTimeWindowMin[ip] = -1000.;
-    fAdcTimeWindowMax[ip] = 1000.;
+    fPosAdcTimeWindowMin[ip] = -1000.;
+    fNegAdcTimeWindowMin[ip] = -1000.;
+    fPosAdcTimeWindowMax[ip] = 1000.;
+    fNegAdcTimeWindowMax[ip] = 1000.;
    }
 
   gHcParms->LoadParmValues((DBRequest*)&list, prefix);

src/THcShower.h

@@ -74,11 +74,17 @@ public:
   Int_t GetADCMode() {
     return fADCMode;
   }
-  Double_t* GetAdcTimeWindowMin() {
-    return fAdcTimeWindowMin;
+  Double_t* GetPosAdcTimeWindowMin() {
+    return fPosAdcTimeWindowMin;
   }
-  Double_t* GetAdcTimeWindowMax() {
-    return fAdcTimeWindowMax;
+  Double_t* GetNegAdcTimeWindowMin() {
+    return fNegAdcTimeWindowMin;
+  }
+  Double_t* GetPosAdcTimeWindowMax() {
+    return fPosAdcTimeWindowMax;
+  }
+  Double_t* GetNegAdcTimeWindowMax() {
+    return fNegAdcTimeWindowMax;
   }
   Double_t GetAdcTdcOffset() {
     return fAdcTdcOffset;
@@ -155,8 +161,10 @@ protected:
   static const Int_t kADCDynamicPedestal=1;
   static const Int_t kADCSampleIntegral=2;
   static const Int_t kADCSampIntDynPed=3;
-  Double_t* fAdcTimeWindowMin;
-  Double_t* fAdcTimeWindowMax;
+  Double_t* fPosAdcTimeWindowMin;
+  Double_t* fNegAdcTimeWindowMin;
+  Double_t* fPosAdcTimeWindowMax;
+  Double_t* fNegAdcTimeWindowMax;
   Double_t fAdcTdcOffset;
 
   Int_t fAnalyzePedestals;   // Flag for pedestal analysis.

src/THcShowerPlane.cxx

@@ -738,8 +738,10 @@ void THcShowerPlane::FillADC_DynamicPedestal()
 {
   Double_t StartTime = 0.0;
   if( fglHod ) StartTime = fglHod->GetStartTime();
-  Double_t* AdcTimeWindowMin=static_cast<THcShower*>(fParent)->GetAdcTimeWindowMin();
-  Double_t* AdcTimeWindowMax=static_cast<THcShower*>(fParent)->GetAdcTimeWindowMax();
+  Double_t* PosAdcTimeWindowMin=static_cast<THcShower*>(fParent)->GetPosAdcTimeWindowMin();
+  Double_t* NegAdcTimeWindowMin=static_cast<THcShower*>(fParent)->GetNegAdcTimeWindowMin();
+  Double_t* PosAdcTimeWindowMax=static_cast<THcShower*>(fParent)->GetPosAdcTimeWindowMax();
+  Double_t* NegAdcTimeWindowMax=static_cast<THcShower*>(fParent)->GetNegAdcTimeWindowMax();
   for (Int_t ielem=0;ielem<frNegAdcPulseInt->GetEntries();ielem++) {
     Int_t    npad         = ((THcSignalHit*) frNegAdcPulseInt->ConstructedAt(ielem))->GetPaddleNumber() - 1;
     Double_t pulseInt     = ((THcSignalHit*) frNegAdcPulseInt->ConstructedAt(ielem))->GetData();
@@ -750,7 +752,7 @@ void THcShowerPlane::FillADC_DynamicPedestal()
     Double_t adctdcdiffTime = StartTime-pulseTime;
     Double_t threshold    = ((THcSignalHit*) frNegAdcThreshold->ConstructedAt(ielem))->GetData();
     Bool_t   errorflag    = ((THcSignalHit*) frNegAdcErrorFlag->ConstructedAt(ielem))->GetData();
-    Bool_t   pulseTimeCut = (adctdcdiffTime > AdcTimeWindowMin[npad]) && (adctdcdiffTime < AdcTimeWindowMax[npad]);
+    Bool_t   pulseTimeCut = (adctdcdiffTime > NegAdcTimeWindowMin[npad]) && (adctdcdiffTime < NegAdcTimeWindowMax[npad]);
     if (!errorflag && pulseTimeCut) {
       fGoodNegAdcPulseIntRaw.at(npad) =pulseIntRaw;
 
@@ -784,7 +786,7 @@ void THcShowerPlane::FillADC_DynamicPedestal()
     Double_t pulseTime    = ((THcSignalHit*) frPosAdcPulseTime->ConstructedAt(ielem))->GetData();
      Double_t adctdcdiffTime = StartTime-pulseTime;
    Bool_t   errorflag    = ((THcSignalHit*) frPosAdcErrorFlag->ConstructedAt(ielem))->GetData();
-    Bool_t   pulseTimeCut = (adctdcdiffTime > AdcTimeWindowMin[npad]) &&  (adctdcdiffTime < AdcTimeWindowMax[npad]);
+    Bool_t   pulseTimeCut = (adctdcdiffTime > PosAdcTimeWindowMin[npad]) &&  (adctdcdiffTime < PosAdcTimeWindowMax[npad]);
     if (!errorflag && pulseTimeCut) {
       fGoodPosAdcPulseIntRaw.at(npad) = pulseIntRaw;