diff --git a/Software/AttenuationScan/AttenuationScan.C b/Software/AttenuationScan/AttenuationScan.C
index d9dcd2c..192b04d 100644
--- a/Software/AttenuationScan/AttenuationScan.C
+++ b/Software/AttenuationScan/AttenuationScan.C
@@ -130,6 +130,9 @@
   Float_t meanADC[steps];
   Float_t mean4ADC[steps];
 
+  // Open output ROOT file.
+  TFile *output = TFile::Open(TString(output_ROOT),"RECREATE");
+
   for (Int_t step=0;step<steps;step++) {
     dB[step] = mindB+step*stepdB;
 
@@ -173,8 +176,7 @@
     input->Close();
   }
 
-  // Open output ROOT file.
-  TFile *output = TFile::Open(TString(output_ROOT),"RECREATE");
+  output->cd();
 
   // Only one strip.
   TGraph *gattenuationScan = new TGraph(steps,dB,meanADC);
diff --git a/Software/ComputePedestals/ComputePedestals.C b/Software/ComputePedestals/ComputePedestals.C
index 5eb768e..caf3d66 100644
--- a/Software/ComputePedestals/ComputePedestals.C
+++ b/Software/ComputePedestals/ComputePedestals.C
@@ -242,19 +242,37 @@
     } 
   }
 
-
   DrawHist(cADCBeetle1,hADCBeetle1,"",path_to_figures);
   DrawHist(cADCBeetle2,hADCBeetle2,"",path_to_figures);
 
-  // Remove potential outliers. Use the mean and the RMS of the hADCBeetle1 and hADCBeetle2 histograms and exclude everything that is outside 5 times the RMS.
-  double mean1 = hADCBeetle1->GetMean();
-  double rms1 = hADCBeetle1->GetRMS();
-  
-  double mean2 = hADCBeetle2->GetMean();
-  double rms2 = hADCBeetle2->GetRMS();
+  // Remove potential outliers. Use the mean and the RMS of the hADCTemp histograms and exclude everything that is outside <factor> times the RMS.
+  double mean[N];
+  double rms[N];
   
   double factor = 5.; // Entries further than factor*rms from the mean are excluded from the pedestal calculation.
 
+  // Fill histograms, necessary to remove potential outliers.
+  TH1F *hADCTemp[N];
+  for (int ch=0;ch<N;++ch) {
+    hADCTemp[ch] = new TH1F(Form("hADCTemp%d",ch),"",1024,0,1024);   
+    InitHist(hADCTemp[ch],Form("Raw ADC counts on Beetle channel %d - temporary",ch),"ADC counts","");
+
+    // Fill histograms.
+    for (int iEvent=0;iEvent<NEvents;++iEvent) {
+      EventInfo->GetEntry(iEvent);
+      hADCTemp[ch]->Fill(ADC->at(ch));
+      if (ADC->at(ch) > 1024.)
+        cout << "Error! ADC counts of Beetle channel " << ch << ": " << ADC->at(ch) << endl;
+    }
+
+    TF1 *fGaussian = new TF1("fGaussian","gaus",400,600);
+    hADCTemp[ch]->Fit("fGaussian","R");
+    // mean[ch] = hADCTemp[ch]->GetMean();
+    // rms[ch] = hADCTemp[ch]->GetMean();
+    mean[ch] = fGaussian->GetParameter(1);
+    rms[ch] = fGaussian->GetParameter(2);
+  }
+
   // Fill histograms.
   TH1F *hADC[N];
   // TPaveStats *sADC[N];
@@ -264,7 +282,7 @@
   double noise[N];
 
   for (int ch=0;ch<N;++ch) {
-    hADC[ch] = new TH1F(Form("hADC%d",ch),"",200,400,600);
+    hADC[ch] = new TH1F(Form("hADC%d",ch),"",1024,0,1024);
     cADC[ch] = new TCanvas(Form("cADC%d",ch),"",400,300);
     
     InitHist(hADC[ch],Form("Raw ADC counts on Beetle channel %d",ch),"ADC counts","");
@@ -272,7 +290,7 @@
     // Fill histograms.
     for (int iEvent=0;iEvent<NEvents;++iEvent) {
       EventInfo->GetEntry(iEvent);
-      if (((ch<NBeetle) && (abs(ADC->at(ch)-mean1)<factor*rms1)) || ((ch>=NBeetle) &&  (abs(ADC->at(ch)-mean2)<factor*rms2)))
+      if (abs(ADC->at(ch)-mean[ch])<factor*rms[ch])
         hADC[ch]->Fill(ADC->at(ch));
       if (ADC->at(ch) > 1024.)
         cout << "Error! ADC counts of Beetle channel " << ch << ": " << ADC->at(ch) << endl;
@@ -292,8 +310,8 @@
   for (int ch=0;ch<N;++ch)
     strip[ch] = (double)ch;
 
-  TH1F *hpedestalvsstrip = new TH1F("hpedestalvsstrip","",257,-1,255);
-  TH1F *hnoisevsstrip = new TH1F("hnoisevsstrip","",257,-1,255);
+  TH1F *hpedestalvsstrip = new TH1F("hpedestalvsstrip","",256,0,256);
+  TH1F *hnoisevsstrip = new TH1F("hnoisevsstrip","",256,0,256);
   
   InitHist(hpedestalvsstrip,"Pedestal as a function of Beetle channel","Beetle channel","ADC counts");
   InitHist(hnoisevsstrip,"Noise as a function of Beetle channel","Beetle channel","ADC counts");
diff --git a/Software/ProcessRawData/ProcessRawData.C b/Software/ProcessRawData/ProcessRawData.C
index 4c83b04..5a704a5 100644
--- a/Software/ProcessRawData/ProcessRawData.C
+++ b/Software/ProcessRawData/ProcessRawData.C
@@ -244,12 +244,12 @@
   TCanvas *cADCPedSub[N];
 
   for (int iChannel=0;iChannel<N;++iChannel) {
-    hADC[iChannel] = new TH1F(Form("hADC%d",iChannel),"",200,400,600);
+    hADC[iChannel] = new TH1F(Form("hADC%d",iChannel),"",1024,0,1024);
     cADC[iChannel] = new TCanvas(Form("cADC%d",iChannel),"",400,300);
     
     InitHist(hADC[iChannel],Form("Raw ADC counts on Beetle channel %d",iChannel),"ADC counts","");
 
-    hADCPedSub[iChannel] = new TH1F(Form("hADCPedSub%d",iChannel),"",200,400,600);
+    hADCPedSub[iChannel] = new TH1F(Form("hADCPedSub%d",iChannel),"",1024,-512,512);
     cADCPedSub[iChannel] = new TCanvas(Form("cADCPedSub%d",iChannel),"",400,300);
     
     InitHist(hADCPedSub[iChannel],Form("Pedestal subtracted ADC counts on Beetle channel %d",iChannel),"ADC counts","");
@@ -257,20 +257,20 @@
 
   // ADC counts as a function of the Beetle channel (event-by-event, displayed only for one particular event, TH1F *hADCvsStripBeetle1 and TH1F *hADCvsStripBeetle2, before pedestal subtraction, and TH1F *hADCPedSubvsStripBeetle1 and TH1F *hADCPedSubvsStripBeetle2, after pedestal subtraction).
 
-  TH1F *hADCvsStripBeetle1 = new TH1F("hADCvsStripBeetle1","",260,-1,128);
+  TH1F *hADCvsStripBeetle1 = new TH1F("hADCvsStripBeetle1","",128,0,128);
   TCanvas *cADCvsStripBeetle1 = new TCanvas("cADCvsStripBeetle1","",400,300);
 
-  TH1F *hADCvsStripBeetle2 = new TH1F("hADCvsStripBeetle2","",260,127,256);
+  TH1F *hADCvsStripBeetle2 = new TH1F("hADCvsStripBeetle2","",128,128,256);
   TCanvas *cADCvsStripBeetle2 = new TCanvas("cADCvsStripBeetle2","",400,300);
  
   InitHist(hADCvsStripBeetle1,Form("Event %d - Beetle 1, raw",sample),"Beetle channel","ADC counts");
  
   InitHist(hADCvsStripBeetle2,Form("Event %d - Beetle 2, raw",sample),"Beetle channel","ADC counts");
 
-  TH1F *hADCPedSubvsStripBeetle1 = new TH1F("hADCPedSubvsStripBeetle1","",260,-1,128);
+  TH1F *hADCPedSubvsStripBeetle1 = new TH1F("hADCPedSubvsStripBeetle1","",128,0,128);
   TCanvas *cADCPedSubvsStripBeetle1 = new TCanvas("cADCPedSubvsStripBeetle1","",400,300);
 
-  TH1F *hADCPedSubvsStripBeetle2 = new TH1F("hADCPedSubvsStripBeetle2","",260,127,256);
+  TH1F *hADCPedSubvsStripBeetle2 = new TH1F("hADCPedSubvsStripBeetle2","",128,128,256);
   TCanvas *cADCPedSubvsStripBeetle2 = new TCanvas("cADCPedSubvsStripBeetle2","",400,300);
  
   InitHist(hADCPedSubvsStripBeetle1,Form("Event %d - Beetle 1, ped sub",sample),"Beetle channel","ADC counts");
@@ -282,16 +282,16 @@
   hADCPedSubvsStripBeetle1->SetFillColor(kAzure);
   hADCvsStripBeetle1->SetMinimum(-1200);
   hADCvsStripBeetle1->SetMaximum(1200);
-  hADCPedSubvsStripBeetle1->SetMinimum(-400);
-  hADCPedSubvsStripBeetle1->SetMaximum(400);
+  hADCPedSubvsStripBeetle1->SetMinimum(-500);
+  hADCPedSubvsStripBeetle1->SetMaximum(500);
 
   // Style and range for Beetle 2 plots.
   hADCvsStripBeetle2->SetFillColor(kRed);
   hADCPedSubvsStripBeetle2->SetFillColor(kRed);
   hADCvsStripBeetle2->SetMinimum(-1200);
   hADCvsStripBeetle2->SetMaximum(1200);
-  hADCPedSubvsStripBeetle2->SetMinimum(-400);
-  hADCPedSubvsStripBeetle2->SetMaximum(400);
+  hADCPedSubvsStripBeetle2->SetMinimum(-500);
+  hADCPedSubvsStripBeetle2->SetMaximum(500);
 
   // Fill histograms.
   for (int iEvent=0;iEvent<NEvents;++iEvent) {